Changeset 9352 in josm for trunk/src/org/openstreetmap/josm/io/OsmConnection.java

Timestamp:

2016-01-09T16:25:08+01:00 (8 years ago)

Author:

simon04

Message:

fix #7612 - Prefer OAuth, provide authorization at upload

File:

• trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.lang.reflect.InvocationTargetException;
 import java.net.Authenticator.RequestorType;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -10 +13 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
+import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
@@ -22 +29 @@
 import oauth.signpost.OAuthConsumer;
 import oauth.signpost.exception.OAuthException;
+import org.openstreetmap.josm.tools.Utils;
+
+import javax.swing.SwingUtilities;
 
 /**
@@ -96 +106 @@
         OAuthConsumer consumer = oauthParameters.buildConsumer();
         OAuthAccessTokenHolder holder = OAuthAccessTokenHolder.getInstance();
-        if (!holder.containsAccessToken())
+        if (!holder.containsAccessToken()) {
+            obtainAccessToken(connection);
+        }
+        if (!holder.containsAccessToken()) { // check if wizard completed
             throw new MissingOAuthAccessTokenException();
+        }
         consumer.setTokenWithSecret(holder.getAccessTokenKey(), holder.getAccessTokenSecret());
         try {
@@ -106 +120 @@
     }
 
+    /**
+     * Obtains an OAuth access token for the connection. Afterwards, the token is accessible via {@link OAuthAccessTokenHolder}.
+     * @param connection connection for which the access token should be obtained
+     * @throws MissingOAuthAccessTokenException if the process cannot be completec successfully
+     */
+    protected void obtainAccessToken(final HttpClient connection) throws MissingOAuthAccessTokenException {
+        try {
+            final URL apiUrl = new URL(Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
+            if (!Objects.equals(apiUrl.getHost(), connection.getURL().getHost())) {
+                throw new MissingOAuthAccessTokenException();
+            }
+            final Runnable authTask = new FutureTask<>(new Callable<OAuthAuthorizationWizard>() {
+                @Override
+                public OAuthAuthorizationWizard call() throws Exception {
+                    // Concerning Utils.newDirectExecutor: Main.worker cannot be used since this connection is already
+                    // executed via Main.worker. The OAuth connections would block otherwise.
+                    final OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
+                            Main.parent, apiUrl.toExternalForm(), Utils.newDirectExecutor());
+                    wizard.showDialog();
+                    OAuthAccessTokenHolder.getInstance().setSaveToPreferences(true);
+                    OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
+                    return wizard;
+                }
+            });
+            // exception handling differs from implementation at GuiHelper.runInEDTAndWait()
+            if (SwingUtilities.isEventDispatchThread()) {
+                authTask.run();
+            } else {
+                SwingUtilities.invokeAndWait(authTask);
+            }
+        } catch (MalformedURLException | InterruptedException | InvocationTargetException e) {
+            throw new MissingOAuthAccessTokenException();
+        }
+    }
+
     protected void addAuth(HttpClient connection) throws OsmTransferException {
-        String authMethod = Main.pref.get("osm-server.auth-method", "basic");
+        final String authMethod = OsmApi.getAuthMethod();
         if ("basic".equals(authMethod)) {
             addBasicAuthorizationHeader(connection);