From b1b0eafa3f069edec1ddf91fd8b04aab1b0dece7 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Wed, 27 Mar 2019 09:14:35 +0100 Subject: [PATCH] Renamed methods in SecurityService having "any" in their name to explicitly distinct this case from the any check available via PermissionChecker --- .../user/profile/GetCompetitorAction.java | 2 +- ...rTrackWithEstimationDataJsonSerializer.java | 2 +- .../impl/RegattaJsonSerializer.java | 4 ++-- .../gateway/jaxrs/api/BoatsResource.java | 2 +- .../gateway/jaxrs/api/CompetitorsResource.java | 2 +- .../jaxrs/api/LeaderboardsResource.java | 2 +- .../gateway/jaxrs/api/RegattasResource.java | 18 +++++++++--------- .../jaxrs/api/SecurityResourceTest.java | 16 ++++++++-------- .../ui/server/UserManagementServiceImpl.java | 2 +- .../com/sap/sse/security/SecurityService.java | 4 ++-- .../sse/security/impl/SecurityServiceImpl.java | 4 ++-- .../security/jaxrs/api/SecurityResource.java | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/user/profile/GetCompetitorAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/user/profile/GetCompetitorAction.java index 393aa032963..a3d796a45f9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/user/profile/GetCompetitorAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/user/profile/GetCompetitorAction.java @@ -39,7 +39,7 @@ public class GetCompetitorAction implements SailingAction { if (competitorSerializer != null) { JSONArray competitorsJson = new JSONArray(); for (Competitor competitor : regatta.getAllCompetitors()) { - if (securityService.hasCurrentUserAnyExplicitPermissions(competitor, + if (securityService.hasCurrentUserOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { competitorsJson.add(competitorSerializer.serialize(competitor)); } @@ -74,7 +74,7 @@ public class RegattaJsonSerializer implements JsonSerializer { if (regatta.canBoatsOfCompetitorsChangePerRace() && boatSerializer != null) { JSONArray boatsJson = new JSONArray(); for (Boat boat : regatta.getAllBoats()) { - if (securityService.hasCurrentUserAnyExplicitPermissions(boat, + if (securityService.hasCurrentUserOneOfExplicitPermissions(boat, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { boatsJson.add(boatSerializer.serialize(boat)); } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BoatsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BoatsResource.java index 67f269ebc2e..0b151b6c529 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BoatsResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BoatsResource.java @@ -40,7 +40,7 @@ public class BoatsResource extends AbstractSailingServerResource { boatInRegatta = Util.contains(regatta.getAllBoats(), boat); } if (!(skip && boatInRegatta)) { - getSecurityService().checkCurrentUserAnyExplicitPermissions(boat, + getSecurityService().checkCurrentUserHasOneOfExplicitPermissions(boat, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS); } BoatJsonSerializer boatJsonSerializer = BoatJsonSerializer.create(); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java index 3f018cb35c0..a779d2a0789 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java @@ -95,7 +95,7 @@ public class CompetitorsResource extends AbstractSailingServerResource { competitorInRegatta = Util.contains(regatta.getAllCompetitors(), competitor); } if (!(skip && competitorInRegatta)) { - getSecurityService().checkCurrentUserAnyExplicitPermissions(competitor, + getSecurityService().checkCurrentUserHasOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS); } String jsonString = getCompetitorJSON(competitor).toJSONString(); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java index 479de50482a..aae2762641f 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java @@ -503,7 +503,7 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { boolean skip = skipChecksDueToCorrectSecret(leaderboardName, secret); if (!skip) { getSecurityService().checkCurrentUserReadPermission(leaderboard); - getSecurityService().checkCurrentUserAnyExplicitPermissions(competitor, + getSecurityService().checkCurrentUserHasOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS); } JSONObject json = CompetitorsResource.getCompetitorJSON(competitor); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java index baeb531759c..c1e3adb60d3 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java @@ -336,7 +336,7 @@ public class RegattasResource extends AbstractSailingServerResource { final CompetitorJsonSerializer competitorSerializer = CompetitorJsonSerializer.create(); final JSONArray result = new JSONArray(); for (final Competitor competitor : regatta.getAllCompetitors()) { - if (getSecurityService().hasCurrentUserAnyExplicitPermissions(competitor, + if (getSecurityService().hasCurrentUserOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { result.add(competitorSerializer.serialize(competitor)); } @@ -369,7 +369,7 @@ public class RegattasResource extends AbstractSailingServerResource { if (competitor == null) { response = getBadCompetitorIdResponse(competitorId); } else { - getSecurityService().checkCurrentUserAnyExplicitPermissions(competitor, + getSecurityService().checkCurrentUserHasOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS); regatta.registerCompetitor(competitor); response = Response.ok().build(); @@ -614,7 +614,7 @@ public class RegattasResource extends AbstractSailingServerResource { if (boat == null) { response = Response.status(Status.NOT_FOUND).entity("Boat is not valid").type(MediaType.TEXT_PLAIN).build(); } else { - getSecurityService().checkCurrentUserAnyExplicitPermissions(boat, + getSecurityService().checkCurrentUserHasOneOfExplicitPermissions(boat, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS); response = createAndAddCompetitor(regattaName, nationalityThreeLetterIOCCode, displayColor, timeOnTimeFactor, timeOnDistanceAllowancePerNauticalMileAsMillis, searchTag, competitorName, @@ -670,7 +670,7 @@ public class RegattasResource extends AbstractSailingServerResource { if (competitor == null) { response = getBadCompetitorIdResponse(competitorId); } else { - getSecurityService().checkCurrentUserAnyExplicitPermissions(competitor, + getSecurityService().checkCurrentUserHasOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS); regatta.deregisterCompetitor(competitor); response = Response.ok().build(); @@ -733,7 +733,7 @@ public class RegattasResource extends AbstractSailingServerResource { jsonRace.put("regatta", regatta.getName()); JSONArray jsonCompetitors = new JSONArray(); for (Competitor competitor : trackedRace.getRace().getCompetitors()) { - if (getSecurityService().hasCurrentUserAnyExplicitPermissions(competitor, + if (getSecurityService().hasCurrentUserOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { if (competitorIds == null || competitorIds.isEmpty() || competitorIds.contains(competitor.getId().toString())) { @@ -1473,7 +1473,7 @@ public class RegattasResource extends AbstractSailingServerResource { } for (Competitor competitor : competitors) { - if (getSecurityService().hasCurrentUserAnyExplicitPermissions(competitor, + if (getSecurityService().hasCurrentUserOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { if (competitorFilter == null || competitor.getId().equals(competitorFilter)) { Iterable maneuversForCompetitor = trackedRace.getManeuvers(competitor, startTime, endTime, false); @@ -1669,7 +1669,7 @@ public class RegattasResource extends AbstractSailingServerResource { JSONArray jsonCompetitors = new JSONArray(); Map ranks = leg.getRanks(timePoint); for (Competitor competitor : trackedRace.getRace().getCompetitors()) { - if (getSecurityService().hasCurrentUserAnyExplicitPermissions(competitor, + if (getSecurityService().hasCurrentUserOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { JSONObject jsonCompetitorInLeg = new JSONObject(); TrackedLegOfCompetitor trackedLegOfCompetitor = leg.getTrackedLeg(competitor); @@ -1837,7 +1837,7 @@ public class RegattasResource extends AbstractSailingServerResource { List overallRanking = leaderboard.getCompetitorsFromBestToWorst(timePoint); Integer overallRank = 1; for (Competitor competitor : overallRanking) { - if (getSecurityService().hasCurrentUserAnyExplicitPermissions(competitor, + if (getSecurityService().hasCurrentUserOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { overallRankPerCompetitor.put(competitor, overallRank++); } @@ -1845,7 +1845,7 @@ public class RegattasResource extends AbstractSailingServerResource { } Integer rank = 1; for (Competitor competitor : competitorsFromBestToWorst) { - if (getSecurityService().hasCurrentUserAnyExplicitPermissions(competitor, + if (getSecurityService().hasCurrentUserOneOfExplicitPermissions(competitor, SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS)) { JSONObject jsonCompetitorInLeg = new JSONObject(); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java index 8e7f9ac8bbf..0e25b359f0d 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java @@ -89,17 +89,17 @@ public class SecurityResourceTest { @Test public void testCheckCurrentUserAnyExplicitPermissionsForNullObject() { - assertTrue(authenticatedAdmin.execute(()->service.hasCurrentUserAnyExplicitPermissions(/* object */ null, HasPermissions.DefaultActions.READ))); - authenticatedAdmin.execute(()->service.checkCurrentUserAnyExplicitPermissions(/* object */ null, HasPermissions.DefaultActions.READ)); + assertTrue(authenticatedAdmin.execute(()->service.hasCurrentUserOneOfExplicitPermissions(/* object */ null, HasPermissions.DefaultActions.READ))); + authenticatedAdmin.execute(()->service.checkCurrentUserHasOneOfExplicitPermissions(/* object */ null, HasPermissions.DefaultActions.READ)); } @Test public void testCheckCurrentUserAnyExplicitPermissionsForEmptyActionsList() { final MediaTrack mediaTrack = new MediaTrack(); mediaTrack.dbId = "Humba"; - assertFalse(authenticatedAdmin.execute(()->service.hasCurrentUserAnyExplicitPermissions(mediaTrack /* and an empty list of actions */))); + assertFalse(authenticatedAdmin.execute(()->service.hasCurrentUserOneOfExplicitPermissions(mediaTrack /* and an empty list of actions */))); try { - authenticatedAdmin.execute(()->service.checkCurrentUserAnyExplicitPermissions(mediaTrack /* and an empty list of actions */)); + authenticatedAdmin.execute(()->service.checkCurrentUserHasOneOfExplicitPermissions(mediaTrack /* and an empty list of actions */)); fail("Expected AuthorizationException due to empty actions list; user cannot have any of no exceptions"); } catch (AuthorizationException e) { // expected @@ -111,9 +111,9 @@ public class SecurityResourceTest { final MediaTrack mediaTrack = new MediaTrack(); mediaTrack.dbId = "Humba"; authenticatedAdmin.logout(); - assertFalse(authenticatedAdmin.execute(()->service.hasCurrentUserAnyExplicitPermissions(mediaTrack, HasPermissions.DefaultActions.READ))); + assertFalse(authenticatedAdmin.execute(()->service.hasCurrentUserOneOfExplicitPermissions(mediaTrack, HasPermissions.DefaultActions.READ))); try { - authenticatedAdmin.execute(()->service.checkCurrentUserAnyExplicitPermissions(mediaTrack, HasPermissions.DefaultActions.READ)); + authenticatedAdmin.execute(()->service.checkCurrentUserHasOneOfExplicitPermissions(mediaTrack, HasPermissions.DefaultActions.READ)); fail("Expected AuthorizationException"); } catch (AuthorizationException e) { // expected @@ -123,8 +123,8 @@ public class SecurityResourceTest { @Test public void testCheckCurrentUserAnyExplicitPermissionsForLoggedOutUserOnNullObject() { authenticatedAdmin.logout(); - assertTrue(authenticatedAdmin.execute(()->service.hasCurrentUserAnyExplicitPermissions(null, HasPermissions.DefaultActions.READ))); - authenticatedAdmin.execute(()->service.checkCurrentUserAnyExplicitPermissions(null, HasPermissions.DefaultActions.READ)); + assertTrue(authenticatedAdmin.execute(()->service.hasCurrentUserOneOfExplicitPermissions(null, HasPermissions.DefaultActions.READ))); + authenticatedAdmin.execute(()->service.checkCurrentUserHasOneOfExplicitPermissions(null, HasPermissions.DefaultActions.READ)); } @Test diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java index be698effce8..be9331ccf2a 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java @@ -521,7 +521,7 @@ public class UserManagementServiceImpl extends RemoteServiceServlet implements U public void updateSimpleUserPassword(final String username, String oldPassword, String passwordResetSecret, String newPassword) throws UserManagementException { final User user = getSecurityService().getUserByName(username); getSecurityService().checkCurrentUserUpdatePermission(user); - if (getSecurityService().hasCurrentUserAnyExplicitPermissions(user, UserActions.FORCE_OVERWRITE_PASSWORD)) { + if (getSecurityService().hasCurrentUserOneOfExplicitPermissions(user, UserActions.FORCE_OVERWRITE_PASSWORD)) { // e.g. admin is allowed to update the password without knowing the old password and/or secret getSecurityService().updateSimpleUserPassword(username, newPassword); sendPasswordChangedMailAsync(username); diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java index 032053fa5ce..50d7343dc77 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java @@ -435,7 +435,7 @@ public interface SecurityService extends ReplicableWithObjectInputStream