From 3e75a01445f0f993e62de117621ee5af9469e1aa Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 5 Sep 2014 18:14:58 +0200 Subject: [PATCH] [Minor] added certificate validation to VersionQuery --- .../li/strolch/rest/endpoint/VersionQuery.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/li/strolch/rest/endpoint/VersionQuery.java b/src/main/java/li/strolch/rest/endpoint/VersionQuery.java index 3d627e2e6..f7918f9f4 100644 --- a/src/main/java/li/strolch/rest/endpoint/VersionQuery.java +++ b/src/main/java/li/strolch/rest/endpoint/VersionQuery.java @@ -15,15 +15,20 @@ */ package li.strolch.rest.endpoint; +import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; import javax.ws.rs.core.GenericEntity; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.VersionQueryResult; import li.strolch.rest.RestfulStrolchComponent; +import li.strolch.rest.StrolchRestfulConstants; +import ch.eitchnet.privilege.model.Certificate; /** * @author Robert von Burg @@ -33,9 +38,14 @@ public class VersionQuery { @GET @Produces(MediaType.APPLICATION_JSON) - public Response getVersions() { - VersionQueryResult versionQueryResult = RestfulStrolchComponent.getInstance().getContainer().getAgent() - .getVersion(); + public Response getVersions(@Context HttpServletRequest request) { + + ComponentContainer container = RestfulStrolchComponent.getInstance().getContainer(); + + Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); + container.getPrivilegeHandler().isCertificateValid(cert); + + VersionQueryResult versionQueryResult = container.getAgent().getVersion(); GenericEntity entity = new GenericEntity(versionQueryResult, VersionQueryResult.class) { };