Remove XACML configs and tests

wso2 · Nov 19, 2024 · 8002ee9 · 8002ee9
1 parent 417fe32
commit 8002ee9
Show file tree

Hide file tree

Showing 45 changed files with 1 addition and 1,740 deletions.
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -208,7 +208,6 @@
                         <configuration>
                             <tasks>
                                 <property name="tempdir" value="target/docs-temp" />
-                                <property name="registryPolicyHandler" value="&lt;handler class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler&quot;&gt;${line.separator} &lt;filter class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher&quot;&gt;${line.separator} &lt;property name=&quot;mediaType&quot;&gt;application/xacml-policy+xml&lt;/property&gt;${line.separator} &lt;/filter&gt;${line.separator} &lt;/handler&gt;${line.separator}${line.separator} &lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;" />
 
                                 <property name="xss-kernel-token" value="&lt;XSSPreventionConfig&gt;${line.separator} &lt;Enabled&gt;true&lt;/Enabled&gt;${line.separator} &lt;Rule&gt;allow&lt;/Rule&gt;${line.separator} &lt;Patterns&gt;${line.separator} &lt;!--Pattern&gt;&lt;/Pattern--&gt;${line.separator} &lt;/Patterns&gt;${line.separator} &lt;/XSSPreventionConfig&gt;" />
 

diff --git a/modules/distribution/registry_config_change.xml.j2 b/modules/distribution/registry_config_change.xml.j2
@@ -51,17 +51,4 @@
                 ]]>
         </value>
     </add>
-     <!-- Add the RegistryPolicyHandler -->
-        <add>
-            <before>//wso2registry/staticConfiguration</before>
-            <value>
-                <![CDATA[
-                   <handler class="org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler">
-                        <filter class="org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher">
-                            <property name="mediaType">application/xacml-policy+xml</property>
-                        </filter>
-                   </handler>
-                   ]]>
-            </value>
-        </add>
 </processor>
diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml
diff --git a/...tion/tests-cypress-integration/tests-identity-apps/src/test/resources/instrumentation.txt b/...tion/tests-cypress-integration/tests-identity-apps/src/test/resources/instrumentation.txt
@@ -25,8 +25,6 @@ org.wso2.carbon.identity.authenticator.saml2.sso.common*
 org.wso2.carbon.identity.authorization.core*
 org.wso2.carbon.identity.base*
 org.wso2.carbon.identity.core*
-org.wso2.carbon.identity.entitlement*
-org.wso2.carbon.identity.entitlement.common*
 org.wso2.carbon.identity.mgt*
 org.wso2.carbon.identity.oauth*
 org.wso2.carbon.identity.oauth.common*

diff --git a/...egration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Policy.xml b/...egration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Policy.xml
diff --git a/...gration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Request.xml b/...gration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Request.xml
diff --git a/...egration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Policy.xml b/...egration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Policy.xml
diff --git a/...gration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Request.xml b/...gration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Request.xml
diff --git a/...tion/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml b/...tion/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml
@@ -296,7 +296,6 @@
         <!-- Scope validators list. The validators registered here wil be executed during token validation. -->
         <ScopeValidators>
             <ScopeValidator class="org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator" />
-            <ScopeValidator class="org.wso2.carbon.identity.oauth2.validators.xacml.XACMLScopeValidator"/>
         </ScopeValidators>
 
         <!-- Scope handlers list. The handlers registered here will be executed at the scope validation phase while
@@ -823,9 +822,6 @@
         <Resource context="(.*)/oauth2/introspect(.*)" secured="true" http-method="all">
             <Permissions>/permission/admin/manage/identity/applicationmgt/view</Permissions>
         </Resource>
-        <Resource context="(.*)/api/identity/entitlement/(.*)" secured="true" http-method="all">
-            <Permissions>/permission/admin/manage/identity/pep</Permissions>
-        </Resource>
         <Resource context="(.*)/scim2/Users(.*)" secured="true" http-method="POST">
             <Permissions>/permission/admin/manage/identity/usermgt/create</Permissions>
         </Resource>

diff --git a/.../test/resources/artifacts/IS/entitlement/config/entitlementNotificationEnabled.properties b/.../test/resources/artifacts/IS/entitlement/config/entitlementNotificationEnabled.properties