Skip to content

Commit c1eec1f

Browse files
authored
Create priv directories under the security directors to make more clear, equals ignore case on jobs just incase someone has a lower-case version of it (#1499) (#1501)
1 parent 3a55399 commit c1eec1f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/DataHubImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public HashMap<String, Boolean> runPreInstallCheck(Versions versions) {
417417
}
418418

419419
serverName = portsInUse.get(hubConfig.getPort(DatabaseKind.JOB));
420-
jobPortInUse = ports.contains(hubConfig.getPort(DatabaseKind.JOB)) && serverName != null && !serverName.equals(hubConfig.getHttpName(DatabaseKind.JOB));
420+
jobPortInUse = ports.contains(hubConfig.getPort(DatabaseKind.JOB)) && serverName != null && !serverName.equalsIgnoreCase(hubConfig.getHttpName(DatabaseKind.JOB));
421421
if (jobPortInUse) {
422422
jobPortInUseBy = serverName;
423423
}

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubProjectImpl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,20 +189,25 @@ public HubProjectImpl(String projectDirStr) {
189189
Path userSecurityDir = getUserSecurityDir();
190190
Path rolesDir = hubSecurityDir.resolve("roles");
191191
Path usersDir = hubSecurityDir.resolve("users");
192+
Path privilegesDir = hubSecurityDir.resolve("privileges");
192193

193194
Path userRolesDir = userSecurityDir.resolve("roles");
194195
Path userUsersDir = userSecurityDir.resolve("users");
196+
Path userPrivilegesDir = userSecurityDir.resolve("privileges");
195197

196198
rolesDir.toFile().mkdirs();
197199
usersDir.toFile().mkdirs();
200+
privilegesDir.toFile().mkdirs();
198201

199202
userRolesDir.toFile().mkdirs();
200203
userUsersDir.toFile().mkdirs();
204+
userPrivilegesDir.toFile().mkdirs();
201205

202206
writeResourceFile("hub-internal-config/security/roles/data-hub-role.json", rolesDir.resolve("data-hub-role.json"), true);
203207
writeResourceFile("hub-internal-config/security/users/data-hub-user.json", usersDir.resolve("data-hub-user.json"), true);
204208
writeResourceFile("hub-internal-config/security/roles/hub-admin-role.json", rolesDir.resolve("hub-admin-role.json"), true);
205-
writeResourceFile("hub-internal-config/security/users/hub-admin-user.json", usersDir.resolve("hub-admin-user.json"), true);
209+
writeResourceFile("hub-internal-config/security/users/hub-admin-user.json", usersDir.resolve("hub-admin-user.json"), true);
210+
206211

207212
getUserServersDir().toFile().mkdirs();
208213
getUserDatabaseDir().toFile().mkdirs();

0 commit comments

Comments
 (0)