Changeset 35921 in osm

Timestamp:

2022-03-03T15:14:49+01:00 (2 years ago)

Author:

taylor.smock

Message:

fix #21906: Properly use user set User-Agent header

This also enables the http2 plugin to be disabled without JOSM restart -- we
just set the HttpClient factory back to Http1Client::new. Ideally, users would
still restart JOSM to ensure that all classes are unloaded, but this should
make it easier to debug if an issue is due to http2 or something else.

Location:

applications/editors/josm/plugins/http2/src/org/openstreetmap/josm/plugins/http2

Files:

• Http2Client.java (modified) (4 diffs)
• Http2Plugin.java (modified) (3 diffs)

applications/editors/josm/plugins/http2/src/org/openstreetmap/josm/plugins/http2/Http2Client.java

@@ -37 +37 @@
 
     private static final Map<Duration, HttpClient> clientForConnectTimeout = new ConcurrentHashMap<>();
+    private static final String USER_AGENT_STRING = "User-Agent";
     private HttpRequest request;
     private HttpResponse<InputStream> response;
@@ -57 +58 @@
     HttpRequest createRequest() throws IOException {
         HttpRequest.Builder requestBuilder;
+        Map<String, String> headers = getHeaders();
         try {
             requestBuilder = HttpRequest.newBuilder()
@@ -63 +65 @@
                               ? BodyPublishers.ofByteArray(getRequestBody())
                               : BodyPublishers.noBody())
-                      .header("User-Agent", Version.getInstance().getFullAgentString());
+                      .header(USER_AGENT_STRING, headers.getOrDefault(USER_AGENT_STRING, Version.getInstance().getFullAgentString()));
         } catch (URISyntaxException e) {
             throw new IOException(e);
@@ -78 +80 @@
             requestBuilder.header("Cache-Control", "no-cache");
         }
-        for (Map.Entry<String, String> header : getHeaders().entrySet()) {
-            if (header.getValue() != null) {
+        for (Map.Entry<String, String> header : headers.entrySet()) {
+            if (header.getValue() != null && !USER_AGENT_STRING.equals(header.getKey())) {
                 try {
                     requestBuilder.header(header.getKey(), header.getValue());

applications/editors/josm/plugins/http2/src/org/openstreetmap/josm/plugins/http2/Http2Plugin.java

@@ -4 +4 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.Http1Client;
 import org.openstreetmap.josm.tools.HttpClient;
 
@@ -9 +11 @@
  * Provides HTTP/2 support.
  */
-public class Http2Plugin extends Plugin {
+public class Http2Plugin extends Plugin implements Destroyable {
 
     /**
@@ -19 +21 @@
         HttpClient.setFactory(Http2Client::new);
     }
+
+    @Override
+    public void destroy() {
+        HttpClient.setFactory(Http1Client::new);
+    }
 }