diff --git a/cadc-access-control-identity/build.gradle b/cadc-access-control-identity/build.gradle index c7314f5a3d1aab88743ff926ac48c5f925e25a47..608109ac1dab9a5f7922089a7f8bc794bb3d8625 100644 --- a/cadc-access-control-identity/build.gradle +++ b/cadc-access-control-identity/build.gradle @@ -18,7 +18,7 @@ repositories { sourceCompatibility = 1.7 group = 'org.opencadc' -version = '1.0' +version = '1.0.1' dependencies { compile 'log4j:log4j:1.2.+' diff --git a/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java index 6f83d5d11630d017ef21e1fc5a52a469f42e56e0..8e68463bd6976369b8028a522c41b53d8cc12828 100644 --- a/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java +++ b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java @@ -109,7 +109,7 @@ public class ACIdentityManager implements IdentityManager public NumericPrincipal run() throws Exception { LocalAuthority localAuth = new LocalAuthority(); - URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString()); + URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toASCIIString()); UserClient userClient = new UserClient(serviceURI); User newUser = userClient.createUser(x500Principal); @@ -205,7 +205,7 @@ public class ACIdentityManager implements IdentityManager public Object run() throws Exception { LocalAuthority localAuth = new LocalAuthority(); - URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString()); + URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toASCIIString()); UserClient userClient = new UserClient(serviceURI); userClient.augmentSubject(subject); @@ -233,7 +233,7 @@ public class ACIdentityManager implements IdentityManager { RegistryClient regClient = new RegistryClient(); LocalAuthority localAuth = new LocalAuthority(); - URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString()); + URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toASCIIString()); URL availURL = regClient.getServiceURL(serviceURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON); return new CheckWebService(availURL.toExternalForm()); } diff --git a/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java index 1b2ffce71a24b33c8f4a7b5bb0f1104eced13713..750ebf19e0ff2f643754e285c2b158e0a4fab24f 100644 --- a/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java +++ b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java @@ -71,7 +71,7 @@ public class AuthenticatorImpl implements Authenticator { RegistryClient regClient = new RegistryClient(); LocalAuthority localAuth = new LocalAuthority(); - URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString()); + URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toASCIIString()); URL availURL = regClient.getServiceURL(serviceURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON); return new CheckWebService(availURL.toExternalForm()); }