Fix request model

Author: Joffry Ferrater

abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionRoot.java

@@ -1,5 +1,6 @@
 package com.github.joffryferrater.pep.security;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.joffryferrater.pep.client.PdpClient;
 import com.github.joffryferrater.request.AccessSubjectCategory;
 import com.github.joffryferrater.request.ActionCategory;
@@ -45,7 +46,11 @@ public boolean hasAccessToResource(String attributeId, List<Object> values) {
         LOGGER.debug("Entering hasAccessToResource(attributeId={},values={}", attributeId, values);
         final Request request = getAllCategoriesRequest(attributeId, values);
         try {
-            final Response pdpResponse = pdpClient.sendXacmlJsonRequest(new XacmlRequest(request));
+            final XacmlRequest xacmlRequest = new XacmlRequest(request);
+            ObjectMapper objectMapper = new ObjectMapper();
+            final String valueAsString = objectMapper.writeValueAsString(xacmlRequest);
+            LOGGER.debug(valueAsString);
+            final Response pdpResponse = pdpClient.sendXacmlJsonRequest(xacmlRequest);
             return isPermitted(pdpResponse);
         } catch (IOException e) {
             LOGGER.error(e.getMessage());
@@ -54,19 +59,19 @@ public boolean hasAccessToResource(String attributeId, List<Object> values) {
     }
 
     private Request getAllCategoriesRequest(String attributeId, List<Object> values) {
-        ResourceCategory resourceCategory = createResourceCategoryRequest(attributeId, values);
         Request request = new Request();
+        ResourceCategory resourceCategory = createResourceCategoryRequest(attributeId, values);
         List<ResourceCategory> resourceCategories = new ArrayList<>();
         resourceCategories.add(resourceCategory);
-        final Optional<List<AccessSubjectCategory>> accessSubjectCategories = addAccessSubjectCategoryRequest();
-        accessSubjectCategories.ifPresent(request::setAccessSubjectCategory);
         final Optional<List<ResourceCategory>> optionalResourceCategories = addResourceCategoryRequest();
         optionalResourceCategories.ifPresent(resourceCategories::addAll);
         request.setResourceCategory(resourceCategories);
         final Optional<List<ActionCategory>> actionCategories = addActionCategoryRequest();
         actionCategories.ifPresent(request::setActionCategory);
         final Optional<List<EnvironmentCategory>> environmentCategories = addEnvironmentCategoryRequest();
         environmentCategories.ifPresent(request::setEnvironmentCategory);
+        final Optional<List<AccessSubjectCategory>> accessSubjectCategories = addAccessSubjectCategoryRequest();
+        accessSubjectCategories.ifPresent(request::setAccessSubjectCategory);
         return request;
     }
 

xacml-resource-models/src/main/java/com/github/joffryferrater/request/Request.java

@@ -27,10 +27,10 @@ public class Request {
     @JsonProperty(ACTION)
     private List<ActionCategory> actionCategory = new ArrayList<>();
 
-    @JsonProperty(RESOURCE)
+    @JsonProperty(ENVIRONMENT)
     private List<EnvironmentCategory> environmentCategory = new ArrayList<>();
 
-    @JsonProperty(ENVIRONMENT)
+    @JsonProperty(RESOURCE)
     private List<ResourceCategory> resourceCategory = new ArrayList<>();
 
     public List<AccessSubjectCategory> getAccessSubjectCategory() {
@@ -39,30 +39,30 @@ public List<AccessSubjectCategory> getAccessSubjectCategory() {
 
     public void setAccessSubjectCategory(
         List<AccessSubjectCategory> accessSubjectCategory) {
-        this.accessSubjectCategory = accessSubjectCategory;
+        this.accessSubjectCategory = new ArrayList<>(accessSubjectCategory);
     }
 
     public List<ActionCategory> getActionCategory() {
         return actionCategory;
     }
 
     public void setActionCategory(List<ActionCategory> actionCategory) {
-        this.actionCategory = actionCategory;
+        this.actionCategory = new ArrayList<>(actionCategory);
     }
 
     public List<EnvironmentCategory> getEnvironmentCategory() {
         return environmentCategory;
     }
 
     public void setEnvironmentCategory(List<EnvironmentCategory> environmentCategory) {
-        this.environmentCategory = environmentCategory;
+        this.environmentCategory = new ArrayList<>(environmentCategory);
     }
 
     public List<ResourceCategory> getResourceCategory() {
         return resourceCategory;
     }
 
     public void setResourceCategory(List<ResourceCategory> resourceCategory) {
-        this.resourceCategory = resourceCategory;
+        this.resourceCategory = new ArrayList<>(resourceCategory);
     }
 }