LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

UUIDs for generated entities were not set in several setup classes

Jens Pelzetter 2020-02-17 21:31:01 +01:00
parent 48d72ffe51
commit bdde67db3f
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java
View File

@ -43,6 +43,7 @@ public class ApplicationRoleSetup {
public Role createRole(final String name) { public Role createRole(final String name) {
final Role role = new Role(); final Role role = new Role();
role.setUuid(UUID.randomUUID().toString());
role.setName(name); role.setName(name);
entityManager.persist(role); entityManager.persist(role);

7
ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java
View File

@ -26,9 +26,11 @@ import org.libreccm.core.EmailAddress;
import org.libreccm.modules.InstallEvent; import org.libreccm.modules.InstallEvent;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
import java.util.UUID;
/** /**
* Class used by {@link CcmCore#install(org.libreccm.modules.InstallEvent)} to * Class used by {@link CcmCore#install(org.libreccm.modules.InstallEvent)} to
@ -79,6 +81,7 @@ public class SystemUsersSetup {
ADMIN_PASSWORD, DEFAULT_ADMIN_PW);; ADMIN_PASSWORD, DEFAULT_ADMIN_PW);;
final User admin = new User(); final User admin = new User();
admin.setUuid(UUID.randomUUID().toString());
admin.setName(adminName); admin.setName(adminName);
admin.setFamilyName(adminFamilyName); admin.setFamilyName(adminFamilyName);
admin.setGivenName(adminGivenName); admin.setGivenName(adminGivenName);
@ -88,13 +91,16 @@ public class SystemUsersSetup {
admin.setPassword(adminPassword); admin.setPassword(adminPassword);
final Role adminRole = new Role(); final Role adminRole = new Role();
adminRole.setUuid(UUID.randomUUID().toString());
adminRole.setName(CoreConstants.SYS_ADMIN_ROLE); adminRole.setName(CoreConstants.SYS_ADMIN_ROLE);
final RoleMembership membership = new RoleMembership(); final RoleMembership membership = new RoleMembership();
membership.setUuid(UUID.randomUUID().toString());
membership.setRole(adminRole); membership.setRole(adminRole);
membership.setMember(admin); membership.setMember(admin);
final Permission adminPermission = new Permission(); final Permission adminPermission = new Permission();
adminPermission.setUuid(UUID.randomUUID().toString());
adminPermission.setGrantee(adminRole); adminPermission.setGrantee(adminRole);
adminPermission.setGrantedPrivilege("*"); adminPermission.setGrantedPrivilege("*");
@ -109,6 +115,7 @@ public class SystemUsersSetup {
private void createPublicUser() { private void createPublicUser() {
final User user = new User(); final User user = new User();
user.setUuid(UUID.randomUUID().toString());
user.setName("public-user"); user.setName("public-user");
user.setFamilyName("LibreCCM"); user.setFamilyName("LibreCCM");
user.setGivenName("Public User"); user.setGivenName("Public User");

5
ccm-shortcuts/src/main/java/org/libreccm/security/ShortcutsRolesSetup.java
View File

@ -19,8 +19,11 @@
package org.libreccm.security; package org.libreccm.security;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import org.libreccm.shortcuts.ShortcutsConstants; import org.libreccm.shortcuts.ShortcutsConstants;
import java.util.UUID;
/** /**
* Setups the {@code shortcuts-manager} role. The * Setups the {@code shortcuts-manager} role. The
* {@link ShortcutsConstants#SHORTSCUT_MANAGE_PRIVILEGE} is granted to this * {@link ShortcutsConstants#SHORTSCUT_MANAGE_PRIVILEGE} is granted to this
@ -38,10 +41,12 @@ public class ShortcutsRolesSetup {
public void setupShortcutsRoles() { public void setupShortcutsRoles() {
final Role shortcutsManager = new Role(); final Role shortcutsManager = new Role();
shortcutsManager.setUuid(UUID.randomUUID().toString());
shortcutsManager.setName("shortcuts-manager"); shortcutsManager.setName("shortcuts-manager");
entityManager.persist(shortcutsManager); entityManager.persist(shortcutsManager);
final Permission permission = new Permission(); final Permission permission = new Permission();
permission.setUuid(UUID.randomUUID().toString());
permission.setGrantee(shortcutsManager); permission.setGrantee(shortcutsManager);
permission.setGrantedPrivilege( permission.setGrantedPrivilege(
ShortcutsConstants.SHORTSCUT_MANAGE_PRIVILEGE); ShortcutsConstants.SHORTSCUT_MANAGE_PRIVILEGE);