Skip to content

Commit 5f0332a

Browse files
sophia-chen-ttdsophia-chen-ttd
committed
update admin role names
1 parent f4c1b05 commit 5f0332a

18 files changed

Lines changed: 42 additions & 42 deletions

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
1717
<micrometer.version>1.12.2</micrometer.version>
1818
<junit-jupiter.version>5.11.2</junit-jupiter.version>
19-
<uid2-shared.version>11.6.1-alpha-357-SNAPSHOT</uid2-shared.version>
19+
<uid2-shared.version>11.6.2-alpha-360-SNAPSHOT</uid2-shared.version>
2020
<okta-jwt.version>0.5.10</okta-jwt.version>
2121
<netty.version>4.1.135.Final</netty.version>
2222
<image.version>${project.version}</image.version>

‎src/main/java/com/uid2/admin/auth/OktaCustomScope.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public enum OktaCustomScope {
1313
SITE_SYNC("uid2.admin.site-sync", Role.PRIVATE_OPERATOR_SYNC),
1414
METRICS_EXPORT("uid2.admin.metrics-export", Role.METRICS_EXPORT),
1515
ENCLAVE_REGISTRAR("uid2.admin.enclave-registrar", Role.ENCLAVE_REGISTRAR),
16-
READ_ONLY("uid2.admin.read-only", Role.READ_ONLY),
17-
CREATE("uid2.admin.create", Role.CREATE),
16+
READ_ONLY("uid2.admin.read-only", Role.ADMIN_READ_ONLY),
17+
CREATE("uid2.admin.create", Role.ADMIN_CREATE),
1818
INVALID("invalid", Role.UNKNOWN);
1919
private final String name;
2020
private final Role role;

‎src/main/java/com/uid2/admin/vertx/api/cstg/GetClientSideKeypairsBySite.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public GetClientSideKeypairsBySite(IKeypairManager keypairManager) {
2727

2828
@Path("/sites/:siteId/client-side-keypairs")
2929
@Method(ApiMethod.GET)
30-
@Roles({Role.MAINTAINER, Role.SHARING_PORTAL, Role.READ_ONLY})
30+
@Roles({Role.MAINTAINER, Role.SHARING_PORTAL, Role.ADMIN_READ_ONLY})
3131
public Handler<RoutingContext> getHandler() {
3232
return UrlParameterProviders.provideSiteId(this::handleGetClientSideKeys);
3333
}

‎src/main/java/com/uid2/admin/vertx/service/ClientKeyService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,24 @@ public ClientKeyService(JsonObject config,
6969
@Override
7070
public void setupRoutes(Router router) {
7171
router.get(API_CLIENT_METADATA.toString()).handler(
72-
auth.handle(this::handleClientMetadata, Role.MAINTAINER, Role.READ_ONLY));
72+
auth.handle(this::handleClientMetadata, Role.MAINTAINER, Role.ADMIN_READ_ONLY));
7373
router.post(API_CLIENT_REWRITE_METADATA.toString()).blockingHandler(auth.handle((ctx) -> {
7474
synchronized (writeLock) {
7575
this.handleRewriteMetadata(ctx);
7676
}
7777
}, Role.PRIVILEGED));
7878

7979
router.get(API_CLIENT_LIST.toString()).handler(
80-
auth.handle(this::handleClientList, Role.MAINTAINER, Role.METRICS_EXPORT, Role.READ_ONLY));
80+
auth.handle(this::handleClientList, Role.MAINTAINER, Role.METRICS_EXPORT, Role.ADMIN_READ_ONLY));
8181

8282
router.get(API_CLIENT_LIST_SITEID.toString()).handler(
83-
auth.handle(this::handleClientListBySite, Role.MAINTAINER, Role.SHARING_PORTAL, Role.READ_ONLY));
83+
auth.handle(this::handleClientListBySite, Role.MAINTAINER, Role.SHARING_PORTAL, Role.ADMIN_READ_ONLY));
8484

8585
router.get(API_CLIENT_KEYID.toString()).handler(
86-
auth.handle(this::handleClientByKeyId, Role.MAINTAINER, Role.SHARING_PORTAL, Role.READ_ONLY));
86+
auth.handle(this::handleClientByKeyId, Role.MAINTAINER, Role.SHARING_PORTAL, Role.ADMIN_READ_ONLY));
8787

8888
router.get(API_CLIENT_CONTACT.toString()).handler(
89-
auth.handle(this::handleClientByContact, Role.MAINTAINER, Role.SHARING_PORTAL, Role.READ_ONLY));
89+
auth.handle(this::handleClientByContact, Role.MAINTAINER, Role.SHARING_PORTAL, Role.ADMIN_READ_ONLY));
9090

9191
router.get(API_CLIENT_REVEAL.toString()).handler(
9292
auth.handle(this::handleClientReveal, Role.PRIVILEGED));
@@ -95,7 +95,7 @@ public void setupRoutes(Router router) {
9595
synchronized (writeLock) {
9696
this.handleClientAdd(ctx);
9797
}
98-
}, new AuditParams(List.of("name", "roles", "site_id"), Collections.emptyList()), Role.MAINTAINER, Role.SHARING_PORTAL, Role.CREATE));
98+
}, new AuditParams(List.of("name", "roles", "site_id"), Collections.emptyList()), Role.MAINTAINER, Role.SHARING_PORTAL, Role.ADMIN_CREATE));
9999

100100
router.post(API_CLIENT_DEL.toString()).blockingHandler(auth.handle((ctx) -> {
101101
synchronized (writeLock) {

‎src/main/java/com/uid2/admin/vertx/service/ClientSideKeypairService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void setupRoutes(Router router) {
7070
synchronized (writeLock) {
7171
this.handleAddKeypair(ctx);
7272
}
73-
}, new AuditParams(Collections.emptyList(), List.of("site_id", "name", "contact", "disabled")), Role.MAINTAINER, Role.SHARING_PORTAL, Role.CREATE));
73+
}, new AuditParams(Collections.emptyList(), List.of("site_id", "name", "contact", "disabled")), Role.MAINTAINER, Role.SHARING_PORTAL, Role.ADMIN_CREATE));
7474
router.post(API_CLIENT_SIDE_KEYPAIRS_UPDATE.toString()).blockingHandler(auth.handle((ctx) -> {
7575
synchronized (writeLock) {
7676
this.handleUpdateKeypair(ctx);
@@ -82,9 +82,9 @@ public void setupRoutes(Router router) {
8282
}
8383
}, new AuditParams(Collections.emptyList(), List.of("subscription_id")), Role.PRIVILEGED, Role.SHARING_PORTAL));
8484
router.get(API_CLIENT_SIDE_KEYPAIRS_LIST.toString()).handler(
85-
auth.handle(this::handleListAllKeypairs, Role.MAINTAINER, Role.METRICS_EXPORT, Role.READ_ONLY));
85+
auth.handle(this::handleListAllKeypairs, Role.MAINTAINER, Role.METRICS_EXPORT, Role.ADMIN_READ_ONLY));
8686
router.get(API_CLIENT_SIDE_KEYPAIRS_SUBSCRIPTIONID.toString()).handler(
87-
auth.handle(this::handleListKeypair, Role.MAINTAINER, Role.READ_ONLY)
87+
auth.handle(this::handleListKeypair, Role.MAINTAINER, Role.ADMIN_READ_ONLY)
8888
);
8989
}
9090

‎src/main/java/com/uid2/admin/vertx/service/CloudEncryptionKeyService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public CloudEncryptionKeyService(
3636
@Override
3737
public void setupRoutes(Router router) {
3838
router.get(Endpoints.CLOUD_ENCRYPTION_KEY_METADATA.toString()).handler(
39-
auth.handle(this::handleMetadata, Role.MAINTAINER, Role.READ_ONLY));
39+
auth.handle(this::handleMetadata, Role.MAINTAINER, Role.ADMIN_READ_ONLY));
4040

4141
router.get(Endpoints.CLOUD_ENCRYPTION_KEY_LIST.toString()).handler(
42-
auth.handle(this::handleList, Role.MAINTAINER, Role.READ_ONLY)
42+
auth.handle(this::handleList, Role.MAINTAINER, Role.ADMIN_READ_ONLY)
4343
);
4444

4545
router.post(Endpoints.CLOUD_ENCRYPTION_KEY_ROTATE.toString()).handler(

‎src/main/java/com/uid2/admin/vertx/service/EnclaveIdService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public EnclaveIdService(AdminAuthMiddleware auth,
4949
@Override
5050
public void setupRoutes(Router router) {
5151
router.get(API_ENCLAVE_METADATA.toString()).handler(
52-
auth.handle(this::handleEnclaveMetadata, Role.MAINTAINER, Role.READ_ONLY));
52+
auth.handle(this::handleEnclaveMetadata, Role.MAINTAINER, Role.ADMIN_READ_ONLY));
5353
router.get(API_ENCLAVE_LIST.toString()).handler(
54-
auth.handle(this::handleEnclaveList, Role.MAINTAINER, Role.READ_ONLY));
54+
auth.handle(this::handleEnclaveList, Role.MAINTAINER, Role.ADMIN_READ_ONLY));
5555

5656
router.post(API_ENCLAVE_ADD.toString()).blockingHandler(auth.handle((ctx) -> {
5757
synchronized (writeLock) {

‎src/main/java/com/uid2/admin/vertx/service/EncryptionKeyService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ public EncryptionKeyService(JsonObject config,
125125
@Override
126126
public void setupRoutes(Router router) {
127127
router.get(API_KEY_LIST.toString()).handler(
128-
auth.handle(this::handleKeyList, Role.MAINTAINER, Role.READ_ONLY));
128+
auth.handle(this::handleKeyList, Role.MAINTAINER, Role.ADMIN_READ_ONLY));
129129

130130
if(enableKeysets) {
131131
router.get(API_KEY_LIST_KEYSET_KEYS.toString()).handler(
132-
auth.handle(this::handleKeysetKeyList, Role.MAINTAINER, Role.READ_ONLY));
132+
auth.handle(this::handleKeysetKeyList, Role.MAINTAINER, Role.ADMIN_READ_ONLY));
133133
}
134134

135135
router.post(API_KEY_REWRITE_METADATA.toString()).blockingHandler(auth.handle((ctx) -> {

‎src/main/java/com/uid2/admin/vertx/service/JobDispatcherService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void setupRoutes(Router router) {
3030
}
3131
},
3232
//can be other role
33-
Role.MAINTAINER, Role.READ_ONLY));
33+
Role.MAINTAINER, Role.ADMIN_READ_ONLY));
3434

3535
router.get(API_JOB_DISPATCHER_JOB_QUEUE.toString()).blockingHandler(auth.handle((ctx) -> {
3636
try {
@@ -40,6 +40,6 @@ public void setupRoutes(Router router) {
4040
}
4141
},
4242
//can be other role
43-
Role.MAINTAINER, Role.READ_ONLY));
43+
Role.MAINTAINER, Role.ADMIN_READ_ONLY));
4444
}
4545
}

‎src/main/java/com/uid2/admin/vertx/service/KeyAclService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public KeyAclService(AdminAuthMiddleware auth,
5151
@Override
5252
public void setupRoutes(Router router) {
5353
router.get(API_KEYS_ACL_LIST.toString()).handler(
54-
auth.handle(this::handleKeyAclList, Role.MAINTAINER, Role.READ_ONLY));
54+
auth.handle(this::handleKeyAclList, Role.MAINTAINER, Role.ADMIN_READ_ONLY));
5555

5656
router.post(API_KEYS_ACL_REWRITE_METADATA.toString()).blockingHandler(auth.handle((ctx) -> {
5757
synchronized (writeLock) {

0 commit comments

Comments
 (0)