update

Author: mfriesen

lambda-api/src/main/java/com/formkiq/stacks/api/handler/ConfigurationRequestHandler.java

@@ -34,8 +34,6 @@
 import static com.formkiq.stacks.dynamodb.ConfigService.MAX_WEBHOOKS;
 import static com.formkiq.stacks.dynamodb.ConfigService.NOTIFICATION_EMAIL;
 
-import java.io.IOException;
-import java.io.StringReader;
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
@@ -47,7 +45,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.formkiq.aws.dynamodb.DynamicObject;
@@ -211,9 +208,9 @@ public ApiRequestHandlerResponse patch(final LambdaLogger logger,
     if (body.containsKey("docusign")) {
 
       Map<String, String> google = (Map<String, String>) body.get("docusign");
-      String docusignUserId = google.getOrDefault("userId", "");
-      String docusignIntegrationKey = google.getOrDefault("integrationKey", "");
-      String docusignRsaPrivateKey = google.getOrDefault("rsaPrivateKey", "");
+      String docusignUserId = google.getOrDefault("userId", "").trim();
+      String docusignIntegrationKey = google.getOrDefault("integrationKey", "").trim();
+      String docusignRsaPrivateKey = google.getOrDefault("rsaPrivateKey", "").trim();
 
       map.put(KEY_DOCUSIGN_USER_ID, docusignUserId);
       map.put(KEY_DOCUSIGN_INTEGRATION_KEY, docusignIntegrationKey);
@@ -304,9 +301,10 @@ private void validateDocusign(final Map<String, Object> map,
   private boolean isValidRsaPrivateKey(final String privateKeyPem) {
     try {
       // Remove the PEM header and footer
-      String privateKeyPemStripped = decodeUnicode(privateKeyPem)
-          .replace("-----BEGIN RSA PRIVATE KEY-----", "")
-          .replace("-----END RSA PRIVATE KEY-----", "").replace("\\n", "").replaceAll("\\s+", "");
+      String privateKeyPemStripped =
+          privateKeyPem.replace("\\u003d", "=").replace("-----BEGIN RSA PRIVATE KEY-----", "")
+              .replace("-----END RSA PRIVATE KEY-----", "").replace("\\n", "")
+              .replaceAll("\\s+", "").trim();
 
       byte[] privateKeyBytes = Base64.getDecoder().decode(privateKeyPemStripped);
 
@@ -320,26 +318,4 @@ private boolean isValidRsaPrivateKey(final String privateKeyPem) {
       return false;
     }
   }
-
-  /**
-   * Decode Unicode sequences.
-   * 
-   * @param input {@link String}
-   * @return String
-   */
-  private String decodeUnicode(final String input) {
-
-    String result = input;
-    if (input != null) {
-      Properties properties = new Properties();
-      try {
-        properties.load(new StringReader("key=" + input));
-        result = properties.getProperty("key");
-      } catch (IOException e) {
-        // ignore
-      }
-    }
-
-    return result;
-  }
 }

lambda-api/src/test/java/com/formkiq/stacks/api/handler/ConfigurationRequestTest.java

@@ -81,7 +81,7 @@ public class ConfigurationRequestTest extends AbstractApiClientRequestTest {
       9i7pWanM1abM4es/tdATp56uTWntoa2ZQTHieFtSkYlufDbgLaCIb4HCStimbzye
       xm4Xo6+jDbifGOqFT4Ofeyc=
       -----END RSA PRIVATE KEY-----
-            """;
+           \s""";
 
   /**
    * Before Each.
@@ -362,9 +362,8 @@ public void testHandlePutConfiguration06() throws ApiException {
     assertEquals("123", configuration.getDocusign().getUserId());
     assertEquals("""
         -----BEGIN RSA PRIVATE KEY-----
-        MIIEvQIB*******FT4Ofeyc=
-        -----END RSA PRIVATE KEY-----
-        """, configuration.getDocusign().getRsaPrivateKey());
+        MIIEvQIB*******qFT4Ofeyc=
+        -----END RSA PRIVATE KEY-----""", configuration.getDocusign().getRsaPrivateKey());
   }
 
   /**