Add enforcer changes for API Key

wso2 · Jul 19, 2024 · 3845649 · 3845649
1 parent c79e328
commit 3845649
Show file tree

Hide file tree

Showing 8 changed files with 366 additions and 101 deletions.
diff --git a/...so2.apk.enforcer.commons/src/main/java/org/wso2/apk/enforcer/commons/model/APIConfig.java b/...so2.apk.enforcer.commons/src/main/java/org/wso2/apk/enforcer/commons/model/APIConfig.java
@@ -48,7 +48,7 @@ public class APIConfig {
     private KeyStore trustStore;
     private String mutualSSL;
     private boolean transportSecurity;
-    private boolean applicationSecurity;
+    private Map<String, Boolean> applicationSecurity;
     private GraphQLSchemaDTO graphQLSchemaDTO;
     private JWTConfigurationDto jwtConfigurationDto;
     private boolean systemAPI;
@@ -220,7 +220,7 @@ public boolean isTransportSecurity() {
      *
      * @return application security optionality
      */
-    public boolean getApplicationSecurity() {
+    public Map<String, Boolean> getApplicationSecurity() {
         return applicationSecurity;
     }
 
@@ -286,7 +286,7 @@ public static class Builder {
         private boolean isMockedApi;
         private KeyStore trustStore;
         private String mutualSSL;
-        private boolean applicationSecurity;
+        private Map<String,Boolean> applicationSecurity;
         private GraphQLSchemaDTO graphQLSchemaDTO;
         private boolean systemAPI;
         private byte[] apiDefinition;
@@ -379,7 +379,7 @@ public Builder mutualSSL(String mutualSSL) {
             return this;
         }
 
-        public Builder applicationSecurity(boolean applicationSecurity) {
+        public Builder applicationSecurity(Map<String,Boolean> applicationSecurity) {
             this.applicationSecurity = applicationSecurity;
             return this;
         }

diff --git a/...ay/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/api/GraphQLAPI.java b/...ay/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/api/GraphQLAPI.java
@@ -81,7 +81,7 @@ public String init(Api api) {
         String apiType = api.getApiType();
         List<ResourceConfig> resources = new ArrayList<>();
         String mutualSSL = api.getMutualSSL();
-        boolean applicationSecurity = api.getApplicationSecurity();
+        Map<String, Boolean> applicationSecurity = api.getApplicationSecurityMap();
 
         EndpointCluster endpoints = Utils.processEndpoints(api.getEndpoints());
         EndpointSecurity[] endpointSecurity = APIProcessUtils.convertProtoEndpointSecurity(

diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/api/RestAPI.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/api/RestAPI.java
@@ -75,7 +75,7 @@ public String init(Api api) {
         String apiType = api.getApiType();
         List<ResourceConfig> resources = new ArrayList<>();
         String mutualSSL = api.getMutualSSL();
-        boolean applicationSecurity = api.getApplicationSecurity();
+        Map<String, Boolean> applicationSecurity = api.getApplicationSecurityMap();
 
         for (Resource res : api.getResourcesList()) {
             for (Operation operation : res.getMethodsList()) {

diff --git a/...cer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/constants/APIConstants.java b/...cer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/constants/APIConstants.java
@@ -51,7 +51,7 @@ public class APIConstants {
     public static final String AUTHORIZATION_HEADER_BASIC = "Basic";
     public static final String API_SECURITY_OAUTH2 = "OAuth2";
     public static final String API_SECURITY_BASIC_AUTH = "basic_auth";
-    public static final String SWAGGER_API_KEY_AUTH_TYPE_NAME = "apiKey";
+    public static final String API_SECURITY_API_KEY = "\"API Key\"";
     public static final String SWAGGER_API_KEY_IN_HEADER = "Header";
     public static final String SWAGGER_API_KEY_IN_QUERY = "Query";
     public static final String API_SECURITY_MUTUAL_SSL_NAME = "mtls";