Commit dc34362d authored by cdanger's avatar cdanger

- Fixed unit tests

parent 96bdd8f5
...@@ -209,7 +209,7 @@ public final class StandardCombiningAlgRegistry extends BaseCombiningAlgRegistry ...@@ -209,7 +209,7 @@ public final class StandardCombiningAlgRegistry extends BaseCombiningAlgRegistry
// first-applicable // first-applicable
for (final StdAlgorithm alg : EnumSet.range(StdAlgorithm.XACML_1_0_POLICY_COMBINING_FIRST_APPLICABLE, StdAlgorithm.XACML_1_0_RULE_COMBINING_FIRST_APPLICABLE)) for (final StdAlgorithm alg : EnumSet.range(StdAlgorithm.XACML_1_0_POLICY_COMBINING_FIRST_APPLICABLE, StdAlgorithm.XACML_1_0_RULE_COMBINING_FIRST_APPLICABLE))
{ {
standardAlgorithms.add(new PermitUnlessDenyAlg(alg.id)); standardAlgorithms.add(new FirstApplicableAlg(alg.id));
} }
// only-one-applicable // only-one-applicable
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Testing parameter 'maxPolicySetRefDepth' --> <!-- Testing parameter 'maxPolicySetRefDepth' -->
<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/3.6" version="3.6.4"> <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/5.0" version="5.0.0">
<rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" /> <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" />
</pdp> </pdp>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<tns:attributeProvider id="test" xmlns:tns="http://authzforce.github.io/core/xmlns/pdp/3.6" xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:test="http://authzforce.github.io/core/xmlns/test/3" <tns:attributeProvider id="test" xmlns:tns="http://authzforce.github.io/core/xmlns/pdp/5.0" xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:test="http://authzforce.github.io/core/xmlns/test/3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="test:TestAttributeProvider"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="test:TestAttributeProvider">
<Attributes Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"> <Attributes Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject">
<Attribute AttributeId="urn:oasis:names:tc:xacml:1.0:example:attribute:role" IncludeInResult="false"> <Attribute AttributeId="urn:oasis:names:tc:xacml:1.0:example:attribute:role" IncludeInResult="false">
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Testing parameter 'maxPolicySetRefDepth' --> <!-- Testing parameter 'maxPolicySetRefDepth' -->
<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/3.6" version="3.6.4"> <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/5.0" version="5.0.0">
<combiningAlgorithm>urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:on-permit-apply-second</combiningAlgorithm> <combiningAlgorithm>urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:on-permit-apply-second</combiningAlgorithm>
<rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" /> <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" />
</pdp> </pdp>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Testing parameter 'maxPolicySetRefDepth' --> <!-- Testing parameter 'maxPolicySetRefDepth' -->
<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/3.6" version="3.6.4"> <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/5.0" version="5.0.0">
<attributeDatatype>urn:ow2:authzforce:feature:pdp:data-type:test-xacml-policy</attributeDatatype> <attributeDatatype>urn:ow2:authzforce:feature:pdp:data-type:test-xacml-policy</attributeDatatype>
<rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" /> <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" />
</pdp> </pdp>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Testing parameter 'maxPolicySetRefDepth' --> <!-- Testing parameter 'maxPolicySetRefDepth' -->
<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/3.6" version="3.6.4" <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/5.0" version="5.0.0"
requestFilter="urn:ow2:authzforce:feature:pdp:request-filter:multiple:repeated-attribute-categories-lax" resultFilter="urn:ow2:authzforce:feature:pdp:result-filter:multiple:test-combined-decision"> requestFilter="urn:ow2:authzforce:feature:pdp:request-filter:multiple:repeated-attribute-categories-lax" resultFilter="urn:ow2:authzforce:feature:pdp:result-filter:multiple:test-combined-decision">
<rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" /> <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" />
</pdp> </pdp>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Testing parameter 'maxPolicySetRefDepth' --> <!-- Testing parameter 'maxPolicySetRefDepth' -->
<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/3.6" version="3.6.4"> <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/5.0" version="5.0.0">
<attributeDatatype>urn:oasis:names:tc:xacml:3.0:data-type:dnsName-value</attributeDatatype> <attributeDatatype>urn:oasis:names:tc:xacml:3.0:data-type:dnsName-value</attributeDatatype>
<function>urn:oasis:names:tc:xacml:3.0:function:dnsName-value-equal</function> <function>urn:oasis:names:tc:xacml:3.0:function:dnsName-value-equal</function>
<rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" /> <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" />
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Testing parameter 'maxPolicySetRefDepth' --> <!-- Testing parameter 'maxPolicySetRefDepth' -->
<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/3.6" version="3.6.1" maxPolicyRefDepth="1"> <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/5.0" version="3.6.1" maxPolicyRefDepth="1">
<refPolicyProvider id="refPolicyprovider" xsi:type="StaticRefPolicyProvider"> <refPolicyProvider id="refPolicyprovider" xsi:type="StaticRefPolicyProvider">
<policyLocation>${PARENT_DIR}/pps-employee.xml</policyLocation> <policyLocation>${PARENT_DIR}/pps-employee.xml</policyLocation>
<policyLocation>${PARENT_DIR}/pps-manager.xml</policyLocation> <policyLocation>${PARENT_DIR}/pps-manager.xml</policyLocation>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Testing parameter 'maxPolicySetRefDepth' --> <!-- Testing parameter 'maxPolicySetRefDepth' -->
<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/3.6" version="3.6.1" maxPolicyRefDepth="1" maxVariableRefDepth="0"> <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/5.0" version="3.6.1" maxPolicyRefDepth="1" maxVariableRefDepth="0">
<rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" /> <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" />
</pdp> </pdp>
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- <logger name="org.ow2.authzforce" additivity="false" level="DEBUG"> --> <!-- <logger name="org.ow2.authzforce" additivity="false" level="DEBUG"> -->
<!-- <appender-ref ref="stdout" /> --> <!-- <appender-ref ref="stdout" /> -->
<!-- </logger> --> <!-- </logger> -->
<root level="WARN"> <root level="ERROR">
<appender-ref ref="stdout" /> <appender-ref ref="stdout" />
</root> </root>
</configuration> </configuration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment