From 3f49c60930d5c80f838c7c40ccc9e05fb8243fe0 Mon Sep 17 00:00:00 2001
From: Patrick Dowler <patrick.dowler@nrc-cnrc.gc.ca>
Date: Tue, 30 Aug 2016 13:07:31 -0700
Subject: [PATCH] fixed to use the correct standardID in availability checks
---
cadc-access-control-identity/build.gradle | 2 +-
.../src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java | 6 +++---
.../src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cadc-access-control-identity/build.gradle b/cadc-access-control-identity/build.gradle
index c7314f5a..608109ac 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 6f83d5d1..8e68463b 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 1b2ffce7..750ebf19 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());
}
--
GitLab