diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2022-02-10 11:45:35 +0100 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2022-02-10 11:45:35 +0100 |
commit | 113a8fa5998d9b5be5c4e4feb96ebda1aebf4f14 (patch) | |
tree | a80299e284aa62888263e7147848c9ae0e8940fe /controller-api | |
parent | 8789e0b449fc7b32f3924da7c8a3f86e734f2289 (diff) |
Update path groups and policy to only allow access request approval by tenant admin
Diffstat (limited to 'controller-api')
3 files changed, 17 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java index 8bd7a9e726d..3a5bb96d985 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java @@ -233,7 +233,13 @@ enum PathGroup { secretStore(Matcher.tenant, "/application/v4/tenant/{tenant}/secret-store/{*}"), /** Paths used to proxy Horizon metric requests */ - horizonProxy("/horizon/v1/{*}"); + horizonProxy("/horizon/v1/{*}"), + + /** Paths used to list and request access to tenant resources */ + accessRequests(Matcher.tenant, "/application/v4/tenant/{tenant}/access/request/{*}"), + + /** Paths used to approve requests to access tenant resources */ + accessRequestApproval(Matcher.tenant, "/application/v4/tenant/{tenant}/access/approve/{*}"); final List<String> pathSpecs; final List<Matcher> matchers; @@ -281,9 +287,10 @@ enum PathGroup { return EnumSet.complementOf(EnumSet.copyOf(pathGroups)); } - static Set<PathGroup> billingPaths() { + static Set<PathGroup> operatorRestrictedPaths() { var paths = billingPathsNoToken(); paths.add(PathGroup.billingToken); + paths.add(accessRequestApproval); return paths; } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java index d40027d91a7..4d9a16c34f0 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java @@ -22,7 +22,7 @@ enum Policy { /** Full access to everything. */ operator(Privilege.grant(Action.all()) - .on(PathGroup.allExcept(PathGroup.billingPaths())) + .on(PathGroup.allExcept(PathGroup.operatorRestrictedPaths())) .in(SystemName.all()), Privilege.grant(Action.read) .on(PathGroup.billingPathsNoToken()) @@ -188,6 +188,10 @@ enum Policy { .on(PathGroup.billingList, PathGroup.billing) .in(SystemName.PublicCd, SystemName.Public)), + accessRequests(Privilege.grant(Action.all()) + .on(PathGroup.accessRequests, PathGroup.accessRequestApproval) + .in(SystemName.PublicCd)), + /** Invoice management */ hostedAccountant(Privilege.grant(Action.all()) .on(PathGroup.hostedAccountant, PathGroup.accountant) diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java index aed5c08f0db..7f6e77faf03 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java @@ -75,7 +75,9 @@ public enum RoleDefinition { Policy.paymentInstrumentDelete, Policy.paymentInstrumentCreate, Policy.planUpdate, - Policy.billingInformationRead), + Policy.billingInformationRead, + Policy.accessRequests + ), /** Headless — the application specific role identified by deployment keys for production */ headless(Policy.submission), |