Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OATS-CADC
ac
Commits
3f49c609
Commit
3f49c609
authored
Aug 30, 2016
by
Patrick Dowler
Browse files
fixed to use the correct standardID in availability checks
parent
1b5a372f
Changes
3
Hide whitespace changes
Inline
Side-by-side
cadc-access-control-identity/build.gradle
View file @
3f49c609
...
...
@@ -18,7 +18,7 @@ repositories {
sourceCompatibility
=
1.7
group
=
'org.opencadc'
version
=
'1.0'
version
=
'1.0
.1
'
dependencies
{
compile
'log4j:log4j:1.2.+'
...
...
cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java
View file @
3f49c609
...
...
@@ -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
.
to
ASCII
String
());
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
.
to
ASCII
String
());
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
.
G
MS_
GROUP
S_01
.
toString
());
URI
serviceURI
=
localAuth
.
getServiceURI
(
Standards
.
U
MS_
USER
S_01
.
to
ASCII
String
());
URL
availURL
=
regClient
.
getServiceURL
(
serviceURI
,
Standards
.
VOSI_AVAILABILITY
,
AuthMethod
.
ANON
);
return
new
CheckWebService
(
availURL
.
toExternalForm
());
}
...
...
cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java
View file @
3f49c609
...
...
@@ -71,7 +71,7 @@ public class AuthenticatorImpl implements Authenticator
{
RegistryClient
regClient
=
new
RegistryClient
();
LocalAuthority
localAuth
=
new
LocalAuthority
();
URI
serviceURI
=
localAuth
.
getServiceURI
(
Standards
.
G
MS_
GROUP
S_01
.
toString
());
URI
serviceURI
=
localAuth
.
getServiceURI
(
Standards
.
U
MS_
USER
S_01
.
to
ASCII
String
());
URL
availURL
=
regClient
.
getServiceURL
(
serviceURI
,
Standards
.
VOSI_AVAILABILITY
,
AuthMethod
.
ANON
);
return
new
CheckWebService
(
availURL
.
toExternalForm
());
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment