Merge pull request #25 from imesh94/fix/revert-proxy-change

Revert changes done for introducing a gateway proxy to infosec endpoints
wso2 · Oct 28, 2024 · 47641cd · 47641cd
2 parents ef576f1 + c20855a
commit 47641cd
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 596 deletions.
diff --git a/...src/main/java/org/wso2/openbanking/cds/gateway/handlers/InfoSecDataPublishingHandler.java b/...src/main/java/org/wso2/openbanking/cds/gateway/handlers/InfoSecDataPublishingHandler.java
diff --git a/...ng.cds.gateway/src/main/java/org/wso2/openbanking/cds/gateway/utils/GatewayConstants.java b/...ng.cds.gateway/src/main/java/org/wso2/openbanking/cds/gateway/utils/GatewayConstants.java
@@ -91,17 +91,17 @@ private GatewayConstants() {
     public static final String WELL_KNOWN_API = "WellKnownAPI";
     public static final String PAR_API = "PARAPI";
 
-    public static final String TOKEN_ENDPOINT = "/token";
-    public static final String AUTHORIZE_ENDPOINT = "/authorize";
-    public static final String JWKS_ENDPOINT = "/jwks";
-    public static final String USERINFO_ENDPOINT = "/userinfo";
-    public static final String REVOKE_ENDPOINT = "/revoke";
-    public static final String INTROSPECTION_ENDPOINT = "/token/introspect";
-    public static final String PAR_ENDPOINT = "/par";
-    public static final String WELL_KNOWN_ENDPOINT = "/.well-known/openid-configuration";
+    public static final String TOKEN_ENDPOINT = "/oauth2/token";
+    public static final String AUTHORIZE_ENDPOINT = "/oauth2/authorize";
+    public static final String JWKS_ENDPOINT = "/oauth2/jwks";
+    public static final String USERINFO_ENDPOINT = "/oauth2/userinfo";
+    public static final String REVOKE_ENDPOINT = "/oauth2/revoke";
+    public static final String INTROSPECTION_ENDPOINT = "/oauth2/introspect";
+    public static final String PAR_ENDPOINT = "/api/openbanking/push-authorization/par";
+    public static final String WELL_KNOWN_ENDPOINT = "/oauth2/token/.well-known/openid-configuration";
     public static final String REGISTER_ENDPOINT = "/register";
     public static final String REGISTER_CLIENT_ID_ENDPOINT = "/register/{ClientId}";
-    public static final String CDR_ARRANGEMENT_ENDPOINT = "/{cdrArrangementId}";
+    public static final String CDR_ARRANGEMENT_ENDPOINT = "/arrangements/1.0.0";
     public static final String DISCOVERY_OUTAGES_ENDPOINT = "/discovery/outages";
     public static final String DISCOVERY_STATUS_ENDPOINT = "/discovery/status";
     public static final String PRODUCTS_ENDPOINT = "/banking/products";

diff --git a/...test/java/org/wso2/openbanking/cds/gateway/handlers/InfoSecDataPublishingHandlerTest.java b/...test/java/org/wso2/openbanking/cds/gateway/handlers/InfoSecDataPublishingHandlerTest.java
diff --git a/components/org.wso2.openbanking.cds.gateway/src/test/resources/testng.xml b/components/org.wso2.openbanking.cds.gateway/src/test/resources/testng.xml
@@ -27,7 +27,6 @@
             <class name="org.wso2.openbanking.cds.gateway.executors.core.CDSAPIRequestRouterTest"/>
             <class name="org.wso2.openbanking.cds.gateway.throttling.CDSThrottleDataPublisherImplTest"/>
             <class name="org.wso2.openbanking.cds.gateway.mediators.GatewayErrorMediatorTest"/>
-            <class name="org.wso2.openbanking.cds.gateway.handlers.InfoSecDataPublishingHandlerTest"/>
             <class name="org.wso2.openbanking.cds.gateway.executors.reporting.CDSCommonDataReportingExecutorTest"/>
             <class name="org.wso2.openbanking.cds.gateway.executors.header.validation.CDSHeaderValidationExecutorTest"/>
             <class name="org.wso2.openbanking.cds.gateway.executors.jwt.authentication.JWTAuthenticationExecutorTest"/>

diff --git a/...y/src/main/java/org/wso2/openbanking/cds/identity/filter/InfoSecDataPublishingFilter.java b/...y/src/main/java/org/wso2/openbanking/cds/identity/filter/InfoSecDataPublishingFilter.java
@@ -263,7 +263,10 @@ public void destroy() {
     public boolean shouldPublishCurrentRequestData(ServletRequest request) {
 
         // If the request is internal traffic, no need to publish data
-        return expectedExternalTrafficHeaderValue.equalsIgnoreCase(
-                ((HttpServletRequest) request).getHeader(externalTrafficHeaderName));
+        if (request instanceof HttpServletRequest) {
+            return expectedExternalTrafficHeaderValue.equalsIgnoreCase(
+                    ((HttpServletRequest) request).getHeader(externalTrafficHeaderName));
+        }
+        return false;
     }
 }