fix response model

Author: Joffry Ferrater

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/common/JsonUtility.java

@@ -18,6 +18,7 @@ private JsonUtility(){}
     }
 
     public static Response getPDPResponse(String responseBody) throws IOException {
+        System.out.println(responseBody);
         return pdpResponseReader.readValue(responseBody, Response.class);
     }
 }

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionRoot.java

@@ -72,7 +72,7 @@ private Request getAllCategoriesRequest(String attributeId, List<Object> values)
 
 
     private boolean isPermitted(Response response) {
-        final boolean isPermitted = "Permit".equals(response.getDecision());
+        final boolean isPermitted = "Permit".equals(response.getResults().get(0).getDecision());
         LOGGER.debug("isPermitted: {}", isPermitted);
         return isPermitted;
     }

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/security/AbacWebSecurityExpressionRoot.java

@@ -51,7 +51,7 @@ public boolean hasAccessToPath(String attributeId, List<Object> values) {
      * @return true if current user is permitted
      */
     protected boolean isPermitted(Response response) {
-        final boolean isPermitted = "Permit".equals(response.getDecision());
+        final boolean isPermitted = "Permit".equals(response.getResults().get(0).getDecision());
         LOGGER.debug("isPermitted: {}", isPermitted);
         return isPermitted;
     }

Diff for: security-expression-root/src/test/java/com/github/joffryferrater/pep/TestBase.java

@@ -10,7 +10,9 @@
 import com.github.joffryferrater.pep.client.PdpClient;
 import com.github.joffryferrater.pep.configuration.PdpConfiguration;
 import com.github.joffryferrater.response.Response;
+import com.github.joffryferrater.response.Result;
 import java.util.Collection;
+import java.util.Collections;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.client.RestClientTest;
 import org.springframework.http.HttpMethod;
@@ -33,13 +35,14 @@ public class TestBase {
     @Autowired
     private ObjectMapper objectMapper;
 
-    protected Response mockPdpResponse(String decision) {
-        Response pdpResponse = new Response();
+    protected Result mockResult(String decision) {
+        Result pdpResponse = new Result();
         pdpResponse.setDecision(decision);
         return pdpResponse;
     }
 
-    protected void setExpectedPdpResponse(Response pdpResponse) throws JsonProcessingException {
+    protected void setExpectedPdpResponse(Result result) throws JsonProcessingException {
+        Response pdpResponse = new Response(Collections.singletonList(result));
         String responseInString = objectMapper.writeValueAsString(pdpResponse);
         this.server.expect(requestTo(configuration.getAuthorizeEndpoint()))
             .andExpect(method(HttpMethod.POST))

Diff for: security-expression-root/src/test/java/com/github/joffryferrater/pep/client/PdpClientTest.java

@@ -11,6 +11,7 @@
 import com.github.joffryferrater.request.Request;
 import com.github.joffryferrater.request.XacmlRequest;
 import com.github.joffryferrater.response.Response;
+import com.github.joffryferrater.response.Result;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,8 +30,8 @@ public class PdpClientTest extends TestBase {
 
     @Before
     public void setUp() throws JsonProcessingException {
-        Response pdpResponse = mockPdpResponse("Permit");
-        setExpectedPdpResponse(pdpResponse);
+        Result result = mockResult("Permit");
+        setExpectedPdpResponse(result);
     }
 
     @Test
@@ -51,7 +52,7 @@ public void shouldReturnPdpResponse() throws IOException {
         request.setAccessSubjectCategory(accessSubjectCategoryList);
         Response response = target.sendXacmlJsonRequest(new XacmlRequest(request));
 
-        assertThat(response.getDecision(), is("Permit"));
+        assertThat(response.getResults().get(0).getDecision(), is("Permit"));
     }
 
 }

Diff for: security-expression-root/src/test/java/com/github/joffryferrater/pep/common/JsonUtilityTest.java

@@ -14,11 +14,11 @@ public void shouldDeserializePdpResponse() throws IOException {
         final String responseInString = getPdpResponse();
         Response response = JsonUtility.getPDPResponse(responseInString);
 
-        assertThat(response.getDecision(), is("NotApplicable"));
+        assertThat(response.getResults().get(0).getDecision(), is("NotApplicable"));
     }
 
     private String getPdpResponse() {
-        return "[{\n"
+        return "{\"Response\":[{\n"
             + "\t\"Decision\": \"NotApplicable\",\n"
             + "\t\"Status\": {\n"
             + "\t\t\"StatusCode\": {\n"
@@ -29,6 +29,6 @@ private String getPdpResponse() {
             + "\t\"Obligations\": [],\n"
             + "\t\"AssociatedAdvice\": [],\n"
             + "\t\"Category\": []\n"
-            + "}]";
+            + "}]}";
     }
 }

Diff for: security-expression-root/src/test/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionRootTest.java

@@ -11,7 +11,7 @@
 import com.github.joffryferrater.request.Attribute;
 import com.github.joffryferrater.request.EnvironmentCategory;
 import com.github.joffryferrater.request.ResourceCategory;
-import com.github.joffryferrater.response.Response;
+import com.github.joffryferrater.response.Result;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -82,8 +82,8 @@ protected Optional<List<ResourceCategory>> addResourceCategoryRequest() {
 
     @Test
     public void hasAccessShouldReturnTrue() throws JsonProcessingException {
-        final Response pdpResponse = mockPdpResponse("Permit");
-        setExpectedPdpResponse(pdpResponse);
+        final Result result = mockResult("Permit");
+        setExpectedPdpResponse(result);
 
         final boolean hasAccess = target.hasAccessToResource("someAttributeId", Collections.singletonList("someValue"));
         assertThat(hasAccess, is(true));

Diff for: security-expression-root/src/test/java/com/github/joffryferrater/pep/security/AbacWebSecurityExpressionRootTest.java

@@ -7,6 +7,7 @@
 import com.github.joffryferrater.pep.TestBase;
 import com.github.joffryferrater.pep.client.PdpClient;
 import com.github.joffryferrater.response.Response;
+import com.github.joffryferrater.response.Result;
 import java.io.IOException;
 import java.util.Collections;
 import org.junit.Before;
@@ -41,8 +42,8 @@ public boolean hasIpAddress(String ipAddress) {
 
     @Test
     public void hasAccessToPathShouldReturnTrue() throws IOException {
-        final Response pdpResponse = mockPdpResponse("Permit");
-        setExpectedPdpResponse(pdpResponse);
+        final Result result = mockResult("Permit");
+        setExpectedPdpResponse(result);
 
         final String attributeId = "Attributes.resource.path";
         boolean hasAccessToPath = target.hasAccessToPath(attributeId, Collections.singletonList("/somePath"));

Diff for: xacml-resource-models/src/main/java/com/github/joffryferrater/response/Response.java

@@ -1,76 +1,29 @@
 package com.github.joffryferrater.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonInclude(Include.NON_EMPTY)
 public class Response {
 
-	@JsonProperty(value = "Decision")
-	private String decision;
+	@JsonProperty("Response")
+	private List<Result> results;
 
-	@JsonProperty(value = "Status")
-	private Status status;
-
-	@JsonProperty(value = "Obligations")
-	private List<ObligationOrAdvice> obligations;
-
-	@JsonProperty(value = "AssociatedAdvice")
-	private List<ObligationOrAdvice> advice;
-
-	@JsonProperty(value = "Category")
-	private List<Attributes> attributes;
-
-	@JsonProperty(value = "PolicyIdentifierList")
-	private List<PolicyIdentifier> policyIdentifierList;
-
-	public String getDecision() {
-		return decision;
-	}
-
-	public void setDecision(String decision) {
-		this.decision = decision;
-	}
-
-	public Status getStatus() {
-		return status;
-	}
-
-	public void setStatus(Status status) {
-		this.status = status;
+	public Response() {
+		//Empty constructor needed by Jackson
 	}
 
-	public List<ObligationOrAdvice> getObligations() {
-		return obligations;
+	public Response(List<Result> results) {
+		this.results = results;
 	}
 
-	public void setObligations(List<ObligationOrAdvice> obligations) {
-		this.obligations = obligations;
+	public List<Result> getResults() {
+		return results;
 	}
 
-	public List<ObligationOrAdvice> getAdvice() {
-		return advice;
+	public void setResults(List<Result> results) {
+		this.results = results;
 	}
-
-	public void setAdvice(List<ObligationOrAdvice> advice) {
-		this.advice = advice;
-	}
-
-	public List<Attributes> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(List<Attributes> attributes) {
-		this.attributes = attributes;
-	}
-
-	public List<PolicyIdentifier> getPolicyIdentifierList() {
-		return policyIdentifierList;
-	}
-
-	public void setPolicyIdentifierList(List<PolicyIdentifier> policyIdentifierList) {
-		this.policyIdentifierList = policyIdentifierList;
-	}
-
 }

Diff for: xacml-resource-models/src/main/java/com/github/joffryferrater/response/Result.java

@@ -0,0 +1,76 @@
+package com.github.joffryferrater.response;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+@JsonInclude(Include.NON_EMPTY)
+public class Result {
+
+    @JsonProperty(value = "Decision")
+    private String decision;
+
+    @JsonProperty(value = "Status")
+    private Status status;
+
+    @JsonProperty(value = "Obligations")
+    private List<ObligationOrAdvice> obligations;
+
+    @JsonProperty(value = "AssociatedAdvice")
+    private List<ObligationOrAdvice> advice;
+
+    @JsonProperty(value = "Category")
+    private List<Attributes> attributes;
+
+    @JsonProperty(value = "PolicyIdentifierList")
+    private List<PolicyIdentifier> policyIdentifierList;
+
+    public String getDecision() {
+        return decision;
+    }
+
+    public void setDecision(String decision) {
+        this.decision = decision;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public List<ObligationOrAdvice> getObligations() {
+        return obligations;
+    }
+
+    public void setObligations(List<ObligationOrAdvice> obligations) {
+        this.obligations = obligations;
+    }
+
+    public List<ObligationOrAdvice> getAdvice() {
+        return advice;
+    }
+
+    public void setAdvice(List<ObligationOrAdvice> advice) {
+        this.advice = advice;
+    }
+
+    public List<Attributes> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(List<Attributes> attributes) {
+        this.attributes = attributes;
+    }
+
+    public List<PolicyIdentifier> getPolicyIdentifierList() {
+        return policyIdentifierList;
+    }
+
+    public void setPolicyIdentifierList(List<PolicyIdentifier> policyIdentifierList) {
+        this.policyIdentifierList = policyIdentifierList;
+    }
+}