Merge pull request #314 from telefonicaid/task/restore_sth_policies

restore to previoius sth policies
telefonicaid · Sep 8, 2021 · 10fab18 · 10fab18
2 parents ffcdd42 + f2789ee
commit 10fab18
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 97 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,7 +6,6 @@ Upgrade Python (2 -> 3), #242
         requests (2.22.0 -> 2.25.1)
         python-ldap (2.5.2 -> 3.3.1)
 UPDATE: Update jsonschema dep 2.5.0 to 2.6.0
-Upgrade STH xacml policies with orion frns
 
 3.8.0
 

diff --git a/src/orchestrator/core/policies/policy-sth-admin.xml b/src/orchestrator/core/policies/policy-sth-admin.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>
 

diff --git a/src/orchestrator/core/policies/policy-sth-admin2.xml b/src/orchestrator/core/policies/policy-sth-admin2.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>
 

diff --git a/src/orchestrator/core/policies/policy-sth-customer.xml b/src/orchestrator/core/policies/policy-sth-customer.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>
 

diff --git a/src/orchestrator/core/policies/policy-sth-customer2.xml b/src/orchestrator/core/policies/policy-sth-customer2.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>
 

diff --git a/src/orchestrator/core/policies/policy-sth-serviceadmin.xml b/src/orchestrator/core/policies/policy-sth-serviceadmin.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>
 

diff --git a/src/orchestrator/core/policies/policy-sth-servicecustomer.xml b/src/orchestrator/core/policies/policy-sth-servicecustomer.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>
 

diff --git a/src/orchestrator/core/policies/policy-sth-subserviceadmin.xml b/src/orchestrator/core/policies/policy-sth-subserviceadmin.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>
 

diff --git a/src/orchestrator/core/policies/policy-sth-subservicecustomer.xml b/src/orchestrator/core/policies/policy-sth-subservicecustomer.xml
@@ -19,18 +19,6 @@
               Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
         </Match>
       </AllOf>
-      <AllOf>
-        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
-          <AttributeValue
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              >fiware:orion:.*</AttributeValue>
-          <AttributeDesignator
-              AttributeId="urn:oasis:names:tc:xacml:1.0:resource:resource-id"
-              DataType="http://www.w3.org/2001/XMLSchema#string"
-              MustBePresent="true"
-              Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" />
-        </Match>
-      </AllOf>
     </AnyOf>
   </Target>