Changeset 18407 in josm for trunk/src

Timestamp:

2022-03-22T17:10:25+01:00 (3 years ago)

Author:

stoecker

Message:

fix #21756 - strip typical privacy relevant parameters from URL output

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -126 +126 @@
 
     /**
+     * Removed privacy related parts form output URL
+     * @param url Unmodified URL
+     * @return Stripped URL (privacy related issues removed)
+     */
+    private String stripUrl(URL url) {
+        return url.toString().replaceAll("(token|key|connectId)=[^&]+","$1=...stripped...");
+    }
+
+    /**
      * Opens the HTTP connection.
      * @param progressMonitor progress monitor
@@ -149 +158 @@
                 final boolean hasReason = !Utils.isEmpty(reasonForRequest);
                 logRequest("{0} {1}{2} -> {3} {4} ({5}{6})",
-                        getRequestMethod(), getURL(), hasReason ? (" (" + reasonForRequest + ')') : "",
+                        getRequestMethod(), stripUrl(getURL()), hasReason ? (" (" + reasonForRequest + ')') : "",
                         cr.getResponseVersion(), cr.getResponseCode(),
                         stopwatch,
@@ -167 +176 @@
                 }
             } catch (IOException | RuntimeException e) {
-                logRequest("{0} {1} -> !!! ({2})", requestMethod, url, stopwatch);
+                logRequest("{0} {1} -> !!! ({2})", requestMethod, stripUrl(url), stopwatch);
                 Logging.warn(e);
                 //noinspection ThrowableResultOfMethodCallIgnored