Changeset 19007 in josm for trunk/src

Timestamp:

2024-03-04T17:06:32+01:00 (9 months ago)

Author:

taylor.smock

Message:

OAuth2: Fix an issue where a valid URL would have no host

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

@@ -17 +17 @@
 import java.beans.PropertyChangeListener;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.Objects;
@@ -318 +319 @@
             if (procedure == AuthorizationProcedure.MANUALLY) {
                 this.setEnabled(true);
-            } else if (Utils.isValidUrl(apiUrl) && DomainValidator.getInstance().isValid(URI.create(apiUrl).getHost())) {
-                // We want to avoid trying to make connection with an invalid URL
-                final String currentApiUrl = apiUrl;
-                MainApplication.worker.execute(() -> {
-                    final String clientId = OAuthParameters.createDefault(apiUrl, oAuthVersion).getClientId();
-                    if (Objects.equals(apiUrl, currentApiUrl)) {
-                        GuiHelper.runInEDT(() -> this.setEnabled(!Utils.isEmpty(clientId)));
-                    }
-                });
+            } else if (Utils.isValidUrl(apiUrl)) {
+                final URI apiURI;
+                try {
+                    apiURI = new URI(apiUrl);
+                } catch (URISyntaxException e) {
+                    Logging.trace(e);
+                    return;
+                }
+                if (DomainValidator.getInstance().isValid(apiURI.getHost())) {
+                    // We want to avoid trying to make connection with an invalid URL
+                    final String currentApiUrl = apiUrl;
+                    MainApplication.worker.execute(() -> {
+                        final String clientId = OAuthParameters.createDefault(apiUrl, oAuthVersion).getClientId();
+                        if (Objects.equals(apiUrl, currentApiUrl)) {
+                            GuiHelper.runInEDT(() -> this.setEnabled(!Utils.isEmpty(clientId)));
+                        }
+                    });
+                }
             }
         }