Commit a2a57682 authored by cdanger's avatar cdanger

Fixed policy identifiers in conformance tests IIIG301,302

parent 6db5d991
......@@ -2,23 +2,23 @@
<PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
PolicyCombiningAlgId="urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:ordered-deny-overrides"
PolicySetId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policyset"
PolicySetId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policyset"
Version="1.0"
xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
<Description>
PolicySet for Conformance Test IIIG300.
PolicySet for Conformance Test IIIG301.
Purpose: ReturnPolicyIdList test with Policy result (no PolicySets)
</Description>
<Target/>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policy1"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy1"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides"
Version="1.0">
<Description>
Policy1 for Conformance Test IIIG300.
Policy1 for Conformance Test IIIG301.
</Description>
<Target/>
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:rule1">
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule1">
<Description>
A subject whose name is J. Hibbert may not
read Bart Simpson's medical record. NOTAPPLICABLE
......@@ -36,11 +36,11 @@
</Rule>
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policy2"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy2"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides"
Version="1.0">
<Description>
Policy2 for Conformance Test IIIG300.
Policy2 for Conformance Test IIIG301.
</Description>
<Target/>
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID006:rule2">
......@@ -64,14 +64,14 @@
</Rule>
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policy3"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy3"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides"
Version="1.0">
<Description>
Policy3 for Conformance Test IIIG300.
Policy3 for Conformance Test IIIG301.
</Description>
<Target/>
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:rule3">
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule3">
<Description>
A subject whose "bogus" attribute is "Zaphod Beeblebrox"
may perform any action on any resource. INDETERMINATE.
......@@ -89,13 +89,13 @@
</Rule>
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policy4"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy4"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides" Version="1.0">
<Description>
Policy4 for Conformance Test IIIG300.
Policy4 for Conformance Test IIIG301.
</Description>
<Target/>
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:rule4">
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule4">
<Description>
A subject whose name is Julius Hibbert may not
perform any action on any resource. DENY.
......@@ -110,8 +110,8 @@
</Condition>
</Rule>
<ObligationExpressions>
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:obligation-1">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:assignment1">
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:obligation-1">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:assignment1">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">assignment1</AttributeValue>
</AttributeAssignmentExpression>
</ObligationExpression>
......@@ -119,13 +119,13 @@
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policy5"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy5"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides" Version="1.0">
<Description>
Policy5 for Conformance Test IIIG300.
Policy5 for Conformance Test IIIG301.
</Description>
<Target/>
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:rule5">
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule5">
<Description>
A subject whose name is Julius Hibbert may not
perform any action on any resource. DENY.
......@@ -140,8 +140,8 @@
</Condition>
</Rule>
<ObligationExpressions>
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:obligation-2">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:assignment2">
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:obligation-2">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:assignment2">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">assignment2</AttributeValue>
</AttributeAssignmentExpression>
</ObligationExpression>
......
......@@ -12,17 +12,17 @@
</Status>
<Obligations>
<Obligation
ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:obligation-1" >
ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:obligation-1" >
<AttributeAssignment
AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:assignment1"
AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:assignment1"
DataType="http://www.w3.org/2001/XMLSchema#string">assignment1</AttributeAssignment>
</Obligation>
</Obligations>
<PolicyIdentifierList>
<PolicyIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policy4</PolicyIdReference>
<PolicySetIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG300:policyset</PolicySetIdReference>
<PolicyIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy4</PolicyIdReference>
<PolicySetIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policyset</PolicySetIdReference>
</PolicyIdentifierList>
</Result>
......
......@@ -2,11 +2,11 @@
<PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
PolicyCombiningAlgId="urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:ordered-deny-overrides"
PolicySetId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policyset"
PolicySetId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:policyset"
Version="1.0"
xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
<Description>
PolicySet for Conformance Test IIIG301.
PolicySet for Conformance Test IIIG302.
Purpose: ReturnPolicyIdList test with PolicySet result (no Policys)
</Description>
<Target/>
......@@ -18,23 +18,23 @@
<PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
PolicyCombiningAlgId="urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:ordered-deny-overrides"
PolicySetId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:InternalPolicyset"
PolicySetId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:InternalPolicyset"
Version="1.0"
xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
<Description>
Internal (nested) PolicySet for Conformance Test IIIG301.
Internal (nested) PolicySet for Conformance Test IIIG302.
</Description>
<Target/>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:InteralPolicy3"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:InteralPolicy3"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides"
Version="1.0">
<Description>
Policy3 for Conformance Test IIIG301.
Policy3 for Conformance Test IIIG302.
</Description>
<Target/>
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:internalRule3">
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:internalRule3">
<Description>
A subject whose "bogus" attribute is "Zaphod Beeblebrox"
may perform any action on any resource. INDETERMINATE.
......@@ -52,13 +52,13 @@
</Rule>
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:InternalPolicy4"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:InternalPolicy4"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides" Version="1.0">
<Description>
Policy4 for Conformance Test IIIG301.
Policy4 for Conformance Test IIIG302.
</Description>
<Target/>
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:internalRule4">
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:internalRule4">
<Description>
A subject whose name is Julius Hibbert may not
perform any action on any resource. DENY.
......@@ -73,8 +73,8 @@
</Condition>
</Rule>
<ObligationExpressions>
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:obligation-1">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:assignment1">
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:obligation-1">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:assignment1">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">assignment1</AttributeValue>
</AttributeAssignmentExpression>
</ObligationExpression>
......@@ -92,14 +92,14 @@
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy1"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:policy1"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides"
Version="1.0">
<Description>
Policy1 for Conformance Test IIIG301.
Policy1 for Conformance Test IIIG302.
</Description>
<Target/>
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule1">
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:rule1">
<Description>
A subject whose name is J. Hibbert may not
read Bart Simpson's medical record. NOTAPPLICABLE
......@@ -117,11 +117,11 @@
</Rule>
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy2"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:policy2"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides"
Version="1.0">
<Description>
Policy2 for Conformance Test IIIG301.
Policy2 for Conformance Test IIIG302.
</Description>
<Target/>
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID006:rule2">
......@@ -145,14 +145,14 @@
</Rule>
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy3"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:policy3"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides"
Version="1.0">
<Description>
Policy3 for Conformance Test IIIG301.
Policy3 for Conformance Test IIIG302.
</Description>
<Target/>
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule3">
<Rule Effect="Permit" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:rule3">
<Description>
A subject whose "bogus" attribute is "Zaphod Beeblebrox"
may perform any action on any resource. INDETERMINATE.
......@@ -170,13 +170,13 @@
</Rule>
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy4"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:policy4"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides" Version="1.0">
<Description>
Policy4 for Conformance Test IIIG301.
Policy4 for Conformance Test IIIG302.
</Description>
<Target/>
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule4">
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:rule4">
<Description>
A subject whose name is Julius Hibbert may not
perform any action on any resource. DENY.
......@@ -191,8 +191,8 @@
</Condition>
</Rule>
<ObligationExpressions>
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:obligation-1">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:assignment1">
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:obligation-1">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:assignment1">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">assignment1</AttributeValue>
</AttributeAssignmentExpression>
</ObligationExpression>
......@@ -200,13 +200,13 @@
</Policy>
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policy5"
<Policy PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:policy5"
RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:ordered-deny-overrides" Version="1.0">
<Description>
Policy5 for Conformance Test IIIG301.
Policy5 for Conformance Test IIIG302.
</Description>
<Target/>
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:rule5">
<Rule Effect="Deny" RuleId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:rule5">
<Description>
A subject whose name is Julius Hibbert may not
perform any action on any resource. DENY.
......@@ -221,8 +221,8 @@
</Condition>
</Rule>
<ObligationExpressions>
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:obligation-2">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:assignment2">
<ObligationExpression FulfillOn="Deny" ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:obligation-2">
<AttributeAssignmentExpression AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:assignment2">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">assignment2</AttributeValue>
</AttributeAssignmentExpression>
</ObligationExpression>
......
......@@ -12,18 +12,18 @@
</Status>
<Obligations>
<Obligation
ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:obligation-1" >
ObligationId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:obligation-1" >
<AttributeAssignment
AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:assignment1"
AttributeId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:assignment1"
DataType="http://www.w3.org/2001/XMLSchema#string">assignment1</AttributeAssignment>
</Obligation>
</Obligations>
<PolicyIdentifierList>
<PolicyIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:InternalPolicy4</PolicyIdReference>
<PolicySetIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:InternalPolicyset</PolicySetIdReference>
<PolicySetIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG301:policyset</PolicySetIdReference>
<PolicyIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:InternalPolicy4</PolicyIdReference>
<PolicySetIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:InternalPolicyset</PolicySetIdReference>
<PolicySetIdReference Version="1.0">urn:oasis:names:tc:xacml:2.0:conformance-test:IIIG302:policyset</PolicySetIdReference>
</PolicyIdentifierList>
</Result>
......
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