fixes networknt#1453 encryped apikey is not decripted automatically w…

…hen json format is used (networknt#1562)

api-key/src/main/java/com/networknt/apikey/ApiKey.java

@@ -1,5 +1,7 @@
 package com.networknt.apikey;
 
+import com.networknt.config.ConfigInjection;
+
 public class ApiKey {
     String pathPrefix;
     String headerName;
@@ -26,6 +28,7 @@ public String getApiKey() {
     }
 
     public void setApiKey(String apiKey) {
-        this.apiKey = apiKey;
+        // if apiKey is encrypted, we need to decrypted it here.
+        this.apiKey = (String)ConfigInjection.decryptEnvValue(ConfigInjection.getDecryptor(), apiKey);
     }
 }

api-key/src/test/java/com/networknt/apikey/ApiKeyJsonConfigTest.java

@@ -13,7 +13,6 @@ public class ApiKeyJsonConfigTest {
     static final ApiKeyConfig config = ApiKeyConfig.load("apikey-json");
 
     @Test
-    @Ignore
     public void testDecryption() {
         logger.debug("apiKey for /test2 = " + config.getPathPrefixAuths().get(1).getApiKey());
         Assert.assertEquals("password", config.getPathPrefixAuths().get(1).getApiKey());

basic-auth/src/main/java/com/networknt/basicauth/BasicAuthConfig.java

@@ -158,7 +158,6 @@ private void populateUsers(List<Map<String, Object>> userList) {
         userList.forEach(user -> {
             if (user instanceof Map) {
                 // the password might be encrypted.
-                user = DecryptUtil.decryptMap(user);
                 UserAuth userAuth = new UserAuth();
                 user.forEach((k, v) -> {
                     if (USERNAME.equals(k)) {

basic-auth/src/main/java/com/networknt/basicauth/UserAuth.java

@@ -1,5 +1,7 @@
 package com.networknt.basicauth;
 
+import com.networknt.config.ConfigInjection;
+
 import java.util.List;
 
 public class UserAuth {
@@ -29,7 +31,7 @@ public String getPassword() {
     }
 
     public void setPassword(String password) {
-        this.password = password;
+        this.password = (String) ConfigInjection.decryptEnvValue(ConfigInjection.getDecryptor(), password);
     }
 
     public List<String> getPaths() {

config/src/main/java/com/networknt/config/ConfigInjection.java

@@ -93,7 +93,7 @@ public static boolean isExclusionConfigFile(String configName) {
                 || exclusionConfigFileList.contains(configName);
     }
 
-    static Decryptor getDecryptor() {
+    public static Decryptor getDecryptor() {
         Config myConfig = Config.getInstance();
         if (myConfig == null) {
             throw new RuntimeException("Unable to retrieve the configuration.");
@@ -114,7 +114,7 @@ static String convertEnvVars(String input){
         return input.replaceAll("[^A-Za-z0-9]", "_").toUpperCase();
     }
 
-    static Object decryptEnvValue(Decryptor decryptor, String envVal) {
+    public static Object decryptEnvValue(Decryptor decryptor, String envVal) {
         Object decryptedEnvValue;
         //checking if the value put in env is encrypted. If yes then decrypting it.
         if (envVal != null && envVal.trim().startsWith(Decryptor.CRYPT_PREFIX)) {

handler/src/main/java/com/networknt/handler/ProxyHandler.java

@@ -145,6 +145,7 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
         }
         if(exchange.isResponseStarted()) {
             //we can't proxy a request that has already started, this is basically a server configuration error
+            logger.error("Cannot proxy a request that has already started.");
             UndertowLogger.REQUEST_LOGGER.cannotProxyStartedRequest(exchange);
             exchange.setStatusCode(StatusCodes.INTERNAL_SERVER_ERROR);
             exchange.endExchange();

ingress-proxy/src/main/java/com/networknt/proxy/PathPrefixAuth.java

@@ -1,5 +1,7 @@
 package com.networknt.proxy;
 
+import com.networknt.config.ConfigInjection;
+
 /**
  * This is an object that contains all the authentication info for each path prefix in the pathPrefixAuth config
  * section. By making it a list of objects, we can support unlimited number of APIs with different authentication
@@ -50,7 +52,7 @@ public String getPassword() {
     }
 
     public void setPassword(String password) {
-        this.password = password;
+        this.password = (String) ConfigInjection.decryptEnvValue(ConfigInjection.getDecryptor(), password);
     }
 
     public String getClientId() {
@@ -66,7 +68,7 @@ public String getClientSecret() {
     }
 
     public void setClientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
+        this.clientSecret = (String) ConfigInjection.decryptEnvValue(ConfigInjection.getDecryptor(), clientSecret);
     }
 
     public String getResponseType() {

ingress-proxy/src/main/java/com/networknt/proxy/mras/MrasConfig.java

@@ -1,6 +1,5 @@
 package com.networknt.proxy.mras;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.networknt.config.Config;
 import com.networknt.config.ConfigException;
 import com.networknt.config.JsonMapper;

pom.xml

@@ -98,7 +98,7 @@
         <version.maven-version>2.7</version.maven-version>
         <version.nexus-staging-maven>1.6.8</version.nexus-staging-maven>
         <version.maven-source>3.0.1</version.maven-source>
-        <version.maven-surefire>2.19.1</version.maven-surefire>
+        <version.maven-surefire>2.22.2</version.maven-surefire>
         <version.maven-failsafe>2.22.0</version.maven-failsafe>
         <version.jacoco>0.8.3</version.jacoco>
         <version.maven-compiler>3.8.0</version.maven-compiler>