Commit fad6284f authored by Sara Bertocco's avatar Sara Bertocco
Browse files

Merge remote-tracking branch 'upstream/master'

parents 092f7316 c4ba0ea6

cadc-access-control-server/build.gradle

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ repositories { 
sourceCompatibility = 1.7

sourceCompatibility = 1.7

group = 'org.opencadc'

group = 'org.opencadc'





version = '1.1.0'

version = '1.1.1'





dependencies {

dependencies {

    compile 'log4j:log4j:1.2.+'

    compile 'log4j:log4j:1.2.+'
@@ -22,7 +22,7 @@ dependencies { 
    compile 'xerces:xercesImpl:2.+'

    compile 'xerces:xercesImpl:2.+'

    compile 'com.unboundid:unboundid-ldapsdk:2.3.+'

    compile 'com.unboundid:unboundid-ldapsdk:2.3.+'





    compile 'org.opencadc:cadc-access-control:1.1.+'

    compile 'org.opencadc:cadc-access-control:[1.1.1,)'

    compile 'org.opencadc:cadc-util:1.+'

    compile 'org.opencadc:cadc-util:1.+'

    compile 'org.opencadc:cadc-log:1.+'

    compile 'org.opencadc:cadc-log:1.+'

    compile 'org.opencadc:cadc-registry:1.+'

    compile 'org.opencadc:cadc-registry:1.+'

cadc-access-control/build.gradle

+3 −2
Original line number Original line Diff line number Diff line
@@ -15,9 +15,9 @@ sourceCompatibility = 1.7 




group = 'org.opencadc'

group = 'org.opencadc'





version = '1.1.0'

version = '1.1.3'





mainClassName = 'ca.nrc.cadc.ac.client.GMSClientMain'

mainClassName = 'ca.nrc.cadc.ac.client.Main'





dependencies {

dependencies {

    compile 'log4j:log4j:1.2.+'

    compile 'log4j:log4j:1.2.+'
@@ -25,6 +25,7 @@ dependencies { 
    compile 'org.json:json:20160212'

    compile 'org.json:json:20160212'





    compile 'org.opencadc:cadc-util:1.+'

    compile 'org.opencadc:cadc-util:1.+'

    compile 'org.opencadc:cadc-cdp:[1.0,)'

    compile 'org.opencadc:cadc-registry:1.+'

    compile 'org.opencadc:cadc-registry:1.+'





    testCompile 'junit:junit:4.+'

    testCompile 'junit:junit:4.+'

cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java

+14 −28
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ public class GroupURI 
    private static Logger log = Logger.getLogger(GroupURI.class);

    private static Logger log = Logger.getLogger(GroupURI.class);





    private URI uri;

    private URI uri;

    private String name;





    /**

    /**

     * Attempts to create a URI using the specified uri.

     * Attempts to create a URI using the specified uri.
@@ -99,8 +98,6 @@ public class GroupURI 
            throw new IllegalArgumentException("Null URI");

            throw new IllegalArgumentException("Null URI");

        }

        }





        this.uri = uri;



        // Ensure the scheme is correct

        // Ensure the scheme is correct

        if (uri.getScheme() == null)

        if (uri.getScheme() == null)

        {

        {
@@ -117,13 +114,9 @@ public class GroupURI 
            throw new IllegalArgumentException("Missing authority and/or path.");

            throw new IllegalArgumentException("Missing authority and/or path.");

        }

        }





        log.debug("URI: " + uri);

        log.debug("  scheme: " + uri.getScheme());

        log.debug("  authority: " + uri.getAuthority());

        log.debug("  path: " + uri.getPath());



        String fragment = uri.getFragment();

        String fragment = uri.getFragment();

        String query = uri.getQuery();

        String query = uri.getQuery();

        String name = null;

        if (query == null)

        if (query == null)

        {

        {

            if (fragment != null)

            if (fragment != null)
@@ -144,6 +137,9 @@ public class GroupURI 
            }

            }

            name = query;

            name = query;

        }

        }



        this.uri = URI.create(

            uri.getScheme() + "://" + uri.getAuthority() + uri.getPath() + "?" + name);

    }

    }





    /**

    /**
@@ -156,16 +152,16 @@ public class GroupURI 
    }

    }





    @Override

    @Override

    public boolean equals(Object rhs)

    public boolean equals(Object other)

    {

    {

        if (rhs == null)

        if (other == null)

            return false;

            return false;

        if (this == rhs)

        if (this == other)

            return true;

            return true;

        if (rhs instanceof GroupURI)

        if (other instanceof GroupURI)

        {

        {

            GroupURI vu = (GroupURI) rhs;

            GroupURI otherURI = (GroupURI) other;

            return uri.toString().equals(vu.uri.toString());

            return uri.equals(otherURI.getURI());

        }

        }

        return false;

        return false;

    }

    }
@@ -180,16 +176,6 @@ public class GroupURI 
        return uri;

        return uri;

    }

    }





    /**

     * Returns the decoded authority component of the URI.

     *

     * @return authority of the URI, or null if the authority is undefined.

     */

    public String getAuthority()

    {

        return uri.getAuthority();

    }



    /**

    /**

     * Returns the decoded fragment component of the URI.

     * Returns the decoded fragment component of the URI.

     *

     *
@@ -197,18 +183,18 @@ public class GroupURI 
     */

     */

    public String getName()

    public String getName()

    {

    {

        return name;

        return uri.getQuery();

    }

    }





    public URI getServiceID()

    public URI getServiceID()

    {

    {

        String serviceID = uri.getScheme() +

        String serviceIDString = uri.getScheme() +

            "://" +

            "://" +

            uri.getAuthority() +

            uri.getAuthority() +

            uri.getPath();

            uri.getPath();

        try

        try

        {

        {

            return new URI(serviceID);

            return new URI(serviceIDString);

        }

        }

        catch (URISyntaxException e)

        catch (URISyntaxException e)

        {

        {
@@ -220,7 +206,7 @@ public class GroupURI 
    @Override

    @Override

    public String toString()

    public String toString()

    {

    {

        return getServiceID() + "?" + name;

        return uri.toString();

    }

    }





}
 
}

cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java

+75 −69

File changed.

Preview size limit exceeded, changes collapsed.

cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GroupAuthorizer.java

0 → 100644
+155 −0

File added.

Preview size limit exceeded, changes collapsed.