Changeset 36211 in osm for applications/editors/josm/plugins/native-password-manager/src

Timestamp:

2024-02-21T22:06:26+01:00 (8 months ago)

Author:

taylor.smock

Message:

See #22810: OSM OAuth 1.0a/Basic auth deprecation and removal

Location:

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm

Files:

• InitializationWizard.java (modified) (10 diffs)
• NPMCredentialsAgent.java (modified) (4 diffs)

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java

@@ -41 +41 @@
 
 import org.netbeans.spi.keyring.KeyringProvider;
-import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.io.DefaultProxySelector;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
@@ -56 +54 @@
 public class InitializationWizard extends JDialog {
 
-    protected boolean canceled = false;
+    protected boolean canceled;
     protected JButton btnCancel, btnBack, btnNext;
     protected Action nextAction, finishAction;
@@ -67 +65 @@
     
     public InitializationWizard() {
-        super(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()), tr("Native password manager plugin"), ModalityType.DOCUMENT_MODAL);
+        super(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()),
+                tr("Native password manager plugin"), ModalityType.DOCUMENT_MODAL);
         build();
         NPMType npm = detectNativePasswordManager();
@@ -146 +145 @@
         void onOkAction();
     }
-    
-    abstract private static class AbstractWizardPanel implements WizardPanel {
+
+    private abstract static class AbstractWizardPanel implements WizardPanel {
         
         /**
@@ -175 +174 @@
         }
 
-        abstract protected JPanel getContentPanel();
+        protected abstract JPanel getContentPanel();
     }
     
@@ -229 +228 @@
     private static class SelectionPanel extends AbstractWizardPanel implements ActionListener {
         
-        private NPMType type;
-        private InitializationWizard wizard;
+        private final NPMType type;
+        private final InitializationWizard wizard;
         
         private JRadioButton rbManage, rbPlain;
@@ -350 +349 @@
             
             CredentialsManager cm = CredentialsManager.getInstance();
-            
-            String server_username = Config.getPref().get("osm-server.username", null);
-            String server_password = Config.getPref().get("osm-server.password", null);
-            if (server_username != null || server_password != null) {
+
+            String proxyUsername = Config.getPref().get(DefaultProxySelector.PROXY_USER, null);
+            String proxyPassword = Config.getPref().get(DefaultProxySelector.PROXY_PASS, null);
+            String proxyHost = Config.getPref().get(DefaultProxySelector.PROXY_HTTP_HOST, null);
+            if (proxyUsername != null || proxyPassword != null) {
                 try {
-                    cm.store(RequestorType.SERVER, OsmApi.getOsmApi().getHost(), new PasswordAuthentication(string(server_username), toCharArray(server_password)));
-                    if (rbClear.isSelected()) {
-                        Config.getPref().put("osm-server.username", null);
-                        Config.getPref().put("osm-server.password", null);
-                    }
-                } catch (CredentialsAgentException ex) {
-                    Logging.error(ex);
-                }
-            }
-            
-            String proxy_username = Config.getPref().get(DefaultProxySelector.PROXY_USER, null);
-            String proxy_password = Config.getPref().get(DefaultProxySelector.PROXY_PASS, null);
-            String proxy_host = Config.getPref().get(DefaultProxySelector.PROXY_HTTP_HOST, null);
-            if (proxy_username != null || proxy_password != null) {
-                try {
-                    cm.store(RequestorType.PROXY, proxy_host, new PasswordAuthentication(string(proxy_username), toCharArray(proxy_password)));
+                    cm.store(RequestorType.PROXY, proxyHost, new PasswordAuthentication(string(proxyUsername), toCharArray(proxyPassword)));
                     if (rbClear.isSelected()) {
                         Config.getPref().put(DefaultProxySelector.PROXY_USER, null);
@@ -379 +364 @@
                 }
             }
-            
-            String oauth_key = Config.getPref().get("oauth.access-token.key", null);
-            String oauth_secret = Config.getPref().get("oauth.access-token.secret", null);
-            if (oauth_key != null || oauth_secret != null) {
-                try {
-                    cm.storeOAuthAccessToken(new OAuthToken(string(oauth_key), string(oauth_secret)));
-                    if (rbClear.isSelected()) {
-                        Config.getPref().put("oauth.access-token.key", null);
-                        Config.getPref().put("oauth.access-token.secret", null);
-                    }
-                } catch (CredentialsAgentException ex) {
-                    Logging.error(ex);
-                }
-            }
-        }
-    }
-
-    private final static String NPM = "Native Password Manager Plugin: ";
+        }
+    }
+
+    private static final String NPM = "Native Password Manager Plugin: ";
 
     private static NPMType detectNativePasswordManager() {
@@ -445 +416 @@
                     )
             ).applySafe(this);
-        } else if (!visible && isShowing()){
+        } else if (isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }
@@ -493 +464 @@
         public void actionPerformed(ActionEvent evt) {
             if (panelIndex <= 0)
-                throw new RuntimeException();
+                // Java 9 will let us pass the panelIndex by itself
+                throw new IndexOutOfBoundsException("Index out of range: " + panelIndex);
             panelIndex--;
             cardLayout.show(cardPanel, panels.get(panelIndex).getId());

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.oauth.OAuth20Parameters;
 import org.openstreetmap.josm.data.oauth.OAuth20Token;
-import org.openstreetmap.josm.data.oauth.OAuthToken;
 import org.openstreetmap.josm.data.oauth.OAuthVersion;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -52 +51 @@
      */
     private final Map<RequestorType, PasswordAuthentication> credentialsCache = new EnumMap<>(RequestorType.class);
-    private OAuthToken oauthCache;
+
 
     /**
@@ -187 +186 @@
             credentialsCache.put(rt, new PasswordAuthentication(stringNotNull(username), password != null ? password : new char[0]));
         }
-    }
-
-    @Override
-    public OAuthToken lookupOAuthAccessToken() {
-        if (oauthCache != null)
-            return oauthCache;
-        String prolog = getOAuthDescriptor();
-        char[] key = getProvider().read(prolog+".key");
-        char[] secret = getProvider().read(prolog+".secret");
-        return new OAuthToken(stringNotNull(key), stringNotNull(secret));
     }
 
@@ -223 +212 @@
 
     @Override
-    public void storeOAuthAccessToken(OAuthToken oat) {
-        String key, secret;
-        if (oat == null) {
-            key = null;
-            secret = null;
-        } else {
-            key = oat.getKey();
-            secret = oat.getSecret();
-        }
-        String prolog = getOAuthDescriptor();
-        if (key == null || key.isEmpty() || secret == null || secret.isEmpty()) {
-            getProvider().delete(prolog+".key");
-            getProvider().delete(prolog+".secret");
-            oauthCache = null;
-        } else {
-            getProvider().save(prolog+".key", key.toCharArray(), tr("JOSM/OAuth/OSM API/Key"));
-            getProvider().save(prolog+".secret", secret.toCharArray(), tr("JOSM/OAuth/OSM API/Secret"));
-            oauthCache = new OAuthToken(key, secret);
-        }
-    }
-
-    @Override
     public void storeOAuthAccessToken(String host, IOAuthToken accessToken) {
         String prolog = getOAuthDescriptor();