From 9d1f67898095c92201a16d86002ae6564ea1be97 Mon Sep 17 00:00:00 2001 From: sgayangi Date: Mon, 20 May 2024 10:06:56 +0530 Subject: [PATCH 1/2] Remove star imports --- .../java/org/wso2/apk/enforcer/security/AuthFilter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java index dcfa4dbf1..3982396f8 100644 --- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java +++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java @@ -25,7 +25,12 @@ import org.wso2.apk.enforcer.commons.exception.APISecurityException; import org.wso2.apk.enforcer.commons.logging.ErrorDetails; import org.wso2.apk.enforcer.commons.logging.LoggingConstants; -import org.wso2.apk.enforcer.commons.model.*; +import org.wso2.apk.enforcer.commons.model.APIConfig; +import org.wso2.apk.enforcer.commons.model.APIKeyAuthenticationConfig; +import org.wso2.apk.enforcer.commons.model.AuthenticationContext; +import org.wso2.apk.enforcer.commons.model.JWTAuthenticationConfig; +import org.wso2.apk.enforcer.commons.model.Oauth2AuthenticationConfig; +import org.wso2.apk.enforcer.commons.model.RequestContext; import org.wso2.apk.enforcer.config.ConfigHolder; import org.wso2.apk.enforcer.config.EnforcerConfig; import org.wso2.apk.enforcer.config.dto.MutualSSLDto; From c4ea4f41d8dba947d978937f8130fa452ecff30a Mon Sep 17 00:00:00 2001 From: sgayangi Date: Mon, 20 May 2024 10:07:14 +0530 Subject: [PATCH 2/2] Remove empty lines in cucumber tests --- .../src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature | 1 - .../src/test/resources/tests/api/MTLSwithOAuth2Optional.feature | 1 - 2 files changed, 2 deletions(-) diff --git a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature index 5de7ed346..1f6cc149a 100644 --- a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature +++ b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature @@ -1,5 +1,4 @@ Feature: Test mTLS between client and gateway with client certificate sent in header - # mTLS mandatory OAuth2 mandatory Scenario: Test mandatory mTLS and mandatory OAuth2 with a valid client certificate in header Given The system is ready diff --git a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature index 5b163f45e..e17fd6030 100644 --- a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature +++ b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature @@ -1,5 +1,4 @@ Feature: Test mTLS between client and gateway with client certificate sent in header with OAuth2 optional - # mTLS mandatory OAuth2 optional Scenario: Test mandatory mTLS and optional OAuth2 with a valid client certificate in header Given The system is ready