test

Signed-off-by: ashikuma <ashish.kumar@here.com>

Author: ashishKhushiKumar

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: $HOME/.m2
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

here-oauth-client/src/main/java/com/here/account/auth/SignatureCalculator.java

@@ -20,7 +20,10 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -291,14 +294,20 @@ private static String generateSignature(String signatureBaseString, String key,
      * not one.
      */
     static String urlEncode(String s) {
-        try {
-            return URLEncoder.encode(s, OAuthConstants.UTF_8_STRING)
-                    .replace("+", "%20")
-                    .replace("*", "%2A")
-                    .replace("%7E", "~");
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalArgumentException(e);
+        StringBuilder encoded = new StringBuilder();
+        byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
+        for (byte b : bytes) {
+            char ch = (char) b;
+            if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9') || ch == '-' || ch == '_' || ch == '.' || ch == '~') {
+                encoded.append(ch);
+            } else {
+                encoded.append('%');
+                String hex = Integer.toHexString(b & 0xFF).toUpperCase();
+                if (hex.length() == 1) encoded.append('0');
+                encoded.append(hex);
+            }
         }
+        return encoded.toString();
     }
 
     /**
@@ -357,20 +366,23 @@ private static PrivateKey consumerSecretToEllipticCurvePrivateKey(String key) {
      * Remove the default port from the baseURL
      */
     private static String normalizeBaseURL(String baseURL) {
-        int index;
-        if (baseURL.startsWith("http:")) {
-            index = baseURL.indexOf(":80/", 4);
-            if (index > 0) {
-                baseURL = baseURL.substring(0, index) + baseURL.substring(index + 3);
-            }
-        } else if (baseURL.startsWith("https:")) {
-            index = baseURL.indexOf(":443/", 5);
-            if (index > 0) {
-                baseURL = baseURL.substring(0, index) + baseURL.substring(index + 4);
+        try {
+            URL url = new URL(baseURL);
+            String scheme = url.getProtocol().toLowerCase();
+            String host = url.getHost().toLowerCase();
+            int port = url.getPort();
+            boolean isDefaultPort = (scheme.equals("http") && port == 80) || (scheme.equals("https") && port == 443) || (port == -1);
+            StringBuilder sb = new StringBuilder();
+            sb.append(scheme).append("://").append(host);
+            if (!isDefaultPort) {
+                sb.append(":").append(port);
             }
+            String path = url.getPath();
+            sb.append((path == null || path.isEmpty()) ? "/" : path);
+            return sb.toString();
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException("Invalid URL: " + baseURL, e);
         }
-
-        return baseURL;
     }
 
     /**

here-oauth-client/src/test/java/com/here/account/auth/SignatureCalculatorTest.java

@@ -16,9 +16,11 @@
 package com.here.account.auth;
 
 import com.ning.http.client.FluentStringsMap;
+import com.ning.http.client.Param;
 import com.ning.http.client.oauth.ConsumerKey;
 import com.ning.http.client.oauth.OAuthSignatureCalculator;
 import com.ning.http.client.oauth.RequestToken;
+import com.ning.http.client.uri.Uri;
 import org.junit.Test;
 
 import java.security.*;
@@ -264,19 +266,23 @@ private static String computeSHA1SignatureUsingLibrary(String url, Map<String, L
         RequestToken emptyUserAuth = new RequestToken(null, "");
         OAuthSignatureCalculator calculator = new OAuthSignatureCalculator(new ConsumerKey(consumerKey, consumerSecret), emptyUserAuth);
 
-        FluentStringsMap fluentFormParams = null;
-        if (null != formParams && !formParams.isEmpty()) {
-            fluentFormParams = new FluentStringsMap();
-            fluentFormParams.putAll(formParams);
-        }
+        List<Param> formParamList = convertToParamList(formParams);
+        List<Param> queryParamList = convertToParamList(queryParams);
 
-        FluentStringsMap fluentQueryParams = null;
-        if (null != queryParams && !queryParams.isEmpty()) {
-            fluentQueryParams = new FluentStringsMap();
-            fluentQueryParams.putAll(queryParams);
-        }
+        return calculator.calculateSignature(method, Uri.create(url), timestamp, nonce, formParamList, queryParamList);
+    }
 
-        return calculator.calculateSignature(method, url, timestamp, nonce, fluentFormParams, fluentQueryParams);
+    private static List<Param> convertToParamList(Map<String, List<String>> paramMap) {
+        List<Param> paramList = new ArrayList<>();
+        if (paramMap != null) {
+            for (Map.Entry<String, List<String>> entry : paramMap.entrySet()) {
+                String key = entry.getKey();
+                for (String value : entry.getValue()) {
+                    paramList.add(new Param(key, value));
+                }
+            }
+        }
+        return paramList;
     }
 
     private static Map<String, List<String>> createParamsList() {

pom.xml

@@ -66,10 +66,10 @@
         <!-- Declare versions for dependencies -->
         <apache.httpclient.version>4.5.13</apache.httpclient.version>
         <ini4j.version>0.5.4</ini4j.version>
-        <jackson.version>2.13.3</jackson.version>
+        <jackson.version>2.13.4.2</jackson.version>
         <junit.version>4.13.1</junit.version>
         <mockito.version>1.10.19</mockito.version>
-        <ning.version>1.8.17</ning.version>
+        <ning.version>1.9.0</ning.version>
         <browsermob.version>2.1.5</browsermob.version>
 
         <!-- configure surefire and maven to be individually skippable -->