##// END OF EJS Templates
sshpeer: move URL validation out of sshpeer.__init__...
sshpeer: move URL validation out of sshpeer.__init__ We will soon have another SSH peer class to support the new version of the SSH protocol. However, we won't know which peer class to instantiate until we perform a handshake on an active connection. This means that we need to move connection establishment and handshake code out of sshpeer.__init__. This commit starts the process of migrating peer creation code out of sshpeer.__init__ into instance(), which is the API for creating peers. The moved code no longer calls _abort(). _abort() runs _cleanup() and raises. _cleanup() only performs actions on self._pipe*. These objects aren't instantiated until we actually connect to the peer. So _abort() was not necessary in the old code. To keep the API the same, __init__() now makes a redundant call to util.url(). This will be fixed in subsequent commits. Differential Revision: https://phab.mercurial-scm.org/D2027

File last commit:

r35949:b202d360 default
r35949:b202d360 default
Show More
sshpeer.py
380 lines | 12.0 KiB | text/x-python | PythonLexer
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 # sshpeer.py - ssh repository proxy class for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
sshpeer: use absolute_import
r25975 from __future__ import absolute_import
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 import re
Gregory Szorc
sshpeer: use absolute_import
r25975
from .i18n import _
from . import (
error,
Pulkit Goyal
py3: use pycompat.byteskwargs() to convert kwargs' keys to bytes...
r33100 pycompat,
Gregory Szorc
sshpeer: use absolute_import
r25975 util,
wireproto,
)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def _serverquote(s):
Yuya Nishihara
sshpeer: move docstring to top...
r35475 """quote a string for the remote shell ... which we assume is sh"""
Matt Mackall
sshpeer: more thorough shell quoting...
r23671 if not s:
return s
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 if re.match('[a-zA-Z0-9@%_+=:,./-]*$', s):
return s
return "'%s'" % s.replace("'", "'\\''")
Pierre-Yves David
sshpeer: extract the forward output logic...
r25244 def _forwardoutput(ui, pipe):
"""display all data currently available on pipe as remote output.
This is non blocking."""
s = util.readpipe(pipe)
if s:
for l in s.splitlines():
ui.status(_("remote: "), l, '\n')
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421 class doublepipe(object):
"""Operate a side-channel pipe in addition of a main one
The side-channel pipe contains server output to be forwarded to the user
input. The double pipe will behave as the "main" pipe, but will ensure the
content of the "side" pipe is properly processed while we wait for blocking
call on the "main" pipe.
If large amounts of data are read from "main", the forward will cease after
the first bytes start to appear. This simplifies the implementation
without affecting actual output of sshpeer too much as we rarely issue
large read for data not yet emitted by the server.
The main pipe is expected to be a 'bufferedinputpipe' from the util module
Augie Fackler
sshpeer: fix docstring typo
r31953 that handle all the os specific bits. This class lives in this module
Mads Kiilerich
spelling: trivial spell checking
r26781 because it focus on behavior specific to the ssh protocol."""
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421
def __init__(self, ui, main, side):
self._ui = ui
self._main = main
self._side = side
def _wait(self):
"""wait until some data are available on main or side
return a pair of boolean (ismainready, issideready)
(This will only wait for data if the setup is supported by `util.poll`)
"""
Pierre-Yves David
sshpeer: allow doublepipe on unbuffered main pipe...
r25457 if getattr(self._main, 'hasbuffer', False): # getattr for classic pipe
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421 return (True, True) # main has data, assume side is worth poking at.
fds = [self._main.fileno(), self._side.fileno()]
try:
act = util.poll(fds)
except NotImplementedError:
# non supported yet case, assume all have data.
act = fds
return (self._main.fileno() in act, self._side.fileno() in act)
Pierre-Yves David
sshpeer: allow write operations through double pipe...
r25456 def write(self, data):
return self._call('write', data)
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421 def read(self, size):
Augie Fackler
sshpeer: try harder to snag stderr when stdout closes unexpectedly...
r32062 r = self._call('read', size)
if size != 0 and not r:
# We've observed a condition that indicates the
# stdout closed unexpectedly. Check stderr one
# more time and snag anything that's there before
# letting anyone know the main part of the pipe
# closed prematurely.
_forwardoutput(self._ui, self._side)
return r
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421
def readline(self):
return self._call('readline')
Pierre-Yves David
sshpeer: rename 'size' to 'data' in doublepipe...
r25455 def _call(self, methname, data=None):
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421 """call <methname> on "main", forward output of "side" while blocking
"""
Pierre-Yves David
sshpeer: rename 'size' to 'data' in doublepipe...
r25455 # data can be '' or 0
if (data is not None and not data) or self._main.closed:
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421 _forwardoutput(self._ui, self._side)
return ''
while True:
mainready, sideready = self._wait()
if sideready:
_forwardoutput(self._ui, self._side)
if mainready:
meth = getattr(self._main, methname)
Pierre-Yves David
sshpeer: rename 'size' to 'data' in doublepipe...
r25455 if data is None:
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421 return meth()
else:
Pierre-Yves David
sshpeer: rename 'size' to 'data' in doublepipe...
r25455 return meth(data)
Pierre-Yves David
sshpeer: introduce a "doublepipe" class...
r25421
def close(self):
return self._main.close()
Pierre-Yves David
sshpeer: allow write operations through double pipe...
r25456 def flush(self):
return self._main.flush()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 class sshpeer(wireproto.wirepeer):
def __init__(self, ui, path, create=False):
self._url = path
Gregory Szorc
sshpeer: use peer interface...
r33803 self._ui = ui
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo = self._pipei = self._pipee = None
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
u = util.url(path, parsequery=False, parsefragment=False)
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763
self._user = u.user
self._host = u.host
self._port = u.port
self._path = u.path or '.'
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Jun Wu
codemod: register core configitems using a script...
r33499 sshcmd = self.ui.config("ui", "ssh")
remotecmd = self.ui.config("ui", "remotecmd")
Kostia Balytskyi
sshpeer: allow for additional environment passing to ssh exe...
r35452 sshaddenv = dict(self.ui.configitems("sshenv"))
sshenv = util.shellenviron(sshaddenv)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 args = util.sshargs(sshcmd, self._host, self._user, self._port)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
if create:
cmd = '%s %s %s' % (sshcmd, args,
util.shellquote("%s init %s" %
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 (_serverquote(remotecmd), _serverquote(self._path))))
Siddharth Agarwal
sshpeer: only print out 'running ssh' messages in debug mode (BC)...
r20794 ui.debug('running %s\n' % cmd)
Kostia Balytskyi
sshpeer: allow for additional environment passing to ssh exe...
r35452 res = ui.system(cmd, blockedtag='sshpeer', environ=sshenv)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 if res != 0:
self._abort(error.RepoError(_("could not create remote repo")))
Kostia Balytskyi
sshpeer: allow for additional environment passing to ssh exe...
r35452 self._validaterepo(sshcmd, args, remotecmd, sshenv)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Gregory Szorc
sshpeer: use peer interface...
r33803 # Begin of _basepeer interface.
@util.propertycache
def ui(self):
return self._ui
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def url(self):
return self._url
Gregory Szorc
sshpeer: use peer interface...
r33803 def local(self):
return None
def peer(self):
return self
def canpush(self):
return True
def close(self):
pass
# End of _basepeer interface.
# Begin of _basewirecommands interface.
def capabilities(self):
return self._caps
# End of _basewirecommands interface.
Kostia Balytskyi
sshpeer: allow for additional environment passing to ssh exe...
r35452 def _validaterepo(self, sshcmd, args, remotecmd, sshenv=None):
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 # cleanup up previous run
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._cleanup()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
cmd = '%s %s %s' % (sshcmd, args,
util.shellquote("%s -R %s serve --stdio" %
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 (_serverquote(remotecmd), _serverquote(self._path))))
Siddharth Agarwal
sshpeer: only print out 'running ssh' messages in debug mode (BC)...
r20794 self.ui.debug('running %s\n' % cmd)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 cmd = util.quotecommand(cmd)
Durham Goode
sshpeer: store subprocess so it cleans up correctly...
r18759
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 # while self._subprocess isn't used, having it allows the subprocess to
Durham Goode
sshpeer: store subprocess so it cleans up correctly...
r18759 # to clean up correctly later
Pierre-Yves David
sshpeer: run the ssh command unbuffered...
r25408 #
# no buffer allow the use of 'select'
# feel free to remove buffering and select usage when we ultimately
# move to threading.
Kostia Balytskyi
sshpeer: allow for additional environment passing to ssh exe...
r35452 sub = util.popen4(cmd, bufsize=0, env=sshenv)
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo, self._pipei, self._pipee, self._subprocess = sub
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipei = util.bufferedinputpipe(self._pipei)
self._pipei = doublepipe(self.ui, self._pipei, self._pipee)
self._pipeo = doublepipe(self.ui, self._pipeo, self._pipee)
Pierre-Yves David
sshpeer: use a 'bufferedinputpipe' for standard output of the ssh process...
r25407
Durham Goode
ssh: fix flakey ssh errors on BSD systems...
r34194 def badresponse():
Zuzanna Mroczek
sshpeer: add a configurable hint for the ssh error message...
r35107 msg = _("no suitable response from remote hg")
hint = self.ui.config("ui", "ssherrorhint")
self._abort(error.RepoError(msg, hint=hint))
Durham Goode
ssh: fix flakey ssh errors on BSD systems...
r34194
try:
# skip any noise generated by remote shell
self._callstream("hello")
r = self._callstream("between", pairs=("%s-%s" % ("0"*40, "0"*40)))
except IOError:
badresponse()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 lines = ["", "dummy"]
max_noise = 500
while lines[-1] and max_noise:
Durham Goode
ssh: fix flakey ssh errors on BSD systems...
r34194 try:
l = r.readline()
Durham Goode
ssh: fix flakey ssh errors on BSD systems...
r34107 self._readerr()
Durham Goode
ssh: fix flakey ssh errors on BSD systems...
r34194 if lines[-1] == "1\n" and l == "\n":
break
if l:
self.ui.debug("remote: ", l)
lines.append(l)
max_noise -= 1
except IOError:
badresponse()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 else:
Durham Goode
ssh: fix flakey ssh errors on BSD systems...
r34194 badresponse()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
self._caps = set()
for l in reversed(lines):
if l.startswith("capabilities:"):
self._caps.update(l[:-1].split(":")[1].split())
break
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 def _readerr(self):
_forwardoutput(self.ui, self._pipee)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def _abort(self, exception):
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._cleanup()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 raise exception
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 def _cleanup(self):
if self._pipeo is None:
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 return
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.close()
self._pipei.close()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 try:
# read the error descriptor until EOF
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 for l in self._pipee:
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 self.ui.status(_("remote: "), l)
except (IOError, ValueError):
pass
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipee.close()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 __del__ = _cleanup
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Augie Fackler
wireproto: make iterbatcher behave streamily over http(s)...
r28438 def _submitbatch(self, req):
Gregory Szorc
wireproto: consolidate code for obtaining "cmds" argument value...
r29733 rsp = self._callstream("batch", cmds=wireproto.encodebatchcmds(req))
Augie Fackler
wireproto: make iterbatcher behave streamily over http(s)...
r28438 available = self._getamount()
# TODO this response parsing is probably suboptimal for large
# batches with large responses.
toread = min(available, 1024)
work = rsp.read(toread)
available -= toread
chunk = work
while chunk:
while ';' in work:
one, work = work.split(';', 1)
yield wireproto.unescapearg(one)
toread = min(available, 1024)
chunk = rsp.read(toread)
available -= toread
work += chunk
yield wireproto.unescapearg(work)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def _callstream(self, cmd, **args):
Pulkit Goyal
py3: use pycompat.byteskwargs() to convert kwargs' keys to bytes...
r33100 args = pycompat.byteskwargs(args)
Boris Feld
sshpeer: add support for request tracing...
r35717 if (self.ui.debugflag
and self.ui.configbool('devel', 'debug.peer-request')):
dbg = self.ui.debug
line = 'devel-peer-request: %s\n'
dbg(line % cmd)
for key, value in sorted(args.items()):
if not isinstance(value, dict):
dbg(line % ' %s: %d bytes' % (key, len(value)))
else:
for dk, dv in sorted(value.items()):
dbg(line % ' %s-%s: %d' % (key, dk, len(dv)))
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 self.ui.debug("sending %s command\n" % cmd)
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.write("%s\n" % cmd)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 _func, names = wireproto.commands[cmd]
keys = names.split()
wireargs = {}
for k in keys:
if k == '*':
wireargs['*'] = args
break
else:
wireargs[k] = args[k]
del args[k]
for k, v in sorted(wireargs.iteritems()):
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.write("%s %d\n" % (k, len(v)))
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 if isinstance(v, dict):
for dk, dv in v.iteritems():
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.write("%s %d\n" % (dk, len(dv)))
self._pipeo.write(dv)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 else:
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.write(v)
self._pipeo.flush()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 return self._pipei
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Pierre-Yves David
wireproto: drop the _decompress method in favor a new call type...
r20905 def _callcompressable(self, cmd, **args):
return self._callstream(cmd, **args)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def _call(self, cmd, **args):
self._callstream(cmd, **args)
return self._recv()
def _callpush(self, cmd, fp, **args):
r = self._call(cmd, **args)
if r:
return '', r
Augie Fackler
sshpeer: use `iter(callable, sentinel)` instead of while True...
r29727 for d in iter(lambda: fp.read(4096), ''):
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 self._send(d)
self._send("", flush=True)
r = self._recv()
if r:
return '', r
return self._recv(), ''
Pierre-Yves David
sshpeer: add implementation of _calltwowaystream...
r21073 def _calltwowaystream(self, cmd, fp, **args):
r = self._call(cmd, **args)
if r:
# XXX needs to be made better
liscju
i18n: translate abort messages...
r29389 raise error.Abort(_('unexpected remote reply: %s') % r)
Augie Fackler
sshpeer: use `iter(callable, sentinel)` instead of while True...
r29727 for d in iter(lambda: fp.read(4096), ''):
Pierre-Yves David
sshpeer: add implementation of _calltwowaystream...
r21073 self._send(d)
self._send("", flush=True)
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 return self._pipei
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Augie Fackler
wireproto: make iterbatcher behave streamily over http(s)...
r28438 def _getamount(self):
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 l = self._pipei.readline()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 if l == '\n':
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._readerr()
Pierre-Yves David
sshpeer: break "OutOfBandError" feature for ssh (BC)...
r25243 msg = _('check previous remote output')
self._abort(error.OutOfBandError(hint=msg))
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._readerr()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 try:
Augie Fackler
wireproto: make iterbatcher behave streamily over http(s)...
r28438 return int(l)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 except ValueError:
self._abort(error.ResponseError(_("unexpected response:"), l))
Augie Fackler
wireproto: make iterbatcher behave streamily over http(s)...
r28438
def _recv(self):
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 return self._pipei.read(self._getamount())
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
def _send(self, data, flush=False):
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.write("%d\n" % len(data))
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 if data:
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.write(data)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 if flush:
Gregory Szorc
sshpeer: make instance attributes and methods internal...
r33763 self._pipeo.flush()
self._readerr()
Peter Arrenbrecht
peer: introduce real peer classes...
r17192
Gregory Szorc
sshpeer: make "instance" a function...
r35946 def instance(ui, path, create):
Gregory Szorc
sshpeer: move URL validation out of sshpeer.__init__...
r35949 """Create an SSH peer.
The returned object conforms to the ``wireproto.wirepeer`` interface.
"""
u = util.url(path, parsequery=False, parsefragment=False)
if u.scheme != 'ssh' or not u.host or u.path is None:
raise error.RepoError(_("couldn't parse location %s") % path)
util.checksafessh(path)
if u.passwd is not None:
raise error.RepoError(_('password in URL not supported'))
Gregory Szorc
sshpeer: make "instance" a function...
r35946 return sshpeer(ui, path, create=create)