From 0b2d274e6306a870234f05b3cd5b883bf30ba934 Mon Sep 17 00:00:00 2001
From: Jeff Burke <Jeff.Burke@nrc-cnrc.gc.ca>
Date: Tue, 12 Jul 2016 15:21:29 -0700
Subject: [PATCH] s1849: update cadcAccessControl-Identity for RegistryClient
changes.
---
.../src/ca/nrc/cadc/auth/ACIdentityManager.java | 4 +++-
.../src/ca/nrc/cadc/auth/AuthenticatorImpl.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
index a56987d7..c32b2d5e 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
@@ -15,6 +15,7 @@ import java.util.UUID;
import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal;
+import ca.nrc.cadc.reg.Standards;
import org.apache.log4j.Logger;
import ca.nrc.cadc.ac.User;
@@ -236,7 +237,8 @@ public class ACIdentityManager implements IdentityManager
RegistryClient regClient = new RegistryClient();
LocalAuthority localAuth = new LocalAuthority();
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());
}
catch (MalformedURLException e)
diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
index af6b5a15..74287adc 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
@@ -7,6 +7,7 @@ import java.net.URL;
import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal;
+import ca.nrc.cadc.reg.Standards;
import org.apache.log4j.Logger;
import ca.nrc.cadc.profiler.Profiler;
@@ -74,7 +75,8 @@ public class AuthenticatorImpl implements Authenticator
RegistryClient regClient = new RegistryClient();
LocalAuthority localAuth = new LocalAuthority();
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());
}
catch (MalformedURLException e)
--
GitLab