Changeset 19235 in josm for trunk

Timestamp:

2024-10-08T14:39:56+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Fix #23956: JsonParsingException when the destination server returns 200 and a malformed document

In this case, the destination server performed a redirect via javascript in the
response.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/oauth/OAuthParameters.java (modified) (3 diffs)
• gui/oauth/OAuthAuthorizationWizard.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -10 +10 @@
 import java.util.Map;
 
+import jakarta.json.stream.JsonParsingException;
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OsmApi;
@@ -95 +96 @@
                 }
             }
-        } catch (URISyntaxException | IOException e) {
+        } catch (JsonParsingException | URISyntaxException | IOException e) {
             throw new JosmRuntimeException(e);
         } finally {
@@ -158 +159 @@
             }
         } catch (JosmRuntimeException e) {
-            if (e.getCause() instanceof URISyntaxException || e.getCause() instanceof IOException) {
+            if (e.getCause() instanceof URISyntaxException || e.getCause() instanceof IOException
+                    || e.getCause() instanceof JsonParsingException) {
                 Logging.trace(e);
             } else {

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -176 +176 @@
         JMultilineLabel lbl = new JMultilineLabel(AuthorizationProcedure.FULLY_AUTOMATIC.getDescription());
         lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
-        pnl.add(lbl, GBC.std());
+        pnl.add(lbl, GBC.eol());
 
         if (!Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl)) {