Commit 0b2d274e authored by Jeff Burke's avatar Jeff Burke
Browse files

s1849: update cadcAccessControl-Identity for RegistryClient changes.

parent 7d78c15f
...@@ -15,6 +15,7 @@ import java.util.UUID; ...@@ -15,6 +15,7 @@ import java.util.UUID;
import javax.security.auth.Subject; import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal; import javax.security.auth.x500.X500Principal;
import ca.nrc.cadc.reg.Standards;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import ca.nrc.cadc.ac.User; import ca.nrc.cadc.ac.User;
...@@ -236,7 +237,8 @@ public class ACIdentityManager implements IdentityManager ...@@ -236,7 +237,8 @@ public class ACIdentityManager implements IdentityManager
RegistryClient regClient = new RegistryClient(); RegistryClient regClient = new RegistryClient();
LocalAuthority localAuth = new LocalAuthority(); LocalAuthority localAuth = new LocalAuthority();
URI serviceURI = localAuth.getServiceURI("gms"); URI serviceURI = localAuth.getServiceURI("gms");
URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability"); URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_01_URI, AuthMethod.ANON);
URL availURL = new URL(serviceURL.toExternalForm() + "/availability");
return new CheckWebService(availURL.toExternalForm()); return new CheckWebService(availURL.toExternalForm());
} }
catch (MalformedURLException e) catch (MalformedURLException e)
......
...@@ -7,6 +7,7 @@ import java.net.URL; ...@@ -7,6 +7,7 @@ import java.net.URL;
import javax.security.auth.Subject; import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal; import javax.security.auth.x500.X500Principal;
import ca.nrc.cadc.reg.Standards;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import ca.nrc.cadc.profiler.Profiler; import ca.nrc.cadc.profiler.Profiler;
...@@ -74,7 +75,8 @@ public class AuthenticatorImpl implements Authenticator ...@@ -74,7 +75,8 @@ public class AuthenticatorImpl implements Authenticator
RegistryClient regClient = new RegistryClient(); RegistryClient regClient = new RegistryClient();
LocalAuthority localAuth = new LocalAuthority(); LocalAuthority localAuth = new LocalAuthority();
URI serviceURI = localAuth.getServiceURI("gms"); URI serviceURI = localAuth.getServiceURI("gms");
URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability"); URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_01_URI, AuthMethod.ANON);
URL availURL = new URL(serviceURL.toExternalForm() + "/availability");
return new CheckWebService(availURL.toExternalForm()); return new CheckWebService(availURL.toExternalForm());
} }
catch (MalformedURLException e) catch (MalformedURLException e)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment