This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2027

sshpeer: move URL validation out of sshpeer.__init__
ClosedPublic

Authored by indygreg on Feb 4 2018, 10:35 PM.

Details

Reviewers
lothiraldan
yuja
Group Reviewers
hg-reviewers
Commits
rHGb202d360d2a4: sshpeer: move URL validation out of sshpeer.__init__
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 4 2018, 10:35 PM
lothiraldan accepted this revision.Feb 5 2018, 7:52 AM
yuja accepted this revision.Feb 6 2018, 8:07 AM
This revision is now accepted and ready to land.Feb 6 2018, 8:07 AM
Closed by commit rHGb202d360d2a4: sshpeer: move URL validation out of sshpeer.__init__ (authored by indygreg). · Explain WhyFeb 6 2018, 8:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (20 lines)

Diff 5185

mercurial/sshpeer.py

class sshpeer(wireproto.wirepeer): class sshpeer(wireproto.wirepeer):
def __init__(self, ui, path, create=False): def __init__(self, ui, path, create=False):
self._url = path self._url = path
self._ui = ui self._ui = ui
self._pipeo = self._pipei = self._pipee = None self._pipeo = self._pipei = self._pipee = None
u = util.url(path, parsequery=False, parsefragment=False) u = util.url(path, parsequery=False, parsefragment=False)
if u.scheme != 'ssh' or not u.host or u.path is None:
self._abort(error.RepoError(_("couldn't parse location %s") % path))
util.checksafessh(path)
if u.passwd is not None:
self._abort(error.RepoError(_("password in URL not supported")))
self._user = u.user self._user = u.user
self._host = u.host self._host = u.host
self._port = u.port self._port = u.port
self._path = u.path or '.' self._path = u.path or '.'
sshcmd = self.ui.config("ui", "ssh") sshcmd = self.ui.config("ui", "ssh")
remotecmd = self.ui.config("ui", "remotecmd") remotecmd = self.ui.config("ui", "remotecmd")
self._pipeo.write("%d\n" % len(data)) self._pipeo.write("%d\n" % len(data))
if data: if data:
self._pipeo.write(data) self._pipeo.write(data)
if flush: if flush:
self._pipeo.flush() self._pipeo.flush()
self._readerr() self._readerr()
def instance(ui, path, create): def instance(ui, path, create):
"""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'))
return sshpeer(ui, path, create=create) return sshpeer(ui, path, create=create)