Commit c67b5fa6 authored by Brian Major's avatar Brian Major
Browse files

s1932 - Use LocalAuthority lookup before service lookup

parent 6c7064e4

cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java

+10 −12
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ package ca.nrc.cadc.auth; 
import java.io.File;

import java.io.File;

import java.net.MalformedURLException;

import java.net.MalformedURLException;

import java.net.URI;

import java.net.URI;

import java.net.URISyntaxException;

import java.net.URL;

import java.net.URL;

import java.security.Principal;

import java.security.Principal;

import java.security.PrivilegedActionException;

import java.security.PrivilegedActionException;
@@ -18,13 +17,10 @@ import javax.security.auth.x500.X500Principal; 




import org.apache.log4j.Logger;

import org.apache.log4j.Logger;





import ca.nrc.cadc.ac.AC;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.client.UserClient;

import ca.nrc.cadc.ac.client.UserClient;

import ca.nrc.cadc.auth.IdentityManager;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.auth.SSLUtil;

import ca.nrc.cadc.profiler.Profiler;

import ca.nrc.cadc.profiler.Profiler;

import ca.nrc.cadc.reg.client.LocalAuthority;

import ca.nrc.cadc.reg.client.RegistryClient;

import ca.nrc.cadc.reg.client.RegistryClient;

import ca.nrc.cadc.vosi.avail.CheckResource;

import ca.nrc.cadc.vosi.avail.CheckResource;

import ca.nrc.cadc.vosi.avail.CheckWebService;

import ca.nrc.cadc.vosi.avail.CheckWebService;
@@ -112,7 +108,10 @@ public class ACIdentityManager implements IdentityManager 
            @Override

            @Override

            public NumericPrincipal run() throws Exception

            public NumericPrincipal run() throws Exception

            {

            {

                UserClient userClient = new UserClient(new URI(AC.UMS_SERVICE_URI));

                LocalAuthority localAuth = new LocalAuthority();

                URI serviceURI = localAuth.getServiceURI("ums");



                UserClient userClient = new UserClient(serviceURI);

                User newUser = userClient.createUser(x500Principal);

                User newUser = userClient.createUser(x500Principal);





                Set<NumericPrincipal> set = newUser.getIdentities(NumericPrincipal.class);

                Set<NumericPrincipal> set = newUser.getIdentities(NumericPrincipal.class);
@@ -205,7 +204,9 @@ public class ACIdentityManager implements IdentityManager 
            {

            {

                public Object run() throws Exception

                public Object run() throws Exception

                {

                {

                    URI serviceURI = new URI(AC.UMS_SERVICE_URI);

                    LocalAuthority localAuth = new LocalAuthority();

                    URI serviceURI = localAuth.getServiceURI("ums");



                    UserClient userClient = new UserClient(serviceURI);

                    UserClient userClient = new UserClient(serviceURI);

                    userClient.augmentSubject(subject);

                    userClient.augmentSubject(subject);

                    return null;

                    return null;
@@ -233,7 +234,8 @@ public class ACIdentityManager implements IdentityManager 
        try

        try

        {

        {

            RegistryClient regClient = new RegistryClient();

            RegistryClient regClient = new RegistryClient();

            URI serviceURI = new URI(AC.GMS_SERVICE_URI);

            LocalAuthority localAuth = new LocalAuthority();

            URI serviceURI = localAuth.getServiceURI("gms");

            URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");

            URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");

            return new CheckWebService(availURL.toExternalForm());

            return new CheckWebService(availURL.toExternalForm());

        }

        }
@@ -241,9 +243,5 @@ public class ACIdentityManager implements IdentityManager 
        {

        {

            throw new RuntimeException(e);

            throw new RuntimeException(e);

        }

        }

        catch (URISyntaxException e)

        {

            throw new RuntimeException(e);

        }

    }

    }

}
 
}

cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java

+3 −11
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ package ca.nrc.cadc.auth; 




import java.net.MalformedURLException;

import java.net.MalformedURLException;

import java.net.URI;

import java.net.URI;

import java.net.URISyntaxException;

import java.net.URL;

import java.net.URL;





import javax.security.auth.Subject;

import javax.security.auth.Subject;
@@ -10,12 +9,8 @@ import javax.security.auth.x500.X500Principal; 




import org.apache.log4j.Logger;

import org.apache.log4j.Logger;





import ca.nrc.cadc.ac.AC;

import ca.nrc.cadc.auth.AuthMethod;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.Authenticator;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.profiler.Profiler;

import ca.nrc.cadc.profiler.Profiler;

import ca.nrc.cadc.reg.client.LocalAuthority;

import ca.nrc.cadc.reg.client.RegistryClient;

import ca.nrc.cadc.reg.client.RegistryClient;

import ca.nrc.cadc.vosi.avail.CheckResource;

import ca.nrc.cadc.vosi.avail.CheckResource;

import ca.nrc.cadc.vosi.avail.CheckWebService;

import ca.nrc.cadc.vosi.avail.CheckWebService;
@@ -77,7 +72,8 @@ public class AuthenticatorImpl implements Authenticator 
        try

        try

        {

        {

            RegistryClient regClient = new RegistryClient();

            RegistryClient regClient = new RegistryClient();

            URI serviceURI = new URI(AC.GMS_SERVICE_URI);

            LocalAuthority localAuth = new LocalAuthority();

            URI serviceURI = localAuth.getServiceURI("gms");

            URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");

            URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");

            return new CheckWebService(availURL.toExternalForm());

            return new CheckWebService(availURL.toExternalForm());

        }

        }
@@ -85,9 +81,5 @@ public class AuthenticatorImpl implements Authenticator 
        {

        {

            throw new RuntimeException(e);

            throw new RuntimeException(e);

        }

        }

        catch (URISyntaxException e)

        {

            throw new RuntimeException(e);

        }

    }

    }

}
 
}