summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-09 15:52:22 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-09 15:52:22 +0200
commit88ac3b324745dd95ecc4b783e5e4ffcc5137968f (patch)
tree032fd3e84cbb3c5e4b122c41f8abd3f3de957e73 /controller-api
parentda4075c09aae9078d82b3f9ec67bdf8443e17d53 (diff)
Allow user management in all systems
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java3
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java4
2 files changed, 3 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 5be1fd442e1..797ca10ed3d 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
@@ -104,8 +104,7 @@ public enum PathGroup {
"/application/v4/tenant/",
"/",
"/d/{*}",
- "/statuspage/v1/{*}"
- ),
+ "/statuspage/v1/{*}"),
/** Paths providing public information. */
publicInfo("/badge/v1/{*}",
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 85b9fb63b2a..ddb3ec6725b 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
@@ -26,12 +26,12 @@ public enum Policy {
/** Full access to user management for a tenant in select systems. */
tenantManager(Privilege.grant(Action.all())
.on(PathGroup.tenantUsers)
- .in(SystemName.Public)),
+ .in(SystemName.all())),
/** Full access to user management for an application in select systems. */
applicationManager(Privilege.grant(Action.all())
.on(PathGroup.applicationUsers)
- .in(SystemName.Public)),
+ .in(SystemName.all())),
/** Access to create a user tenant in select systems. */
userCreate(Privilege.grant(Action.update)