Removed support to for setting default ids
This commit removes the rather 'confusing' feature of being able to override
the default key for subject, resource and action ids defined by XACML
spec.
Users who relied on feature can easily switch to use #addAttribute to achieve
the same.
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java
index 00b7908..a4bdd0d 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Action.java
@@ -20,7 +20,6 @@
package org.apache.openaz.pepapi;
-import org.apache.openaz.xacml.api.Identifier;
import org.apache.openaz.xacml.api.XACML3;
/**
@@ -28,8 +27,7 @@
*/
public class Action extends CategoryContainer {
- public static final Identifier DEFAULT_IDENTIFIER_ID = XACML3.ID_ACTION_ACTION_ID;
- private String idValue;
+ private String id;
private Action() {
super(XACML3.ID_ATTRIBUTE_CATEGORY_ACTION);
@@ -47,45 +45,31 @@
/**
* Creates a new Subject instance containing a single default attribute with the given String value.
*
- * @param idValue
+ * @param id
* @return
*/
- public static Action newInstance(String idValue) {
- return newInstance().withId(idValue);
+ public static Action newInstance(String id) {
+ return newInstance().withId(id);
}
/**
* Sets the Id of the action
*
- * @param idValue
+ * @param id
* @return
*/
- public Action withId(String idValue) {
- this.idValue = idValue;
- addAttribute(DEFAULT_IDENTIFIER_ID.stringValue(), idValue);
+ public Action withId(String id) {
+ this.id = id;
+ addAttribute(XACML3.ID_ACTION_ACTION_ID.stringValue(), id);
return this;
}
-
- /**
- * Sets the id of the action and allows to set/override the default attribute key
- *
- * @param idKey
- * @param idValue
- * @return
- */
- public Action withId(Identifier idKey, String idValue) {
- this.idValue = idValue;
- addAttribute(idKey.stringValue(), idValue);
- return this;
- }
-
- /**
+/**
* Returns the value of the id
*
* @return
*/
public String getId() {
- return idValue;
+ return id;
}
}
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java
index e09f291..bafa19c 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/PepConfig.java
@@ -34,21 +34,6 @@
/**
* @return
*/
- String getDefaultSubjectId();
-
- /**
- * @return
- */
- String getDefaultResourceId();
-
- /**
- * @return
- */
- String getDefaultActionId();
-
- /**
- * @return
- */
PepResponseBehavior getIndeterminateBehavior();
/**
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java
index 1392722..8d8e379 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Resource.java
@@ -20,7 +20,6 @@
package org.apache.openaz.pepapi;
-import org.apache.openaz.xacml.api.Identifier;
import org.apache.openaz.xacml.api.XACML3;
import java.net.URI;
@@ -30,11 +29,8 @@
*/
public final class Resource extends CategoryContainer {
- public static final Identifier DEFAULT_IDENTIFIER_ID = XACML3.ID_RESOURCE_RESOURCE_ID;
- public static final Identifier DEFAULT_IDENTIFIER_LOCATION = XACML3.ID_RESOURCE_RESOURCE_LOCATION;
-
- private Object idValue; // only java.lang.String or java.net.URI
- private URI locationValue;
+ private Object id; // only java.lang.String or java.net.URI
+ private URI location;
private Resource() {
super(XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE);
@@ -52,32 +48,32 @@
/**
* Creates a new Resource instance containing a single default attribute with the given String value.
*
- * @param idValue
+ * @param id
* @return
*/
- public static Resource newInstance(String idValue) {
- return newInstance().withId(idValue);
+ public static Resource newInstance(String id) {
+ return newInstance().withId(id);
}
/**
* Creates a new Resource instance containing a single default attribute with the given URI value.
*
- * @param idValue
+ * @param id
* @return
*/
- public static Resource newInstance(URI idValue) {
- return newInstance().withId(idValue);
+ public static Resource newInstance(URI id) {
+ return newInstance().withId(id);
}
/**
* Sets resource id value
*
- * @param idValue
+ * @param id
* @return this
*/
- public Resource withId(URI idValue) {
- this.idValue = idValue;
- addAttribute(DEFAULT_IDENTIFIER_ID.stringValue(), idValue);
+ public Resource withId(URI id) {
+ this.id = id;
+ addAttribute(XACML3.ID_RESOURCE_RESOURCE_ID.stringValue(), id);
return this;
}
@@ -85,62 +81,23 @@
* Sets resource id value
*
* @param id
- * @param idValue
* @return this
*/
- public Resource withId(Identifier id, URI idValue) {
- this.idValue = idValue;
- addAttribute(id.stringValue(), idValue);
- return this;
- }
-
- /**
- * Sets resource id value
- *
- * @param idValue
- * @return this
- */
- public Resource withId(String idValue) {
- this.idValue = idValue;
- addAttribute(DEFAULT_IDENTIFIER_ID.stringValue(), idValue);
- return this;
- }
-
- /**
- * Sets resource id value
- *
- * @param id
- * @param idValue
- * @return this
- */
- public Resource withId(Identifier id, String idValue) {
- this.idValue = idValue;
- addAttribute(id.stringValue(), idValue);
+ public Resource withId(String id) {
+ this.id = id;
+ addAttribute(XACML3.ID_RESOURCE_RESOURCE_ID.stringValue(), id);
return this;
}
/**
* Sets resource location
*
- * @param locationValue
+ * @param location
* @return this
*/
- public Resource withLocation(URI locationValue) {
- this.locationValue = locationValue;
- addAttribute(DEFAULT_IDENTIFIER_LOCATION.stringValue(), locationValue);
- return this;
- }
-
- /**
- * Sets resource location
- *
- * @param id
- * @param locationValue
- * @return this
- */
- public Resource withLocation(Identifier id, URI locationValue) {
- this.locationValue = locationValue;
- addAttribute(id.stringValue(), locationValue);
+ public Resource withLocation(URI location) {
+ this.location = location;
+ addAttribute(XACML3.ID_RESOURCE_RESOURCE_LOCATION.stringValue(), location);
return this;
}
@@ -150,7 +107,7 @@
* @return
*/
public Object getId() {
- return this.idValue;
+ return this.id;
}
/**
@@ -159,7 +116,7 @@
* @return
*/
public URI getLocation() {
- return locationValue;
+ return location;
}
}
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java
index c06e0c2..9f19a57 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/Subject.java
@@ -20,7 +20,6 @@
package org.apache.openaz.pepapi;
-import org.apache.openaz.xacml.api.Identifier;
import org.apache.openaz.xacml.api.XACML3;
/**
@@ -28,8 +27,7 @@
*/
public class Subject extends CategoryContainer {
- public static final Identifier DEFAULT_IDENTIFIER_ID = XACML3.ID_SUBJECT_SUBJECT_ID;
- private String idValue;
+ private String id;
private Subject() {
super(XACML3.ID_SUBJECT_CATEGORY_ACCESS_SUBJECT);
@@ -47,35 +45,22 @@
/**
* Creates a new Subject instance containing a single default attribute with the given String value.
*
- * @param idValue
+ * @param id
* @return
*/
- public static Subject newInstance(String idValue) {
- return newInstance().withId(idValue);
+ public static Subject newInstance(String id) {
+ return newInstance().withId(id);
}
/**
* Sets the Id of the subject
*
- * @param idValue
+ * @param id
* @return
*/
- public Subject withId(String idValue) {
- this.idValue = idValue;
- addAttribute(DEFAULT_IDENTIFIER_ID.stringValue(), idValue);
- return this;
- }
-
- /**
- * Sets the id of the subject and allows to set/override the default attribute key
- *
- * @param idKey
- * @param idValue
- * @return
- */
- public Subject withId(Identifier idKey, String idValue) {
- this.idValue = idValue;
- addAttribute(idKey.stringValue(), idValue);
+ public Subject withId(String id) {
+ this.id = id;
+ addAttribute(XACML3.ID_SUBJECT_SUBJECT_ID.stringValue(), id);
return this;
}
@@ -85,7 +70,7 @@
* @return
*/
public String getId() {
- return idValue;
+ return id;
}
}
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java
index f334621..41b8b2f 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ActionMapper.java
@@ -21,27 +21,10 @@
package org.apache.openaz.pepapi.std;
import org.apache.openaz.pepapi.Action;
-import org.apache.openaz.pepapi.PepRequest;
-import org.apache.openaz.pepapi.PepRequestAttributes;
public class ActionMapper extends CategoryContainerMapper {
public ActionMapper() {
super(Action.class);
}
-
- @Override
- public void map(Object o, PepRequest pepRequest) {
- Action action = (Action) o;
- String id = action.getId();
- if (id == null) {
- id = getPepConfig().getDefaultActionId();
- if (id != null) {
- PepRequestAttributes resourceAttributes = pepRequest
- .getPepRequestAttributes(action.getCategoryIdentifier());
- resourceAttributes.addAttribute(Action.DEFAULT_IDENTIFIER_ID.stringValue(), (String) id);
- }
- }
- super.map(o, pepRequest);
- }
}
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java
index a88733c..ce7e436 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/ResourceMapper.java
@@ -20,37 +20,11 @@
package org.apache.openaz.pepapi.std;
-import org.apache.openaz.pepapi.PepRequest;
-import org.apache.openaz.pepapi.PepRequestAttributes;
import org.apache.openaz.pepapi.Resource;
-import java.net.URI;
-
public class ResourceMapper extends CategoryContainerMapper {
public ResourceMapper() {
super(Resource.class);
}
-
- @Override
- public void map(Object o, PepRequest pepRequest) {
- Resource resource = (Resource) o;
- Object id = resource.getId();
- if (id == null) {
- id = getPepConfig().getDefaultResourceId();
-
- if (id != null) {
- PepRequestAttributes resourceAttributes = pepRequest
- .getPepRequestAttributes(resource.getCategoryIdentifier());
- if (id instanceof String)
- resourceAttributes.addAttribute(Resource.DEFAULT_IDENTIFIER_ID.stringValue(), (String) id);
- else if (id instanceof URI)
- resourceAttributes.addAttribute(Resource.DEFAULT_IDENTIFIER_ID.stringValue(), (URI) id);
- else
- throw new IllegalStateException("resource id is not an instance of String nor java.net.URI but " +
- resource.getClass().getName());
- }
- }
- super.map(o, pepRequest);
- }
}
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java
index 2c79e95..9debb7f 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/StdPepConfig.java
@@ -38,12 +38,6 @@
private static final String PEP_ISSUER = "pep.issuer";
- private static final String PEP_DEFAULT_SUBJECT_ID = "pep.subject.id";
-
- private static final String PEP_DEFAULT_ACTION_ID = "pep.action.id";
-
- private static final String PEP_DEFAULT_RESOURCE_ID = "pep.resource.id";
-
private static final String PEP_INDETERMINATE_BEHAVIOR = "pep.indeterminate.behavior";
private static final String PEP_NOTAPPLICABLE_BEHAVIOR = "pep.notapplicable.behavior";
@@ -52,12 +46,6 @@
private String issuer;
- private String subjectIdURI;
-
- private String actionIdURI;
-
- private String resourceIdURI;
-
private PepResponseBehavior indeterminateBehavior;
private PepResponseBehavior notApplicableBehavior;
@@ -75,21 +63,6 @@
this();
issuer = properties.getProperty(PEP_ISSUER);
- String subjectIdURI = properties.getProperty(PEP_DEFAULT_SUBJECT_ID);
- if (!StringUtils.isEmpty(subjectIdURI)) {
- this.subjectIdURI = subjectIdURI;
- }
-
- String actionIdURI = properties.getProperty(PEP_DEFAULT_ACTION_ID);
- if (!StringUtils.isEmpty(actionIdURI)) {
- this.actionIdURI = actionIdURI;
- }
-
- String resourceIdURI = properties.getProperty(PEP_DEFAULT_RESOURCE_ID);
- if (!StringUtils.isEmpty(resourceIdURI)) {
- this.resourceIdURI = resourceIdURI;
- }
-
String indeterminateString = properties.getProperty(PEP_INDETERMINATE_BEHAVIOR);
if (!StringUtils.isEmpty(indeterminateString)) {
PepResponseBehavior indeterminateBehavior = PepResponseBehavior.valueOf(indeterminateString);
@@ -128,21 +101,6 @@
}
@Override
- public String getDefaultSubjectId() {
- return subjectIdURI;
- }
-
- @Override
- public String getDefaultResourceId() {
- return resourceIdURI;
- }
-
- @Override
- public String getDefaultActionId() {
- return actionIdURI;
- }
-
- @Override
public PepResponseBehavior getIndeterminateBehavior() {
return indeterminateBehavior;
}
diff --git a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java
index 2787c37..e98b5a2 100644
--- a/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java
+++ b/openaz-pep/src/main/java/org/apache/openaz/pepapi/std/SubjectMapper.java
@@ -20,8 +20,6 @@
package org.apache.openaz.pepapi.std;
-import org.apache.openaz.pepapi.PepRequest;
-import org.apache.openaz.pepapi.PepRequestAttributes;
import org.apache.openaz.pepapi.Subject;
public class SubjectMapper extends CategoryContainerMapper {
@@ -29,19 +27,4 @@
public SubjectMapper() {
super(Subject.class);
}
-
- @Override
- public void map(Object o, PepRequest pepRequest) {
- Subject subject = (Subject) o;
- String id = subject.getId();
- if (id == null) {
- id = getPepConfig().getDefaultSubjectId();
- if (id != null) {
- PepRequestAttributes resourceAttributes = pepRequest
- .getPepRequestAttributes(subject.getCategoryIdentifier());
- resourceAttributes.addAttribute(Subject.DEFAULT_IDENTIFIER_ID.stringValue(), (String) id);
- }
- }
- super.map(o, pepRequest);
- }
}
\ No newline at end of file
diff --git a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestConfig.java b/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestConfig.java
deleted file mode 100644
index 5d8a68b..0000000
--- a/openaz-pep/src/test/java/org/apache/openaz/pepapi/std/test/TestConfig.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.openaz.pepapi.std.test;
-
-import org.apache.openaz.pepapi.*;
-import org.apache.openaz.pepapi.std.StdPepAgentFactory;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestConfig {
-
- private PepAgentFactory pepAgentFactory;
-
- @Before
- public void setup() {
- pepAgentFactory = new StdPepAgentFactory("properties/testconfig.xacml.properties");
- }
-
- /**
- *
- */
- @Test
- public void testPepAgent() {
- Assert.assertNotNull(getPepAgent());
- }
-
- /**
- *
- */
- @Test
- public void testPermitWithDefaultsMatch() {
- Subject subject = Subject.newInstance();
- Action action = Action.newInstance();
- Resource resource = Resource.newInstance();
- PepResponse response = getPepAgent().decide(subject, action, resource);
- Assert.assertNotNull(response);
- Assert.assertEquals(true, response.allowed());
- }
-
- /**
- *
- */
- @Test
- public void testPermitWithDefaultsMismatch() {
- Subject subject = Subject.newInstance("non-default-subject-id");
- Action action = Action.newInstance("non-default-action-id");
- Resource resource = Resource.newInstance("non-default-resource-id");
- PepResponse response = getPepAgent().decide(subject, action, resource);
- Assert.assertNotNull(response);
- Assert.assertEquals(false, response.allowed());
- }
-
- public PepAgent getPepAgent() {
- return pepAgentFactory.getPepAgent();
- }
-}
diff --git a/openaz-pep/src/test/resources/policies/testconfig.xml b/openaz-pep/src/test/resources/policies/testconfig.xml
deleted file mode 100755
index 23a8bdc..0000000
--- a/openaz-pep/src/test/resources/policies/testconfig.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- PolicyId="urn:oasis:names:tc:xacml:2.0:testconfig:policy"
- RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:deny-overrides" Version="1.0"
- xsi:schemaLocation="">
- <Description></Description>
- <Target/>
- <Rule RuleId="urn:oasis:names:tc:xacml:1.0:testconfig:rule-1" Effect="Permit">
- <Description />
- <Target>
- <AnyOf>
- <AllOf>
- <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
- <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">default-subject-id</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
- AttributeId="urn:oasis:names:tc:xacml:1.0:subject:subject-id"
- DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
- </Match>
- </AllOf>
- </AnyOf>
- <AnyOf>
- <AllOf>
- <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
- <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">default-resource-id</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource"
- AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
- DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
- </Match>
- </AllOf>
- </AnyOf>
- <AnyOf>
- <AllOf>
- <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
- <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">default-action-id</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
- AttributeId="urn:oasis:names:tc:xacml:1.0:action:action-id"
- DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
- </Match>
- </AllOf>
- </AnyOf>
- </Target>
- </Rule>
-</Policy>
diff --git a/openaz-pep/src/test/resources/properties/testconfig.xacml.properties b/openaz-pep/src/test/resources/properties/testconfig.xacml.properties
deleted file mode 100755
index f4f71d4..0000000
--- a/openaz-pep/src/test/resources/properties/testconfig.xacml.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Default XACML Properties File
-# Standard API Factories
-#
-xacml.dataTypeFactory=org.apache.openaz.xacml.std.StdDataTypeFactory
-xacml.pdpEngineFactory=org.apache.openaz.xacml.pdp.OpenAZPDPEngineFactory
-xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
-xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
-
-# OpenAZ PDP Implementation Factories
-#
-xacml.openaz.evaluationContextFactory=org.apache.openaz.xacml.pdp.std.StdEvaluationContextFactory
-xacml.openaz.combiningAlgorithmFactory=org.apache.openaz.xacml.pdp.std.StdCombiningAlgorithmFactory
-xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacml.pdp.std.StdFunctionDefinitionFactory
-xacml.openaz.policyFinderFactory=org.apache.openaz.xacml.pdp.std.StdPolicyFinderFactory
-
-xacml.rootPolicies=testPolicy
-testPolicy.file=src/test/resources/policies/testconfig.xml
-
-pep.subject.id=default-subject-id
-pep.action.id=default-action-id
-pep.resource.id=default-resource-id
\ No newline at end of file
