aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-athenz
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-06-20 15:51:17 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2018-06-21 12:30:52 +0200
commitb7b2ef4d5221ee069880f6412b6d9f5362c730f4 (patch)
treec58c6d81faa8f42bcf26a11173d4c3f49efcf92f /vespa-athenz
parent6d626db4ec8f29f57e3947350007bd366d0dfb1b (diff)
Rename 'AccessCheckResult' -> 'AuthorizationResult'
Diffstat (limited to 'vespa-athenz')
-rw-r--r--vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/AuthorizationResult.java (renamed from vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/AccessCheckResult.java)6
-rw-r--r--vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/DefaultZpe.java8
-rw-r--r--vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/Zpe.java4
3 files changed, 9 insertions, 9 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/AccessCheckResult.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/AuthorizationResult.java
index 20f95df566f..faf05011af9 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/AccessCheckResult.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/AuthorizationResult.java
@@ -10,7 +10,7 @@ import java.util.Arrays;
*
* @author bjorncs
*/
-public enum AccessCheckResult {
+public enum AuthorizationResult {
ALLOW(AccessCheckStatus.ALLOW),
DENY(AccessCheckStatus.DENY),
DENY_NO_MATCH(AccessCheckStatus.DENY_NO_MATCH),
@@ -28,7 +28,7 @@ public enum AccessCheckResult {
private final AccessCheckStatus wrappedElement;
- AccessCheckResult(AccessCheckStatus wrappedElement) {
+ AuthorizationResult(AccessCheckStatus wrappedElement) {
this.wrappedElement = wrappedElement;
}
@@ -36,7 +36,7 @@ public enum AccessCheckResult {
return wrappedElement.toString();
}
- static AccessCheckResult fromAccessCheckStatus(AccessCheckStatus accessCheckStatus) {
+ static AuthorizationResult fromAccessCheckStatus(AccessCheckStatus accessCheckStatus) {
return Arrays.stream(values())
.filter(value -> value.wrappedElement == accessCheckStatus)
.findFirst()
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/DefaultZpe.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/DefaultZpe.java
index d7365a6d727..a02d9c7a97a 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/DefaultZpe.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/DefaultZpe.java
@@ -15,14 +15,14 @@ import java.security.cert.X509Certificate;
*/
public class DefaultZpe implements Zpe {
@Override
- public AccessCheckResult checkAccessAllowed(ZToken roleToken, AthenzResourceName resourceName, String action) {
- return AccessCheckResult.fromAccessCheckStatus(
+ public AuthorizationResult checkAccessAllowed(ZToken roleToken, AthenzResourceName resourceName, String action) {
+ return AuthorizationResult.fromAccessCheckStatus(
AuthZpeClient.allowAccess(roleToken.getRawToken(), resourceName.toResourceNameString(), action));
}
@Override
- public AccessCheckResult checkAccessAllowed(X509Certificate roleCertificate, AthenzResourceName resourceName, String action) {
- return AccessCheckResult.fromAccessCheckStatus(
+ public AuthorizationResult checkAccessAllowed(X509Certificate roleCertificate, AthenzResourceName resourceName, String action) {
+ return AuthorizationResult.fromAccessCheckStatus(
AuthZpeClient.allowAccess(roleCertificate, resourceName.toResourceNameString(), action));
}
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/Zpe.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/Zpe.java
index d2599a7dc76..e22e27f1508 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/Zpe.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/zpe/Zpe.java
@@ -12,6 +12,6 @@ import java.security.cert.X509Certificate;
* @author bjorncs
*/
public interface Zpe {
- AccessCheckResult checkAccessAllowed(ZToken roleToken, AthenzResourceName resourceName, String action);
- AccessCheckResult checkAccessAllowed(X509Certificate roleCertificate, AthenzResourceName resourceName, String action);
+ AuthorizationResult checkAccessAllowed(ZToken roleToken, AthenzResourceName resourceName, String action);
+ AuthorizationResult checkAccessAllowed(X509Certificate roleCertificate, AthenzResourceName resourceName, String action);
}