Changeset 18665 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2023-02-16T16:01:49+01:00 (23 months ago)

Author:

taylor.smock

Message:

Fix several coverity issues

CID-1504572: Synchronization on java.util.concurrent objects

The lock wasn't necessary after moving from AtomicBoolean to
CountDownLatch

CID-1504570: Dereference null value -- the default getApiUrl return was null
CID-1504570: Explicit null dereferenced

Consumer<IOAuthToken> to Consumer<Optional<IOAuthToken>>

CID-1476014, CID-1476013, CID-1476011: Resource leak

These resource leaks are unlikely to happen outside of plugin code,
and are all related to StringSelection#getTransferData, which may
return a Closeable object, but is unlikely to be the Transferable
for any of the affected classes.

This also fixes some recently introduced SonarLint issues. It also suppresses
squid:S100 ("Method names should comply with a naming convention") for the MapCSS
Functions class, since the convention for that method names in that class is
^[a-zA-Z][a-zA-Z0-9_]*$

Location:

trunk/src/org/openstreetmap/josm/data/oauth

Files:

• IOAuthAuthorization.java (modified) (2 diffs)
• IOAuthParameters.java (modified) (1 diff)
• IOAuthToken.java (modified) (1 diff)
• OAuth20Authorization.java (modified) (4 diffs)
• OAuth20Token.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.oauth;
 
+import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -16 +17 @@
      * @param scopes The scopes to ask for
      */
-    void authorize(IOAuthParameters parameters, Consumer<IOAuthToken> consumer, Enum<?>... scopes);
+    void authorize(IOAuthParameters parameters, Consumer<Optional<IOAuthToken>> consumer, Enum<?>... scopes);
 }

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

@@ -91 +91 @@
     }
 
+    /**
+     * Store the preferences for these parameters
+     */
     void rememberPreferences();
 }

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

@@ -13 +13 @@
      * Sign a client
      * @param client The client to sign
+     * @throws OAuthException if the OAuth token type is unknown (AKA we do't know how to handle it)
      */
     void sign(HttpClient client) throws OAuthException;

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

@@ -13 +13 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -45 +46 @@
 
     @Override
-    public void authorize(IOAuthParameters parameters, Consumer<IOAuthToken> consumer, Enum<?>... scopes) {
+    public void authorize(IOAuthParameters parameters, Consumer<Optional<IOAuthToken>> consumer, Enum<?>... scopes) {
         final String state = UUID.randomUUID().toString();
         final String codeVerifier = UUID.randomUUID().toString(); // Cryptographically random string (ASCII)
@@ -62 +63 @@
         private final String state;
         private final IOAuthParameters parameters;
-        private final Consumer<IOAuthToken> consumer;
+        private final Consumer<Optional<IOAuthToken>> consumer;
         private final String codeVerifier;
 
-        OAuth20AuthorizationHandler(String state, String codeVerifier, IOAuthParameters parameters, Consumer<IOAuthToken> consumer) {
+        OAuth20AuthorizationHandler(String state, String codeVerifier, IOAuthParameters parameters, Consumer<Optional<IOAuthToken>> consumer) {
             this.state = state;
             this.parameters = parameters;
@@ -98 +99 @@
                     HttpClient.Response response = tradeCodeForToken.getResponse();
                     OAuth20Token oAuth20Token = new OAuth20Token(parameters, response.getContentReader());
-                    consumer.accept(oAuth20Token);
+                    consumer.accept(Optional.of(oAuth20Token));
                 } catch (IOException | OAuth20Exception e) {
-                    consumer.accept(null);
+                    consumer.accept(Optional.empty());
                     throw new JosmRuntimeException(e);
                 } finally {

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

@@ -20 +20 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -81 +82 @@
     @Override
     public void sign(HttpClient client) throws OAuthException {
-        if (!this.oauthParameters.getApiUrl().contains(client.getURL().getHost())) {
+        if (!Utils.isBlank(this.oauthParameters.getApiUrl())
+                && !this.oauthParameters.getApiUrl().contains(client.getURL().getHost())) {
             String host = URI.create(this.oauthParameters.getAccessTokenUrl()).getHost();
             throw new IllegalArgumentException("Cannot sign URL with token for different host: Expected " + host