##// END OF EJS Templates
py3: define and use pycompat.iteritems() for hgext/...
py3: define and use pycompat.iteritems() for hgext/ .iteritems() -> .items() is the last source transform being performed. But it is also the most widely used. This commit adds a pycompat.iteritems symbol and imports it in place of .iteritems() for usage in hgext/. I chose to stop at just hgext/ because the patch will be large and it is an easy boundary to stop at since we can disable source transformation on a per-package basis. There are places where the type does implement items() and we could call items() directly. However, this would require critical thought and I thought it would be easier to just blindly change the code. We know which call sites need to be audited in the future because they have "pycompat.iteritems." With this change, we no longer perform source transformation on hgext! Differential Revision: https://phab.mercurial-scm.org/D7014

File last commit:

r43357:66f2cc21 default
r43375:649d3ac3 default
Show More
factotum.py
156 lines | 4.8 KiB | text/x-python | PythonLexer
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 # factotum.py - Plan 9 factotum integration for Mercurial
#
# Copyright (C) 2012 Steven Stallion <sstallion@gmail.com>
#
# This program is free software; you can redistribute it and/or 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.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
'''http authentication with factotum
Steven Stallion
factotum: add man reference to help output
r16582 This extension allows the factotum(4) facility on Plan 9 from Bell Labs
platforms to provide authentication information for HTTP access. Configuration
entries specified in the auth section as well as authentication information
provided in the repository URL are fully supported. If no prefix is specified,
a value of "*" will be assumed.
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
By default, keys are specified as::
proto=pass service=hg prefix=<prefix> user=<username> !password=<password>
If the factotum extension is unable to read the required key, one will be
requested interactively.
A configuration section is available to customize runtime behavior. By
default, these entries are::
[factotum]
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 executable = /bin/auth/factotum
mountpoint = /mnt/factotum
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 service = hg
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 The executable entry defines the full path to the factotum binary. The
mountpoint entry defines the path to the factotum file service. Lastly, the
service entry controls the service name used when reading keys.
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
'''
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 from __future__ import absolute_import
import os
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 from mercurial.i18n import _
Gregory Szorc
py3: manually import pycompat.setattr where it is needed...
r43357 from mercurial.pycompat import setattr
Augie Fackler
formatting: blacken the codebase...
r43346 from mercurial.utils import procutil
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 from mercurial import (
error,
httpconnection,
configitems: register the 'factotum.executable' config
r33238 registrar,
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 url,
util,
)
urlreq = util.urlreq
passwordmgr = url.passwordmgr
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
ERRMAX = 128
Yuya Nishihara
factotum: initialize global variables to suppress pyflakes warning
r21228 _executable = _mountpoint = _service = None
configitems: register the 'factotum.executable' config
r33238 configtable = {}
configitem = registrar.configitem(configtable)
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'factotum', b'executable', default=b'/bin/auth/factotum',
configitems: register the 'factotum.executable' config
r33238 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'factotum', b'mountpoint', default=b'/mnt/factotum',
configitems: register the 'factotum.mountpoint' config
r33239 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'factotum', b'service', default=b'hg',
configitems: register the 'factotum.service' config
r33240 )
configitems: register the 'factotum.executable' config
r33238
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def auth_getkey(self, params):
if not self.ui.interactive():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'factotum not interactive'))
if b'user=' not in params:
params = b'%s user?' % params
params = b'%s !password?' % params
os.system(procutil.tonativestr(b"%s -g '%s'" % (_executable, params)))
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def auth_getuserpasswd(self, getkey, params):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 params = b'proto=pass %s' % params
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 while True:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fd = os.open(b'%s/rpc' % _mountpoint, os.O_RDWR)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 os.write(fd, b'start %s' % params)
Matt Mackall
factotum: use try/except/finally
r25078 l = os.read(fd, ERRMAX).split()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if l[0] == b'ok':
os.write(fd, b'read')
Matt Mackall
factotum: use try/except/finally
r25078 status, user, passwd = os.read(fd, ERRMAX).split(None, 2)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if status == b'ok':
if passwd.startswith(b"'"):
if passwd.endswith(b"'"):
passwd = passwd[1:-1].replace(b"''", b"'")
Matt Mackall
factotum: use try/except/finally
r25078 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'malformed password string'))
Matt Mackall
factotum: use try/except/finally
r25078 return (user, passwd)
except (OSError, IOError):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'factotum not responding'))
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 finally:
os.close(fd)
getkey(self, params)
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def monkeypatch_method(cls):
def decorator(func):
setattr(cls, func.__name__, func)
return func
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 return decorator
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 @monkeypatch_method(passwordmgr)
def find_user_password(self, realm, authuri):
liscju
url: extract password database from password manager...
r29377 user, passwd = self.passwddb.find_user_password(realm, authuri)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if user and passwd:
self._writedebug(user, passwd)
return (user, passwd)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = b''
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 res = httpconnection.readauthforuri(self.ui, authuri, user)
if res:
_, auth = res
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = auth.get(b'prefix')
user, passwd = auth.get(b'username'), auth.get(b'password')
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if not user or not passwd:
if not prefix:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = realm.split(b' ')[0].lower()
params = b'service=%s prefix=%s' % (_service, prefix)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if user:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 params = b'%s user=%s' % (params, user)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 user, passwd = auth_getuserpasswd(self, auth_getkey, params)
self.add_password(realm, authuri, user, passwd)
self._writedebug(user, passwd)
return (user, passwd)
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def uisetup(ui):
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 global _executable
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _executable = ui.config(b'factotum', b'executable')
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 global _mountpoint
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _mountpoint = ui.config(b'factotum', b'mountpoint')
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 global _service
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _service = ui.config(b'factotum', b'service')