comparison easyhg.py @ 449:f778dfb6a42f

Hash remote destination key for auth file rather than just b64 encoding it (so you can't see where someone has been by looking at a stale authfile)

 #    modify it under the terms of the GNU General Public License as
 #    published by the Free Software Foundation; either version 2 of the
 #    License, or (at your option) any later version.  See the file
 #    COPYING included with this distribution for more information.
 
-import sys, os, stat, urllib, urllib2, urlparse, platform
+import sys, os, stat, urllib, urllib2, urlparse, platform, hashlib
 
 from mercurial.i18n import _
 from mercurial import ui, util, error
 try:
     from mercurial.url import passwordmgr

 def set_to_config(pcfg, sect, key, data):
     if not pcfg.has_section(sect):
         pcfg.add_section(sect)
     pcfg.set(sect, key, data)
 
-def remote_key(uri, user):
+def remote_key(uri, user, key):
     # generate a "safe-for-config-file" key representing uri+user
-    # tuple (n.b. trailing = on base64 is not safe)
-    return base64.b64encode('%s@@%s' % (uri, user)).replace('=', '_')
+    s = '%s@@%s' % (uri, user)
+    h = hashlib.sha1()
+    h.update(key)
+    h.update(s)
+    return h.hexdigest()
 
 
 def uisetup(ui):
     if not easyhg_pyqt_ok:
         raise util.Abort(_('Failed to load PyQt4 module required by easyhg.py'))

         authconfig = ConfigParser.RawConfigParser()
         load_config(authconfig, authfile)
         remember = get_boolean_from_config(authconfig, 'preferences',
                                            'remember', False)
         authdata = get_from_config(authconfig, 'auth',
-                                   remote_key(short_uri, user))
+                                   remote_key(short_uri, user, authkey))
         if authdata:
             cachedpwd = decrypt_salted(authdata, authkey)
             passwd_field.setText(cachedpwd)
         remember_field = QtGui.QCheckBox()
         remember_field.setChecked(remember)

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