Minor code cleanup

rnavagamuwa · Apr 4, 2019 · 128423f · 128423f
1 parent 3c32ed7
commit 128423f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/sample/src/main/resources/xacmlPolicy.xml b/sample/src/main/resources/xacmlPolicy.xml
@@ -7,12 +7,10 @@
  <AttributeValue DataType="http:https://www.w3.org/2001/XMLSchema#string">read</AttributeValue>
  <AttributeDesignator AttributeId="urn:oasis:names:tc:xacml:1.0:action:action-id"
  Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
- DataType="http:https://www.w3.org/2001/XMLSchema#string" MustBePresent="true">
- </AttributeDesignator>
+ DataType="http:https://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
  </Match>
  </AllOf>
  </AnyOf>
  </Target>
- <Rule Effect="Permit" RuleId="permit">
- </Rule>
+ <Rule Effect="Permit" RuleId="permit"/>
 </Policy>
diff --git a/sdk/src/main/java/org/wso2/spring/security/abac/XacmlAttributeHandler.java b/sdk/src/main/java/org/wso2/spring/security/abac/XacmlAttributeHandler.java
@@ -121,8 +121,12 @@ public boolean authorize(String authRequest) {
  if (response.getStatusCode() != HttpStatus.OK) {
  return false;
  }
+
  cachedResponse = response.getBody().toString();
- this.authCache.putIfAbsent(authRequest, cachedResponse);
+ if (response.getStatusCode() == HttpStatus.OK) {
+ this.authCache.putIfAbsent(authRequest, cachedResponse);
+ }
+
  }
 
  JSONObject responseObj = new JSONObject(cachedResponse);

diff --git a/sdk/src/main/java/org/wso2/spring/security/abac/util/XacmlAuthRequestBuilder.java b/sdk/src/main/java/org/wso2/spring/security/abac/util/XacmlAuthRequestBuilder.java
@@ -38,7 +38,7 @@ public XacmlAuthRequestBuilder() {
  @Override
  public String createAuthRequest(String policyName, String jsonKeyValuePairs) {
 
- Map<String, Object> templateData = generateFreemakeTemplateData(jsonKeyValuePairs);
+ Map<String, Object> templateData = generateFreemakerTemplateData(jsonKeyValuePairs);
 
  String key = Base64.getEncoder().encodeToString(policyName
  .concat(jsonKeyValuePairs)
@@ -82,7 +82,7 @@ public String createAuthRequest(String policyName, String jsonKeyValuePairs) {
  return this.requestBuilderCache.putIfAbsent(key, xacmlRequest);
  }
 
- private Map<String, Object> generateFreemakeTemplateData(String jsonKeyValuePairs) {
+ private Map<String, Object> generateFreemakerTemplateData(String jsonKeyValuePairs) {
  JSONObject jsonObject = new JSONObject(jsonKeyValuePairs.trim());
 
  Iterator<String> keys = jsonObject.keys();