added support for encoded header names and basic auth passwords. fixes apache#5067

Author: bamaer

plugins/misc/rest/src/main/java/org/apache/hop/metadata/rest/RestConnection.java

@@ -28,6 +28,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang.StringUtils;
+import org.apache.hop.core.encryption.Encr;
 import org.apache.hop.core.exception.HopException;
 import org.apache.hop.core.util.HttpClientManager;
 import org.apache.hop.core.util.Utils;
@@ -76,7 +77,7 @@ public class RestConnection extends HopMetadataBase implements IHopMetadata {
   @HopMetadataProperty(key = "username")
   private String username;
 
-  @HopMetadataProperty(key = "username", password = true)
+  @HopMetadataProperty(key = "password", password = true)
   private String password;
 
   // Bearer auth
@@ -90,7 +91,7 @@ public class RestConnection extends HopMetadataBase implements IHopMetadata {
   @HopMetadataProperty(key = "auth_header_prefix")
   private String authorizationPrefix;
 
-  @HopMetadataProperty(key = "auth_header_value")
+  @HopMetadataProperty(key = "auth_header_value", password = true)
   private String authorizationHeaderValue;
 
   public RestConnection(IVariables variables) {
@@ -129,7 +130,11 @@ public Invocation.Builder getInvocationBuilder(String url) throws HopException {
     }
     if (authType.equals("Basic")) {
       if (!StringUtils.isEmpty(username) && !StringUtils.isEmpty(password)) {
-        client.register(HttpAuthenticationFeature.basic(username, password));
+
+        client.register(
+            HttpAuthenticationFeature.basic(
+                variables.resolve(username),
+                Encr.decryptPasswordOptionallyEncrypted(variables.resolve(password))));
         target = client.target(url);
         invocationBuilder = target.request();
       }
@@ -139,11 +144,12 @@ public Invocation.Builder getInvocationBuilder(String url) throws HopException {
             variables.resolve(authorizationHeaderName),
             variables.resolve(authorizationPrefix)
                 + " "
-                + variables.resolve(authorizationHeaderValue));
+                + Encr.decryptPasswordOptionallyEncrypted(
+                    variables.resolve(authorizationHeaderValue)));
       } else {
         invocationBuilder.header(
             variables.resolve(authorizationHeaderName),
-            variables.resolve(authorizationHeaderValue));
+            Encr.decryptPasswordOptionallyEncrypted(variables.resolve(authorizationHeaderValue)));
       }
     } else if (authType.equals("Bearer")) {
       if (!StringUtils.isEmpty(bearerToken)) {