eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-10 21:02:40 +00:00
Code Activity

Ensures that created sailing_viewer RoleDefinition has a proper

Browse Source 
ownership set initially
This commit is contained in:
Steffen Schaefer committed 2019-02-12 13:51:06 +01:00
1 parent 781bf525c0
commit 55ffdd9fb0
1 file changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
+8 -4
View File
@@ -126,10 +126,10 @@ public class Activator implements BundleActivator {
AccessControlStore accessControlStore = accessControlStoreTracker.waitForService(0);
userStore.clear();
accessControlStore.clear();
createRoleDefinitionsFromPrototypes(userStore);
userStore.ensureDefaultRolesExist();
userStore.ensureDefaultTenantExists();
getSecurityService().initialize();
createRoleDefinitionsFromPrototypes(userStore);
applyCustomizations();
}
@@ -149,7 +149,6 @@ public class Activator implements BundleActivator {
context.registerService(Replicable.class.getName(), initialSecurityService, replicableServiceProperties);
context.registerService(ClearStateTestSupport.class.getName(), initialSecurityService, null);
Logger.getLogger(Activator.class.getName()).info("Security Service registered.");
applyCustomizations();
}
private void createRoleDefinitionsFromPrototypes(UserStore userStore) {
@@ -166,7 +165,10 @@ public class Activator implements BundleActivator {
final RolePrototype rolePrototype = service.getRolePrototype();
final RoleDefinition potentiallyExistingRoleDefinition = userStore.getRoleDefinition(rolePrototype.getId());
if (potentiallyExistingRoleDefinition == null) {
userStore.createRoleDefinition(rolePrototype.getId(), rolePrototype.getName(), rolePrototype.getPermissions());
final RoleDefinition createdRoleDefinition = userStore.createRoleDefinition(
rolePrototype.getId(), rolePrototype.getName(), rolePrototype.getPermissions());
getSecurityService().setOwnership(createdRoleDefinition.getIdentifier(), null,
getSecurityService().getDefaultTenant());
}
return service;
}
@@ -228,7 +230,6 @@ public class Activator implements BundleActivator {
final UserStore userStore = userStoreTracker.waitForService(0);
final AccessControlStore accessControlStore = accessControlStoreTracker.waitForService(0);
logger.info("Obtained UserStore service "+userStore);
createRoleDefinitionsFromPrototypes(userStore);
// must be called after the definition of the prototypes and after loading actual roles, but before
// loading users
userStore.ensureDefaultRolesExist();
@@ -238,6 +239,9 @@ public class Activator implements BundleActivator {
accessControlStore.loadACLsAndOwnerships();
// create security service, it will also create a default admin user if no users exist
createAndRegisterSecurityService(bundleContext, userStore, accessControlStore);
createRoleDefinitionsFromPrototypes(userStore);
applyCustomizations();
migrate(userStore, securityService.get());
} catch (InterruptedException | UserGroupManagementException | UserManagementException | ExecutionException e) {