diff --git a/java/com.sap.sailing.xmlexport/META-INF/MANIFEST.MF b/java/com.sap.sailing.xmlexport/META-INF/MANIFEST.MF index b3f3cdb6dac..3836779d369 100644 --- a/java/com.sap.sailing.xmlexport/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.xmlexport/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: com.sap.sailing.server, com.sap.sse.replication, org.jdom;bundle-version="1.1.1", com.sap.sailing.server.interface, - com.sap.sse.security + com.sap.sse.security, + org.apache.shiro.core Bundle-ClassPath: . Web-ContextPath: /export Automatic-Module-Name: com.sap.sailing.xmlexport diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java index 3073cd77c58..1472b27b27f 100644 --- a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java +++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java @@ -45,7 +45,7 @@ public abstract class ExportAction { private Leaderboard leaderboard; protected final boolean useProvidedLeaderboard; private String resultingXMLData; - private final SecurityService securityService; + protected final SecurityService securityService; public ExportAction(HttpServletRequest req, HttpServletResponse res, RacingEventService service, final SecurityService securityService) { diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java index c4ca9278d47..97d3eed5715 100644 --- a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java +++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java @@ -1033,6 +1033,7 @@ public class LeaderboardData extends ExportAction { public void perform() throws Exception { final Leaderboard leaderboard = getLeaderboard(); + securityService.checkCurrentUserReadPermission(leaderboard); TimePoint timeSpent = MillisecondsTimePoint.now(); log.info("Starting XML export of " + leaderboard.getName()); Util.Pair> leaderboardConfidenceAndErrorMessages = checkData(leaderboard); @@ -1052,6 +1053,9 @@ public class LeaderboardData extends ExportAction { for (Fleet fleet : raceColumn.getFleets()) { TrackedRace trackedRace = raceColumn.getTrackedRace(fleet); if (trackedRace != null) { + if (!securityService.hasCurrentUserReadPermission(trackedRace)) { + continue; + } sameDayGroupIndex += getSameDayGroupIndex(raceColumn.getTrackedRace(fleet), raceBefore); } TimePoint timeSpentForRace = MillisecondsTimePoint.now(); diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java index e58bf9d62fc..ee357d6e115 100755 --- a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java +++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java @@ -6,6 +6,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.shiro.authz.UnauthorizedException; + import com.sap.sailing.server.gateway.SailingServerHttpServlet; public class XmlExportServlet extends SailingServerHttpServlet { @@ -19,7 +21,11 @@ public class XmlExportServlet extends SailingServerHttpServlet { if ("leaderboard".equalsIgnoreCase(action)) { final LeaderboardData leaderboardData = new LeaderboardData(req, res, getService(), getSecurityService()); + try { leaderboardData.perform(); + } catch (UnauthorizedException e) { + res.sendError(HttpServletResponse.SC_UNAUTHORIZED, e.getMessage()); + } return; } else if ("foiling".equalsIgnoreCase(action)) { final FoilingData foilingData = new FoilingData(req, res, getService(), getSecurityService());