eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 04:35:32 +00:00
Code Activity

bug5230: Removed all SecurityServiceImpl constructors allowing null as

Browse Source 
hasPermissionsProvider
This commit is contained in:
Dennis Aulenbacher
2021-03-15 16:17:37 +01:00
parent cf7a6398c2
commit 779fb6136f
6 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
+2 -1
View File
@@ -36,7 +36,8 @@ Require-Bundle: com.sap.sailing.server,
org.eclipse.jetty.osgi-servlet-api;bundle-version="3.1.0",
com.sap.sailing.server.interface,
org.mongodb.mongo-java-driver;bundle-version="3.6.4",
com.sap.sse.security.common
com.sap.sse.security.common,
com.sap.sse.mail
Automatic-Module-Name: com.sap.sailing.server.testsupport
Import-Package: com.sap.sse.security.userstore.mongodb,
org.osgi.framework;version="1.8.0",
java/com.sap.sailing.server.testsupport/src/com/sap/sailing/server/testsupport/SecurityBundleTestWrapper.java
+9 -5
View File
@@ -14,7 +14,7 @@ import com.sap.sse.util.ServiceTrackerFactory;
public class SecurityBundleTestWrapper {
private static final Logger logger = Logger.getLogger(SecurityBundleTestWrapper.class.getName());
public SecurityService initializeSecurityServiceForTesting() throws Exception {
final SecurityService securityService;
if (Activator.getContext() == null) {
@@ -24,17 +24,20 @@ public class SecurityBundleTestWrapper {
store.ensureServerGroupExists();
final AccessControlStoreImpl accessControlStoreImpl = new AccessControlStoreImpl(store);
Activator.setTestStores(store, accessControlStoreImpl);
securityService = new SecurityServiceImpl(store, accessControlStoreImpl);
securityService = new SecurityServiceImpl(null, store, accessControlStoreImpl,
new MockedHasPermissionProvider());
((SecurityServiceImpl) securityService).clearState();
securityService.initialize();
SecurityUtils.setSecurityManager(securityService.getSecurityManager());
Activator.setSecurityService(securityService);
} else {
logger.info("Creating dummy UserStoreImpl to trigger loading of userstore mongodb bundle");
new UserStoreImpl("defaultTenant"); // only to trigger bundle loading and activation so that security service can find the bundle and its original user store
new UserStoreImpl("defaultTenant"); // only to trigger bundle loading and activation so that security
// service can find the bundle and its original user store
logger.info("Setup for TaggingServiceTest in an OSGi environment");
// Note: This timeout of 3 minutes is just for debugging purposes and should not be used in production!
final ServiceTracker<SecurityService, SecurityService> serviceTracker = ServiceTrackerFactory.createAndOpen(Activator.getContext(), SecurityService.class);
final ServiceTracker<SecurityService, SecurityService> serviceTracker = ServiceTrackerFactory
.createAndOpen(Activator.getContext(), SecurityService.class);
if (serviceTracker == null) {
logger.severe("Couldn't obtain service tracker for SecurityService");
securityService = null;
@@ -43,7 +46,8 @@ public class SecurityBundleTestWrapper {
if (securityService == null) {
logger.severe("Waiting for the SecurityService timed out");
} else {
// the security manager may have been set to other mock objects by other tests while the SecurityService survived
// the security manager may have been set to other mock objects by other tests while the
// SecurityService survived
SecurityUtils.setSecurityManager(securityService.getSecurityManager());
}
}