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
0b2d274e
Commit
0b2d274e
authored
Jul 12, 2016
by
Jeff Burke
Browse files
s1849: update cadcAccessControl-Identity for RegistryClient changes.
parent
7d78c15f
Changes
2
Show whitespace changes
Inline
Side-by-side
cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
View file @
0b2d274e
...
...
@@ -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
)
...
...
cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
View file @
0b2d274e
...
...
@@ -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
)
...
...
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