Changeset 4690 in josm for trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java

Timestamp:

2011-12-21T23:12:59+01:00 (13 years ago)

Author:

stoecker

Message:

see #7086 - fix passing auth information to wrong server

File:

• trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java

@@ -17 +17 @@
      */
     @Override
-    public CredentialsAgentResponse getCredentials(RequestorType requestorType, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
+    public CredentialsAgentResponse getCredentials(RequestorType requestorType, String host, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
         if (requestorType == null)
             return null;
-        PasswordAuthentication credentials =  lookup(requestorType);
+        PasswordAuthentication credentials =  lookup(requestorType, host);
         String username = (credentials == null || credentials.getUserName() == null) ? "" : credentials.getUserName();
         String password = (credentials == null || credentials.getPassword() == null) ? "" : String.valueOf(credentials.getPassword());
@@ -47 +47 @@
             CredentialDialog dialog = null;
             switch(requestorType) {
-            case SERVER: dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, getSaveUsernameAndPasswordCheckboxText()); break;
-            case PROXY: dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, getSaveUsernameAndPasswordCheckboxText()); break;
+            case SERVER: dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
+            case PROXY: dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
             }
             dialog.setVisible(true);
@@ -57 +57 @@
             response.setPassword(dialog.getPassword());
             if (dialog.isSaveCredentials()) {
-                store(requestorType, new PasswordAuthentication(
+                store(requestorType, host, new PasswordAuthentication(
                         response.getUsername(),
                         response.getPassword()