Exclude query parameters when caching authentication info

Signed-off-by: agherardi <[email protected]>

Author: agherardi

core-client/src/main/java/org/glassfish/jersey/client/authentication/AuthenticationUtil.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.client.authentication;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.ws.rs.client.ClientRequestContext;
+
+/**
+ * Common authentication utilities
+ */
+class AuthenticationUtil {
+    static URI getCacheKey(ClientRequestContext request) {
+        URI requestUri = request.getUri();
+        if (requestUri.getRawQuery() != null) {
+            // Return a URI without the query part of the request URI
+            try {
+                return new URI(
+                        requestUri.getScheme(),
+                        requestUri.getAuthority(),
+                        requestUri.getPath(),
+                        null,
+                        requestUri.getFragment());
+            } catch (URISyntaxException e) {
+                // Ignore and fall through
+            }
+        }
+        return requestUri;
+    }
+}

core-client/src/main/java/org/glassfish/jersey/client/authentication/DigestAuthenticator.java

@@ -91,7 +91,7 @@ protected boolean removeEldestEntry(final Map.Entry eldest) {
      * @throws IOException When error with encryption occurs.
      */
     boolean filterRequest(final ClientRequestContext request) throws IOException {
-        final DigestScheme digestScheme = digestCache.get(getCacheKey(request));
+        final DigestScheme digestScheme = digestCache.get(AuthenticationUtil.getCacheKey(request));
         if (digestScheme != null) {
             final HttpAuthenticationFilter.Credentials cred = HttpAuthenticationFilter.getCredentials(request,
                     this.credentials, HttpAuthenticationFilter.Type.DIGEST);
@@ -132,7 +132,7 @@ public boolean filterResponse(final ClientRequestContext request, final ClientRe
 
             final boolean success = HttpAuthenticationFilter.repeatRequest(request, response, createNextAuthToken(digestScheme,
                     request, cred));
-            URI cacheKey = getCacheKey(request);
+            URI cacheKey = AuthenticationUtil.getCacheKey(request);
             if (success) {
                 digestCache.put(cacheKey, digestScheme);
             } else {
@@ -351,24 +351,6 @@ private String randomBytes(final int nbBytes) {
         return bytesToHex(bytes);
     }
 
-    private URI getCacheKey(ClientRequestContext request) {
-        URI requestUri = request.getUri();
-        if (requestUri.getRawQuery() != null) {
-            // Return a URI without the query part of the request URI
-            try {
-                return new URI(
-                        requestUri.getScheme(),
-                        requestUri.getAuthority(),
-                        requestUri.getPath(),
-                        null,
-                        requestUri.getFragment());
-            } catch (URISyntaxException e) {
-                // Ignore and fall through
-            }
-        }
-        return requestUri;
-    }
-
     private enum QOP {
 
         UNSPECIFIED(null),

core-client/src/main/java/org/glassfish/jersey/client/authentication/HttpAuthenticationFilter.java

@@ -246,22 +246,7 @@ public void filter(ClientRequestContext request, ClientResponseContext response)
     }
 
     private String getCacheKey(ClientRequestContext request) {
-        URI requestUri = request.getUri();
-        if (requestUri.getRawQuery() != null) {
-            // Build a URI without the query part of the request URI
-            try {
-                URI requestUriWithoutQuery = new URI(
-                        requestUri.getScheme(),
-                        requestUri.getAuthority(),
-                        requestUri.getPath(),
-                        null,
-                        requestUri.getFragment());
-                return requestUriWithoutQuery.toString() + ":" + request.getMethod();
-            } catch (URISyntaxException e) {
-                // Ignore and fall through
-            }
-        }
-        return requestUri.toString() + ":" + request.getMethod();
+        return AuthenticationUtil.getCacheKey(request).toString() + ":" + request.getMethod();
     }
 
     private void updateCache(ClientRequestContext request, boolean success, Type operation) {