From b1e03e924f582bb905d6cfed1e076a7a18b5c1bc Mon Sep 17 00:00:00 2001
From: Alvaro Vega <alvaro.vegagarcia@telefonica.com>
Date: Wed, 8 Sep 2021 08:53:10 +0200
Subject: [PATCH 1/2] restore to previoius sth policies

---
 src/orchestrator/core/policies/policy-sth-admin.xml  | 12 ------------
 src/orchestrator/core/policies/policy-sth-admin2.xml | 12 ------------
 .../core/policies/policy-sth-customer.xml            | 12 ------------
 .../core/policies/policy-sth-customer2.xml           | 12 ------------
 .../core/policies/policy-sth-serviceadmin.xml        | 12 ------------
 .../core/policies/policy-sth-servicecustomer.xml     | 12 ------------
 .../core/policies/policy-sth-subserviceadmin.xml     | 12 ------------
 .../core/policies/policy-sth-subservicecustomer.xml  | 12 ------------
 8 files changed, 96 deletions(-)

diff --git a/src/orchestrator/core/policies/policy-sth-admin.xml b/src/orchestrator/core/policies/policy-sth-admin.xml
index ee6a536e..fe647427 100644
--- 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
index 7ae67a27..2a065f4f 100644
--- 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
index dcbbba1f..ff0341a8 100644
--- 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
index d4abe7d9..f1f68607 100644
--- 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
index 5250042c..31a4dd9e 100644
--- 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
index 6ff48e7c..d89ba902 100644
--- 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
index 7e8bcd8b..f397eda7 100644
--- 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
index a73e502b..6ff373df 100644
--- 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>
 

From f2789ee0794ea3de4d28af3205b4325e00e3b4e2 Mon Sep 17 00:00:00 2001
From: Alvaro Vega <alvaro.vegagarcia@telefonica.com>
Date: Wed, 8 Sep 2021 09:23:11 +0200
Subject: [PATCH 2/2] Update ChangeLog

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5fe14eed..fd35a9f3 100644
--- 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