eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

Merge branch 'permission-vertical' into bug4813

Browse Source 
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
This commit is contained in:
Steffen Schaefer
2018-12-19 08:47:46 +01:00
parent 637d6edda8 7dddae939c
commit d412abac09
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
+6 -5
View File
@@ -67,8 +67,9 @@ public class TaggingServiceTest {
private final static String leaderboardName = "Leaderboard";
private final static String raceColumnName = "RaceColumn";
private final static String fleetName = "Default";
private final static WildcardPermission editLeaderboardPermission = SecuredDomainType.LEADERBOARD
.getPermissionForTypeRelativeIdentifier(DefaultActions.UPDATE, Leaderboard.getTypeRelativeObjectIdentifier(leaderboardName));
private final static WildcardPermission readAndEditLeaderboardPermission = WildcardPermission.builder()
.withTypes(SecuredDomainType.LEADERBOARD).withActions(DefaultActions.UPDATE, DefaultActions.READ)
.withIds(Leaderboard.getTypeRelativeObjectIdentifier(leaderboardName)).build();
// tagging & utilities
private final static Logger logger = Logger.getLogger(TaggingServiceTest.class.getName());
@@ -118,7 +119,7 @@ public class TaggingServiceTest {
@Before
public void resetEnvironment() {
securityService.addPermissionForUser(username, editLeaderboardPermission);
securityService.addPermissionForUser(username, readAndEditLeaderboardPermission);
securityService.unsetPreference(username,
serializer.generateUniqueKey(leaderboardName, raceColumnName, fleetName));
final RaceLog raceLog = racingService.getRaceLog(leaderboardName, raceColumnName, fleetName);
@@ -164,14 +165,14 @@ public class TaggingServiceTest {
imageURL, false, subject.getPrincipal().toString(), raceTimepoint));
try {
logger.info("Trying to add public tag with missing permissions which should be catched by this test.");
securityService.removePermissionFromUser(username, editLeaderboardPermission);
securityService.removePermissionFromUser(username, readAndEditLeaderboardPermission);
taggingService.addTag(leaderboardName, raceColumnName, fleetName, tag, comment, imageURL, imageURL, true,
raceTimepoint);
fail("Tag should not be added because user is missing permissions!");
} catch (AuthorizationException e) {
assertTrue("Missing permissions were caught correctly!", true);
} finally {
securityService.addPermissionForUser(username, editLeaderboardPermission);
securityService.addPermissionForUser(username, readAndEditLeaderboardPermission);
}
try {
logger.info(