Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

DEVEXP-546: Scaffold new roles using privileges instead of OOTB roles #490

Merged
merged 1 commit into from
Aug 29, 2023
Merged

DEVEXP-546: Scaffold new roles using privileges instead of OOTB roles #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/com/marklogic/appdeployer/scaffold/ScaffoldGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ protected ObjectNode buildReaderRole(String appName) {
node.put("role-name", appName + "-reader");
node.put("description", "Can view documents, but not edit");
ArrayNode array = node.putArray("role");
array.add("rest-reader");
array.add(appName + "-nobody");
array = node.putArray("privilege");
array.add(buildPrivilege("rest-reader", "http://marklogic.com/xdmp/privileges/rest-reader", "execute"));
return node;
}

Expand All @@ -149,9 +150,9 @@ protected ObjectNode buildWriterRole(String appName) {
node.put("role-name", appName + "-writer");
node.put("description", "Can read and write documents");
ArrayNode array = node.putArray("role");
array.add("rest-writer");
array.add(appName + "-reader");
array = node.putArray("privilege");
array.add(buildPrivilege("rest-writer", "http://marklogic.com/xdmp/privileges/rest-writer", "execute"));
array.add(buildPrivilege("any-uri", "http://marklogic.com/xdmp/privileges/any-uri", "execute"));
array.add(buildPrivilege("unprotected-collections", "http://marklogic.com/xdmp/privileges/unprotected-collections", "execute"));
return node;
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/com/marklogic/appdeployer/scaffold/GenerateScaffoldTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,9 @@ private void assertSecurity(Boolean shouldExist) {
assertEquals(shouldExist, new RoleManager(manageClient).exists("sample-app-writer"));
assertEquals(shouldExist, new RoleManager(manageClient).exists("sample-app-internal"));
assertEquals(shouldExist, new RoleManager(manageClient).exists("sample-app-admin"));
if (shouldExist) {
assertTrue(new RoleManager(manageClient).getPropertiesAsXmlString("sample-app-reader").contains("http://marklogic.com/xdmp/privileges/rest-reader"));
assertTrue(new RoleManager(manageClient).getPropertiesAsXmlString("sample-app-writer").contains("http://marklogic.com/xdmp/privileges/rest-writer"));
}
}
}