mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
Bug 4104: Adapted TaggingService and TaggingServiceTest to check their environment whether it is OSGi enabled or not and get security service from correct source (service tracker in OSGi, static reference of Activator in non-OSGi)
This commit is contained in:
1 parent
e0249a7f64
commit
cc59efcf49
3 files changed
+39
-28
No files matched your search
+16
-16
@@ -29,7 +29,6 @@ import com.sap.sailing.domain.common.tagging.RaceLogNotFoundException;
|
||||
import com.sap.sailing.domain.common.tagging.TagAlreadyExistsException;
|
||||
import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard;
|
||||
import com.sap.sailing.domain.leaderboard.impl.LowPoint;
|
||||
import com.sap.sailing.domain.persistence.impl.CollectionNames;
|
||||
import com.sap.sailing.server.RacingEventService;
|
||||
import com.sap.sailing.server.RacingEventServiceOperation;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
@@ -43,7 +42,6 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
import com.sap.sse.common.mail.MailException;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
import com.sap.sse.security.SecurityService;
|
||||
import com.sap.sse.security.UsernamePasswordRealm;
|
||||
import com.sap.sse.security.impl.Activator;
|
||||
import com.sap.sse.security.impl.SecurityServiceImpl;
|
||||
import com.sap.sse.security.shared.UserManagementException;
|
||||
@@ -80,17 +78,6 @@ public class TaggingServiceTest {
|
||||
public static void setUpClass()
|
||||
throws MalformedURLException, IOException, InterruptedException, UserManagementException, MailException {
|
||||
MongoDBService.INSTANCE.getDB().dropDatabase();
|
||||
// setup security service
|
||||
final UserStoreImpl store = new UserStoreImpl();
|
||||
Activator.setTestUserStore(store);
|
||||
UsernamePasswordRealm.setTestUserStore(store);
|
||||
securityService = new SecurityServiceImpl(null, store, true);
|
||||
Activator.setSecurityService(securityService);
|
||||
SecurityUtils.setSecurityManager(securityService.getSecurityManager());
|
||||
// create & login user
|
||||
securityService.createSimpleUser(username, email, password, fullName, company, null);
|
||||
subject = SecurityUtils.getSubject();
|
||||
subject.login(new UsernamePasswordToken(username, password));
|
||||
// setup racing service and racelog
|
||||
racingService = new RacingEventServiceImpl();
|
||||
RacingEventServiceOperation<FlexibleLeaderboard> addLeaderboardOp = new CreateFlexibleLeaderboard(
|
||||
@@ -99,6 +86,22 @@ public class TaggingServiceTest {
|
||||
RacingEventServiceOperation<RaceColumn> addLeaderboardColumn = new AddColumnToLeaderboard(raceColumnName,
|
||||
leaderboardName, true);
|
||||
racingService.apply(addLeaderboardColumn);
|
||||
// setup security service
|
||||
if (Activator.getContext() == null) {
|
||||
logger.info("Setup for TaggingServiceTest in a non-OSGi environment");
|
||||
final UserStoreImpl store = new UserStoreImpl();
|
||||
Activator.setTestUserStore(store);
|
||||
securityService = new SecurityServiceImpl(store);
|
||||
SecurityUtils.setSecurityManager(securityService.getSecurityManager());
|
||||
Activator.setSecurityService(securityService);
|
||||
} else {
|
||||
logger.info("Setup for TaggingServiceTest in an OSGi environment");
|
||||
securityService = Activator.getSecurityService();
|
||||
}
|
||||
// create & login user
|
||||
securityService.createSimpleUser(username, email, password, fullName, company, null);
|
||||
subject = SecurityUtils.getSubject();
|
||||
subject.login(new UsernamePasswordToken(username, password));
|
||||
// setup tagging service
|
||||
taggingService = new TaggingServiceImpl(racingService);
|
||||
}
|
||||
@@ -116,9 +119,6 @@ public class TaggingServiceTest {
|
||||
|
||||
@Before
|
||||
public void resetEnvironment() {
|
||||
MongoDBService.INSTANCE.getDB().getCollection(CollectionNames.RACE_LOGS.name()).drop();
|
||||
// TODO: Receive name for preferences collection programatically
|
||||
MongoDBService.INSTANCE.getDB().getCollection("PREFERENCES").drop();
|
||||
securityService.addPermissionForUser(username, editLeaderboardPermission);
|
||||
securityService.unsetPreference(username,
|
||||
serializer.generateUniqueKey(leaderboardName, raceColumnName, fleetName));
|
||||
|
||||
@@ -64,6 +64,8 @@ public class Activator implements BundleActivator {
|
||||
|
||||
private static ExtenderBundleTracker extenderBundleTracker;
|
||||
|
||||
private static BundleContext context;
|
||||
|
||||
private CachedOsgiTypeBasedServiceFinderFactory serviceFinderFactory;
|
||||
|
||||
private RacingEventServiceImpl racingEventService;
|
||||
@@ -99,6 +101,8 @@ public class Activator implements BundleActivator {
|
||||
}
|
||||
|
||||
public void start(BundleContext context) throws Exception {
|
||||
Activator.context = context;
|
||||
|
||||
extenderBundleTracker = new ExtenderBundleTracker(context);
|
||||
extenderBundleTracker.open();
|
||||
|
||||
@@ -186,6 +190,10 @@ public class Activator implements BundleActivator {
|
||||
properties));
|
||||
}
|
||||
|
||||
public static BundleContext getContext() {
|
||||
return context;
|
||||
}
|
||||
|
||||
public void stop(BundleContext context) throws Exception {
|
||||
masterDataImportClassLoaderServiceTracker.close();
|
||||
if (extenderBundleTracker != null) {
|
||||
@@ -274,5 +282,4 @@ public class Activator implements BundleActivator {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+15
-11
@@ -6,6 +6,7 @@ import java.util.List;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authz.AuthorizationException;
|
||||
import org.apache.shiro.subject.Subject;
|
||||
import org.osgi.util.tracker.ServiceTracker;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLog;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogTagEvent;
|
||||
@@ -22,20 +23,23 @@ import com.sap.sailing.domain.common.tagging.ServiceNotFoundException;
|
||||
import com.sap.sailing.domain.common.tagging.TagAlreadyExistsException;
|
||||
import com.sap.sailing.domain.tracking.TrackedRace;
|
||||
import com.sap.sailing.server.RacingEventService;
|
||||
import com.sap.sailing.server.impl.Activator;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
import com.sap.sse.security.SecurityService;
|
||||
import com.sap.sse.security.impl.Activator;
|
||||
import com.sap.sse.util.ServiceTrackerFactory;
|
||||
|
||||
public class TaggingServiceImpl implements TaggingService {
|
||||
|
||||
private final ServiceTracker<SecurityService, SecurityService> securityServiceTracker;
|
||||
private final RacingEventService racingService;
|
||||
private final TagDTODeSerializer serializer;
|
||||
|
||||
public TaggingServiceImpl(RacingEventService racingService) {
|
||||
this.racingService = racingService;
|
||||
serializer = new TagDTODeSerializer();
|
||||
securityServiceTracker = ServiceTrackerFactory.createAndOpen(Activator.getContext(), SecurityService.class);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -59,7 +63,14 @@ public class TaggingServiceImpl implements TaggingService {
|
||||
* @throws ServiceNotFoundException
|
||||
*/
|
||||
private SecurityService getSecurityService() throws ServiceNotFoundException {
|
||||
SecurityService securityService = Activator.getSecurityService();
|
||||
SecurityService securityService;
|
||||
// securityServiceTracker is null in non-OSGi environment (local JUnit tests) => use static reference of
|
||||
// security service, otherwise use OSGi service tracker
|
||||
if (securityServiceTracker != null) {
|
||||
securityService = securityServiceTracker.getService();
|
||||
} else {
|
||||
securityService = com.sap.sse.security.impl.Activator.getSecurityService();
|
||||
}
|
||||
if (securityService == null) {
|
||||
throw new ServiceNotFoundException("Security service not found!");
|
||||
}
|
||||
@@ -93,15 +104,8 @@ public class TaggingServiceImpl implements TaggingService {
|
||||
private void addPrivateTag(String leaderboardName, String raceColumnName, String fleetName, String tag,
|
||||
String comment, String imageURL, TimePoint raceTimepoint)
|
||||
throws AuthorizationException, ServiceNotFoundException, TagAlreadyExistsException {
|
||||
SecurityService securityService = Activator.getSecurityService();
|
||||
if (securityService == null) {
|
||||
throw new ServiceNotFoundException("Security service not found!");
|
||||
}
|
||||
Subject subject = SecurityUtils.getSubject();
|
||||
if (subject.getPrincipal() == null) {
|
||||
throw new AuthorizationException();
|
||||
}
|
||||
String username = subject.getPrincipal().toString();
|
||||
SecurityService securityService = getSecurityService();
|
||||
String username = getCurrentUsername();
|
||||
TagDTODeSerializer serializer = new TagDTODeSerializer();
|
||||
String key = serializer.generateUniqueKey(leaderboardName, raceColumnName, fleetName);
|
||||
String privateTagsJson = securityService.getPreference(username, key);
|
||||
|
||||
Reference in new issue
Block a user