Changeset 9355 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-01-09T18:07:26+01:00 (8 years ago)

Author:

simon04

Message:

fix #7943 - Make OAuth work for non-standard OSM APIs

You will need to obtain an application via
http://<server>/user/<user>/oauth_clients/new, and set the OAuth
consumer key+secret in the advanced OAuth parameters.

Location:

trunk/src/org/openstreetmap/josm/gui/oauth

Files:

• AdvancedOAuthPropertiesPanel.java (modified) (9 diffs)
• FullyAutomaticAuthorizationUI.java (modified) (1 diff)
• OsmOAuthAuthorizationClient.java (modified) (5 diffs)

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

@@ -35 +35 @@
  * <li>Access token URL</li>
  * <li>Authorize URL</li>
+ * <li>OSM login URL</li>
+ * <li>OSM logout URL</li>
  * </ul>
  *
@@ -48 +50 @@
     private JosmTextField tfAccessTokenURL;
     private JosmTextField tfAuthoriseURL;
+    private JosmTextField tfOsmLoginURL;
+    private JosmTextField tfOsmLogoutURL;
     private transient UseDefaultItemListener ilUseDefault;
     private String apiUrl;
@@ -120 +124 @@
         SelectAllOnFocusGainedDecorator.decorate(tfAuthoriseURL);
 
+
+        // -- OSM login URL
+        gc.gridy = 6;
+        gc.gridx = 0;
+        gc.weightx = 0.0;
+        add(new JLabel(tr("OSM login URL:")), gc);
+
+        gc.gridx = 1;
+        gc.weightx = 1.0;
+        add(tfOsmLoginURL = new JosmTextField(), gc);
+        SelectAllOnFocusGainedDecorator.decorate(tfOsmLoginURL);
+
+
+        // -- OSM logout URL
+        gc.gridy = 7;
+        gc.gridx = 0;
+        gc.weightx = 0.0;
+        add(new JLabel(tr("OSM logout URL:")), gc);
+
+        gc.gridx = 1;
+        gc.weightx = 1.0;
+        add(tfOsmLogoutURL = new JosmTextField(), gc);
+        SelectAllOnFocusGainedDecorator.decorate(tfOsmLogoutURL);
+
         cbUseDefaults.addItemListener(ilUseDefault = new UseDefaultItemListener());
     }
@@ -125 +153 @@
     protected boolean hasCustomSettings() {
         OAuthParameters params = OAuthParameters.createDefault(apiUrl);
-        return
-           !tfConsumerKey.getText().equals(params.getConsumerKey())
-        || !tfConsumerSecret.getText().equals(params.getConsumerSecret())
-        || !tfRequestTokenURL.getText().equals(params.getRequestTokenUrl())
-        || !tfAccessTokenURL.getText().equals(params.getAccessTokenUrl())
-        || !tfAuthoriseURL.getText().equals(params.getAuthoriseUrl());
+        return !params.equals(getAdvancedParameters());
     }
 
@@ -173 +196 @@
         tfAccessTokenURL.setText(params.getAccessTokenUrl());
         tfAuthoriseURL.setText(params.getAuthoriseUrl());
+        tfOsmLoginURL.setText(params.getOsmLoginUrl());
+        tfOsmLogoutURL.setText(params.getOsmLogoutUrl());
 
         setChildComponentsEnabled(false);
@@ -198 +223 @@
             tfRequestTokenURL.getText(),
             tfAccessTokenURL.getText(),
-            tfAuthoriseURL.getText());
+            tfAuthoriseURL.getText(),
+            tfOsmLoginURL.getText(),
+            tfOsmLogoutURL.getText());
     }
 
@@ -220 +247 @@
             tfAccessTokenURL.setText(parameters.getAccessTokenUrl() == null ? "" : parameters.getAccessTokenUrl());
             tfAuthoriseURL.setText(parameters.getAuthoriseUrl() == null ? "" : parameters.getAuthoriseUrl());
+            tfOsmLoginURL.setText(parameters.getOsmLoginUrl() == null ? "" : parameters.getOsmLoginUrl());
+            tfOsmLogoutURL.setText(parameters.getOsmLogoutUrl() == null ? "" : parameters.getOsmLogoutUrl());
         }
     }
@@ -244 +273 @@
             resetToDefaultSettings();
         } else {
-            cbUseDefaults.setSelected(false);
-            tfConsumerKey.setText(pref.get("oauth.settings.consumer-key", OAuthParameters.DEFAULT_JOSM_CONSUMER_KEY));
-            tfConsumerSecret.setText(pref.get("oauth.settings.consumer-secret", OAuthParameters.DEFAULT_JOSM_CONSUMER_SECRET));
-            tfRequestTokenURL.setText(pref.get("oauth.settings.request-token-url", OAuthParameters.DEFAULT_REQUEST_TOKEN_URL));
-            tfAccessTokenURL.setText(pref.get("oauth.settings.access-token-url", OAuthParameters.DEFAULT_ACCESS_TOKEN_URL));
-            tfAuthoriseURL.setText(pref.get("oauth.settings.authorise-url", OAuthParameters.DEFAULT_AUTHORISE_URL));
-            setChildComponentsEnabled(true);
+            setAdvancedParameters(OAuthParameters.createFromPreferences(pref));
         }
         ilUseDefault.setEnabled(true);
@@ -265 +288 @@
         pref.put("oauth.settings.use-default", cbUseDefaults.isSelected());
         if (cbUseDefaults.isSelected()) {
-            pref.put("oauth.settings.consumer-key", null);
-            pref.put("oauth.settings.consumer-secret", null);
-            pref.put("oauth.settings.request-token-url", null);
-            pref.put("oauth.settings.access-token-url", null);
-            pref.put("oauth.settings.authorise-url", null);
+            new OAuthParameters(null, null, null, null, null, null, null).rememberPreferences(pref);
         } else {
-            pref.put("oauth.settings.consumer-key", tfConsumerKey.getText().trim());
-            pref.put("oauth.settings.consumer-secret", tfConsumerSecret.getText().trim());
-            pref.put("oauth.settings.request-token-url", tfRequestTokenURL.getText().trim());
-            pref.put("oauth.settings.access-token-url", tfAccessTokenURL.getText().trim());
-            pref.put("oauth.settings.authorise-url", tfAuthoriseURL.getText().trim());
+            getAdvancedParameters().rememberPreferences(pref);
         }
     }

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

@@ -479 +479 @@
 
         protected void alertLoginFailed(OsmLoginFailedException e) {
-            String loginUrl = null;
-            try {
-                loginUrl = authClient.buildOsmLoginUrl();
-            } catch (OsmOAuthAuthorizationException e1) {
-                alertInvalidLoginUrl();
-                return;
-            }
+            final String loginUrl = getAdvancedPropertiesPanel().getAdvancedParameters().getOsmLoginUrl();
             HelpAwareOptionPane.showOptionDialog(
                     FullyAutomaticAuthorizationUI.this,

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

@@ -8 +8 @@
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -247 +246 @@
 
     /**
-     * Derives the OSM login URL from the OAuth Authorization Website URL
-     *
-     * @return the OSM login URL
-     * @throws OsmOAuthAuthorizationException if something went wrong, in particular if the
-     * URLs are malformed
-     */
-    public String buildOsmLoginUrl() throws OsmOAuthAuthorizationException {
-        try {
-            URL autUrl = new URL(oauthProviderParameters.getAuthoriseUrl());
-            URL url = new URL(Main.pref.get("oauth.protocol", "https"), autUrl.getHost(), autUrl.getPort(), "/login");
-            return url.toString();
-        } catch (MalformedURLException e) {
-            throw new OsmOAuthAuthorizationException(e);
-        }
-    }
-
-    /**
-     * Derives the OSM logout URL from the OAuth Authorization Website URL
-     *
-     * @return the OSM logout URL
-     * @throws OsmOAuthAuthorizationException if something went wrong, in particular if the
-     * URLs are malformed
-     */
-    protected String buildOsmLogoutUrl() throws OsmOAuthAuthorizationException {
-        try {
-            URL autUrl = new URL(oauthProviderParameters.getAuthoriseUrl());
-            URL url = new URL(Main.pref.get("oauth.protocol", "https"), autUrl.getHost(), autUrl.getPort(), "/logout");
-            return url.toString();
-        } catch (MalformedURLException e) {
-            throw new OsmOAuthAuthorizationException(e);
-        }
-    }
-
-    /**
      * Submits a request to the OSM website for a login form. The OSM website replies a session ID in
      * a cookie.
@@ -289 +254 @@
     protected SessionId fetchOsmWebsiteSessionId() throws OsmOAuthAuthorizationException {
         try {
-            StringBuilder sb = new StringBuilder();
-            sb.append(buildOsmLoginUrl()).append("?cookie_test=true");
-            URL url = new URL(sb.toString());
+            final URL url = new URL(oauthProviderParameters.getOsmLoginUrl() + "?cookie_test=true");
             synchronized (this) {
                 connection = HttpClient.create(url);
@@ -341 +304 @@
     protected void authenticateOsmSession(SessionId sessionId, String userName, String password) throws OsmLoginFailedException {
         try {
-            URL url = new URL(buildOsmLoginUrl());
+            final URL url = new URL(oauthProviderParameters.getOsmLoginUrl());
             final HttpClient client = HttpClient.create(url, "POST").useCache(false);
 
@@ -383 +346 @@
     protected void logoutOsmSession(SessionId sessionId) throws OsmOAuthAuthorizationException {
         try {
-            URL url = new URL(buildOsmLogoutUrl());
+            URL url = new URL(oauthProviderParameters.getOsmLogoutUrl());
             synchronized (this) {
                 connection = HttpClient.create(url).setMaxRedirects(-1);