comparison easyhg.py @ 451:8156537329ff

Associate password with scheme+host+user rather than url+user

     text = cipher.decrypt(base64.b64decode(ctext))
     (tlen, d, text) = text.partition('.')
     (salt, d, text) = text.partition('.')
     return text[0:int(tlen)]
 
+def pathless_url(url):
+    parsed_url = urlparse.urlparse(url)
+    return "%s://%s" % (parsed_url.scheme, parsed_url.netloc)
+
 # from mercurial_keyring by Marcin Kasperski
-def canonical_url(authuri):
-    parsed_url = urlparse.urlparse(authuri)
+def canonical_url(url):
+    parsed_url = urlparse.urlparse(url)
     return "%s://%s%s" % (parsed_url.scheme, parsed_url.netloc,
                           parsed_url.path)
 
 def load_config(pcfg, pfile):
     fp = None

         return orig_find(self, realm, authuri)
 
 #    self.ui.write("want username and/or password for %s\n" % authuri)
 
     short_uri = canonical_url(authuri)
+    pathless_uri = pathless_url(authuri)
 
     authkey = self.ui.config('easyhg', 'authkey')
     authfile = self.ui.config('easyhg', 'authfile')
     use_authfile = (easyhg_authfile_imports_ok and authkey and authfile)
     if authfile: authfile = os.path.expanduser(authfile)

                 user = decrypt_salted(authdata, authkey)
                 user_field.setText(user)
 
         if not passwd:
             authdata = get_from_config(authconfig, 'auth',
-                                       remote_key(short_uri, user, authkey))
+                                       remote_key(pathless_uri, user, authkey))
             if authdata:
                 passwd = decrypt_salted(authdata, authkey)
                 passwd_field.setText(passwd)
 
         remember_field = QtGui.QCheckBox()

             else:
                 set_to_config(authconfig, 'user', remote_key(short_uri, '', authkey), '')
         if passwd:
             if remember:
                 authdata = encrypt_salted(passwd, authkey)
-                set_to_config(authconfig, 'auth', remote_key(short_uri, user, authkey), authdata)
+                set_to_config(authconfig, 'auth', remote_key(pathless_uri, user, authkey), authdata)
             else:
-                set_to_config(authconfig, 'auth', remote_key(short_uri, user, authkey), '')
+                set_to_config(authconfig, 'auth', remote_key(pathless_uri, user, authkey), '')
         save_config(self.ui, authconfig, authfile)
 
     self.add_password(realm, authuri, user, passwd)
     return (user, passwd)