mercurial-scm/hg: mercurial/wireprotoserver.py annotate

annotate mercurial/wireprotoserver.py @ 36813:5a3c83412f79

wireprotoserver: remove broken optimization for non-httplib client There was an experimental non-httplib client in core for several years. It was removed a week or so ago. We kept the optimization for this client in the server code. I'm not sure if that was intended or not. But it doesn't matter: the code was wrong. Because the code was accessing a WSGI environment dict, it needed to access the HTTP_X_HGHTTP2 key to actually read the HTTP header. So the code deleted by this commit wasn't actually doing anything meaningful. Doh. Differential Revision: https://phab.mercurial-scm.org/D2741

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 08 Mar 2018 16:43:32 -0800
parents	158d4ecc03c8
children	14f70c44af6c

rev	line source
5598 d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	2 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	3 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8109 diff changeset	4 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9713 diff changeset	5 # GNU General Public License version 2 or any later version.
5598 d534ba1c4eb4 separate the wire protocol commands from the user interface commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	6
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	7 from __future__ import absolute_import
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	8
36066 2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	9 import contextlib
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	10 import struct
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	11 import sys
36523 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	12 import threading
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	13
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	14 from .i18n import _
35856 ef3a24a023ec wireprotoserver: rename hgweb.protocol to wireprotoserver (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35750 diff changeset	15 from . import (
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	16 encoding,
34509 e21f274cccea hgweb: in protocol adapter, avoid control reaching end of non-void function Augie Fackler <augie@google.com> parents: 33821 diff changeset	17 error,
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	18 hook,
34742 5a9cad0dfddb hgweb: when unpacking args from request form, convert to bytes Augie Fackler <augie@google.com> parents: 34740 diff changeset	19 pycompat,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	20 util,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	21 wireproto,
36073 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36072 diff changeset	22 wireprototypes,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	23 )
35856 ef3a24a023ec wireprotoserver: rename hgweb.protocol to wireprotoserver (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35750 diff changeset	24
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28530 diff changeset	25 stringio = util.stringio
5963 5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5915 diff changeset	26
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	27 urlerr = util.urlerr
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	28 urlreq = util.urlreq
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	29
35858 1b76a9e0a9de wireprotoserver: don't import symbol from hgweb.common Gregory Szorc <gregory.szorc@gmail.com> parents: 35857 diff changeset	30 HTTP_OK = 200
1b76a9e0a9de wireprotoserver: don't import symbol from hgweb.common Gregory Szorc <gregory.szorc@gmail.com> parents: 35857 diff changeset	31
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	32 HGTYPE = 'application/mercurial-0.1'
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	33 HGTYPE2 = 'application/mercurial-0.2'
15017 f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14614 diff changeset	34 HGERRTYPE = 'application/hg-error'
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	35
36536 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36526 diff changeset	36 SSHV1 = wireprototypes.SSHV1
3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36526 diff changeset	37 SSHV2 = wireprototypes.SSHV2
35976 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35900 diff changeset	38
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	39 def decodevaluefromheaders(wsgireq, headerprefix):
34744 0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	40 """Decode a long value from multiple HTTP request headers.
0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	41
0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	42 Returns the value as a bytes, not a str.
0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	43 """
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	44 chunks = []
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	45 i = 1
34744 0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	46 prefix = headerprefix.upper().replace(r'-', r'_')
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	47 while True:
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	48 v = wsgireq.env.get(r'HTTP_%s_%d' % (prefix, i))
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	49 if v is None:
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	50 break
34744 0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	51 chunks.append(pycompat.bytesurl(v))
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	52 i += 1
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	53
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	54 return ''.join(chunks)
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	55
36371 0c231df1ffdc wireprototypes: move baseprotocolhandler from wireprotoserver Gregory Szorc <gregory.szorc@gmail.com> parents: 36280 diff changeset	56 class httpv1protocolhandler(wireprototypes.baseprotocolhandler):
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	57 def __init__(self, wsgireq, ui, checkperm):
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	58 self._wsgireq = wsgireq
35866 d747cf39cf70 wireprotoserver: make attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35865 diff changeset	59 self._ui = ui
36801 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	60 self._checkperm = checkperm
35873 29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35872 diff changeset	61
29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35872 diff changeset	62 @property
29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35872 diff changeset	63 def name(self):
36223 2e07dc514073 wireprotoserver: add version to HTTP protocol name (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36222 diff changeset	64 return 'http-v1'
30562 b3a9ef3d30e8 protocol: declare transport protocol name Gregory Szorc <gregory.szorc@gmail.com> parents: 30466 diff changeset	65
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	66 def getargs(self, args):
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	67 knownargs = self._args()
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	68 data = {}
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	69 keys = args.split()
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	70 for k in keys:
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	71 if k == '*':
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	72 star = {}
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	73 for key in knownargs.keys():
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 12704 diff changeset	74 if key != 'cmd' and key not in keys:
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	75 star[key] = knownargs[key][0]
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	76 data['*'] = star
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	77 else:
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	78 data[k] = knownargs[k][0]
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	79 return [data[k] for k in keys]
35863 49426bb4476c wireprotoserver: add some blank lines between methods Gregory Szorc <gregory.szorc@gmail.com> parents: 35860 diff changeset	80
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	81 def _args(self):
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	82 args = util.rapply(pycompat.bytesurl, self._wsgireq.form.copy())
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	83 postlen = int(self._wsgireq.env.get(r'HTTP_X_HGARGS_POST', 0))
28530 fd2acc5046f6 http: support sending hgargs via POST body instead of in GET or headers Augie Fackler <augie@google.com> parents: 27046 diff changeset	84 if postlen:
36077 a3d42d1865f1 wireprotoserver: define and use parse_qs from urllib Gregory Szorc <gregory.szorc@gmail.com> parents: 36075 diff changeset	85 args.update(urlreq.parseqs(
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	86 self._wsgireq.read(postlen), keep_blank_values=True))
28530 fd2acc5046f6 http: support sending hgargs via POST body instead of in GET or headers Augie Fackler <augie@google.com> parents: 27046 diff changeset	87 return args
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30562 diff changeset	88
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	89 argvalue = decodevaluefromheaders(self._wsgireq, r'X-HgArg')
36077 a3d42d1865f1 wireprotoserver: define and use parse_qs from urllib Gregory Szorc <gregory.szorc@gmail.com> parents: 36075 diff changeset	90 args.update(urlreq.parseqs(argvalue, keep_blank_values=True))
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	91 return args
35863 49426bb4476c wireprotoserver: add some blank lines between methods Gregory Szorc <gregory.szorc@gmail.com> parents: 35860 diff changeset	92
36070 90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36069 diff changeset	93 def forwardpayload(self, fp):
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	94 if r'HTTP_CONTENT_LENGTH' in self._wsgireq.env:
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	95 length = int(self._wsgireq.env[r'HTTP_CONTENT_LENGTH'])
36280 685bcdd236b5 wireprotoserver: py3 helpfully calls adds HTTP_ to CONTENT_LENGTH Augie Fackler <augie@google.com> parents: 36258 diff changeset	96 else:
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	97 length = int(self._wsgireq.env[r'CONTENT_LENGTH'])
33821 3c91cc0c5fde httppeer: add support for httppostargs when we're sending a file Augie Fackler <augie@google.com> parents: 33228 diff changeset	98 # If httppostargs is used, we need to read Content-Length
3c91cc0c5fde httppeer: add support for httppostargs when we're sending a file Augie Fackler <augie@google.com> parents: 33228 diff changeset	99 # minus the amount that was consumed by args.
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	100 length -= int(self._wsgireq.env.get(r'HTTP_X_HGARGS_POST', 0))
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	101 for s in util.filechunkiter(self._wsgireq, limit=length):
11621 e46a8b2331a6 protocol: shuffle server methods to group send methods Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11618 diff changeset	102 fp.write(s)
35863 49426bb4476c wireprotoserver: add some blank lines between methods Gregory Szorc <gregory.szorc@gmail.com> parents: 35860 diff changeset	103
36066 2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	104 @contextlib.contextmanager
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	105 def mayberedirectstdio(self):
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	106 oldout = self._ui.fout
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	107 olderr = self._ui.ferr
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	108
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	109 out = util.stringio()
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	110
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	111 try:
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	112 self._ui.fout = out
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	113 self._ui.ferr = out
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	114 yield out
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	115 finally:
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	116 self._ui.fout = oldout
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	117 self._ui.ferr = olderr
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	118
36069 957e773614d0 wireprotoserver: rename _client to client (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36068 diff changeset	119 def client(self):
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	120 return 'remote:%s:%s:%s' % (
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	121 self._wsgireq.env.get('wsgi.url_scheme') or 'http',
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	122 urlreq.quote(self._wsgireq.env.get('REMOTE_HOST', '')),
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	123 urlreq.quote(self._wsgireq.env.get('REMOTE_USER', '')))
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	124
36613 6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	125 def addcapabilities(self, repo, caps):
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	126 caps.append('httpheader=%d' %
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	127 repo.ui.configint('server', 'maxhttpheaderlen'))
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	128 if repo.ui.configbool('experimental', 'httppostargs'):
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	129 caps.append('httppostargs')
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	130
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	131 # FUTURE advertise 0.2rx once support is implemented
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	132 # FUTURE advertise minrx and mintx after consulting config option
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	133 caps.append('httpmediatype=0.1rx,0.1tx,0.2tx')
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	134
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	135 compengines = wireproto.supportedcompengines(repo.ui, util.SERVERROLE)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	136 if compengines:
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	137 comptypes = ','.join(urlreq.quote(e.wireprotosupport().name)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	138 for e in compengines)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	139 caps.append('compression=%s' % comptypes)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	140
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	141 return caps
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	142
36801 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	143 def checkperm(self, perm):
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	144 return self._checkperm(perm)
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	145
36231 72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36223 diff changeset	146 # This method exists mostly so that extensions like remotefilelog can
72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36223 diff changeset	147 # disable a kludgey legacy method only over http. As of early 2018,
72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36223 diff changeset	148 # there are no other known users, so with any luck we can discard this
72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36223 diff changeset	149 # hook if remotefilelog becomes a first-party extension.
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	150 def iscmd(cmd):
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	151 return cmd in wireproto.commands
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	152
36812 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	153 def handlewsgirequest(rctx, wsgireq, req, checkperm):
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	154 """Possibly process a wire protocol request.
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	155
36812 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	156 If the current request is a wire protocol request, the request is
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	157 processed by this function.
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	158
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	159 ``wsgireq`` is a ``wsgirequest`` instance.
36810 886fba199022 hgweb: only recognize wire protocol commands from query string (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 36804 diff changeset	160 ``req`` is a ``parsedrequest`` instance.
36812 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	161
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	162 Returns a 2-tuple of (bool, response) where the 1st element indicates
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	163 whether the request was handled and the 2nd element is a return
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	164 value for a WSGI application (often a generator of bytes).
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	165 """
36812 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	166 # Avoid cycle involving hg module.
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	167 from .hgweb import common as hgwebcommon
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	168
36801 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	169 repo = rctx.repo
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	170
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	171 # HTTP version 1 wire protocol requests are denoted by a "cmd" query
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	172 # string parameter. If it isn't present, this isn't a wire protocol
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	173 # request.
36810 886fba199022 hgweb: only recognize wire protocol commands from query string (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 36804 diff changeset	174 if 'cmd' not in req.querystringdict:
36812 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	175 return False, None
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	176
36810 886fba199022 hgweb: only recognize wire protocol commands from query string (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 36804 diff changeset	177 cmd = req.querystringdict['cmd'][0]
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	178
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	179 # The "cmd" request parameter is used by both the wire protocol and hgweb.
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	180 # While not all wire protocol commands are available for all transports,
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	181 # if we see a "cmd" value that resembles a known wire protocol command, we
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	182 # route it to a protocol handler. This is better than routing possible
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	183 # wire protocol requests to hgweb because it prevents hgweb from using
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	184 # known wire protocol commands and it is less confusing for machine
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	185 # clients.
36231 72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36223 diff changeset	186 if not iscmd(cmd):
36812 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	187 return False, None
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	188
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	189 # The "cmd" query string argument is only valid on the root path of the
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	190 # repo. e.g. ``/?cmd=foo``, ``/repo?cmd=foo``. URL paths within the repo
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	191 # like ``/blah?cmd=foo`` are not allowed. So don't recognize the request
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	192 # in this case. We send an HTTP 404 for backwards compatibility reasons.
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	193 if req.dispatchpath:
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	194 res = _handlehttperror(
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	195 hgwebcommon.ErrorResponse(hgwebcommon.HTTP_NOT_FOUND), wsgireq,
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	196 cmd)
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	197
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	198 return True, res
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	199
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	200 proto = httpv1protocolhandler(wsgireq, repo.ui,
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	201 lambda perm: checkperm(rctx, wsgireq, perm))
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	202
36812 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	203 # The permissions checker should be the only thing that can raise an
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	204 # ErrorResponse. It is kind of a layer violation to catch an hgweb
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	205 # exception here. So consider refactoring into a exception type that
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	206 # is associated with the wire protocol.
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	207 try:
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	208 res = _callhttp(repo, wsgireq, proto, cmd)
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	209 except hgwebcommon.ErrorResponse as e:
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	210 res = _handlehttperror(e, wsgireq, cmd)
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	211
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36810 diff changeset	212 return True, res
35984 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	213
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	214 def _httpresponsetype(ui, wsgireq, prefer_uncompressed):
36072 341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	215 """Determine the appropriate response type and compression settings.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	216
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	217 Returns a tuple of (mediatype, compengine, engineopts).
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	218 """
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	219 # Determine the response media type and compression engine based
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	220 # on the request parameters.
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	221 protocaps = decodevaluefromheaders(wsgireq, r'X-HgProto').split(' ')
36072 341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	222
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	223 if '0.2' in protocaps:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	224 # All clients are expected to support uncompressed data.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	225 if prefer_uncompressed:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	226 return HGTYPE2, util._noopengine(), {}
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	227
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	228 # Default as defined by wire protocol spec.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	229 compformats = ['zlib', 'none']
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	230 for cap in protocaps:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	231 if cap.startswith('comp='):
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	232 compformats = cap[5:].split(',')
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	233 break
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	234
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	235 # Now find an agreed upon compression format.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	236 for engine in wireproto.supportedcompengines(ui, util.SERVERROLE):
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	237 if engine.wireprotosupport().name in compformats:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	238 opts = {}
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	239 level = ui.configint('server', '%slevel' % engine.name())
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	240 if level is not None:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	241 opts['level'] = level
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	242
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	243 return HGTYPE2, engine, opts
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	244
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	245 # No mutually supported compression format. Fall back to the
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	246 # legacy protocol.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	247
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	248 # Don't allow untrusted settings because disabling compression or
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	249 # setting a very high compression level could lead to flooding
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	250 # the server's network or CPU.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	251 opts = {'level': ui.configint('server', 'zliblevel')}
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	252 return HGTYPE, util.compengines['zlib'], opts
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	253
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	254 def _callhttp(repo, wsgireq, proto, cmd):
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	255 def genversion2(gen, engine, engineopts):
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	256 # application/mercurial-0.2 always sends a payload header
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	257 # identifying the compression engine.
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	258 name = engine.wireprotosupport().name
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	259 assert 0 < len(name) < 256
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	260 yield struct.pack('B', len(name))
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	261 yield name
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	262
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	263 for chunk in gen:
a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	264 yield chunk
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	265
35982 5a56bf4180ad wireproto: function for testing if wire protocol command is available Gregory Szorc <gregory.szorc@gmail.com> parents: 35976 diff changeset	266 if not wireproto.commands.commandavailable(cmd, proto):
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	267 wsgireq.respond(HTTP_OK, HGERRTYPE,
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	268 body=_('requested wire protocol command is not '
b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	269 'available over HTTP'))
35982 5a56bf4180ad wireproto: function for testing if wire protocol command is available Gregory Szorc <gregory.szorc@gmail.com> parents: 35976 diff changeset	270 return []
5a56bf4180ad wireproto: function for testing if wire protocol command is available Gregory Szorc <gregory.szorc@gmail.com> parents: 35976 diff changeset	271
36801 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	272 proto.checkperm(wireproto.commands[cmd].permission)
36799 c638a13093cf wireprotoserver: check permissions in main dispatch function Gregory Szorc <gregory.szorc@gmail.com> parents: 36798 diff changeset	273
36798 7574c8173d5e wireprotoserver: check if command available before calling it Gregory Szorc <gregory.szorc@gmail.com> parents: 36760 diff changeset	274 rsp = wireproto.dispatch(repo, proto, cmd)
7574c8173d5e wireprotoserver: check if command available before calling it Gregory Szorc <gregory.szorc@gmail.com> parents: 36760 diff changeset	275
34510 c23fa3103925 hgweb: in protocol adapter, look for bytes instances, not str Augie Fackler <augie@google.com> parents: 34509 diff changeset	276 if isinstance(rsp, bytes):
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	277 wsgireq.respond(HTTP_OK, HGTYPE, body=rsp)
18352 e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18346 diff changeset	278 return []
36074 2f7290555c96 wireproto: introduce type for raw byte responses (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36073 diff changeset	279 elif isinstance(rsp, wireprototypes.bytesresponse):
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	280 wsgireq.respond(HTTP_OK, HGTYPE, body=rsp.data)
36074 2f7290555c96 wireproto: introduce type for raw byte responses (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36073 diff changeset	281 return []
36073 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36072 diff changeset	282 elif isinstance(rsp, wireprototypes.streamreslegacy):
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	283 gen = rsp.gen
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	284 wsgireq.respond(HTTP_OK, HGTYPE)
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	285 return gen
36073 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36072 diff changeset	286 elif isinstance(rsp, wireprototypes.streamres):
35705 8cdb671dbd0b wireproto: drop support for reader interface from streamres (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 34744 diff changeset	287 gen = rsp.gen
30466 2add671bf55b wireproto: perform chunking and compression at protocol layer (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30366 diff changeset	288
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	289 # This code for compression should not be streamres specific. It
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	290 # is here because we only compress streamres at the moment.
36072 341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36071 diff changeset	291 mediatype, engine, engineopts = _httpresponsetype(
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	292 repo.ui, wsgireq, rsp.prefer_uncompressed)
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	293 gen = engine.compressstream(gen, engineopts)
30466 2add671bf55b wireproto: perform chunking and compression at protocol layer (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30366 diff changeset	294
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	295 if mediatype == HGTYPE2:
a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	296 gen = genversion2(gen, engine, engineopts)
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	297
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	298 wsgireq.respond(HTTP_OK, mediatype)
30466 2add671bf55b wireproto: perform chunking and compression at protocol layer (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30366 diff changeset	299 return gen
36073 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36072 diff changeset	300 elif isinstance(rsp, wireprototypes.pushres):
36067 caca3ac2ac04 wireproto: use maybecapturestdio() for push responses (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36066 diff changeset	301 rsp = '%d\n%s' % (rsp.res, rsp.output)
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	302 wsgireq.respond(HTTP_OK, HGTYPE, body=rsp)
18352 e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18346 diff changeset	303 return []
36073 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36072 diff changeset	304 elif isinstance(rsp, wireprototypes.pusherr):
35987 6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	305 # This is the httplib workaround documented in _handlehttperror().
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	306 wsgireq.drain()
35987 6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	307
12703 40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11626 diff changeset	308 rsp = '0\n%s\n' % rsp.res
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	309 wsgireq.respond(HTTP_OK, HGTYPE, body=rsp)
18352 e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18346 diff changeset	310 return []
36073 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36072 diff changeset	311 elif isinstance(rsp, wireprototypes.ooberror):
15017 f4522df38c65 wireproto: add out-of-band error class to allow remote repo to report errors Andrew Pritchard <andrewp@fogcreek.com> parents: 14614 diff changeset	312 rsp = rsp.message
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	313 wsgireq.respond(HTTP_OK, HGERRTYPE, body=rsp)
18352 e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18346 diff changeset	314 return []
34509 e21f274cccea hgweb: in protocol adapter, avoid control reaching end of non-void function Augie Fackler <augie@google.com> parents: 33821 diff changeset	315 raise error.ProgrammingError('hgweb.protocol internal failure', rsp)
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	316
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	317 def _handlehttperror(e, wsgireq, cmd):
35986 98a00aa0288d wireprotoserver: move error response handling out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35984 diff changeset	318 """Called when an ErrorResponse is raised during HTTP request processing."""
35987 6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	319
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	320 # Clients using Python's httplib are stateful: the HTTP client
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	321 # won't process an HTTP response until all request data is
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	322 # sent to the server. The intent of this code is to ensure
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	323 # we always read HTTP request data from the client, thus
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	324 # ensuring httplib transitions to a state that allows it to read
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	325 # the HTTP response. In other words, it helps prevent deadlocks
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	326 # on clients using httplib.
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	327
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	328 if (wsgireq.env[r'REQUEST_METHOD'] == r'POST' and
35987 6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	329 # But not if Expect: 100-continue is being used.
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	330 (wsgireq.env.get('HTTP_EXPECT',
36813 5a3c83412f79 wireprotoserver: remove broken optimization for non-httplib client Gregory Szorc <gregory.szorc@gmail.com> parents: 36812 diff changeset	331 '').lower() != '100-continue')):
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	332 wsgireq.drain()
35986 98a00aa0288d wireprotoserver: move error response handling out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35984 diff changeset	333 else:
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	334 wsgireq.headers.append((r'Connection', r'Close'))
35986 98a00aa0288d wireprotoserver: move error response handling out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35984 diff changeset	335
35987 6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	336 # TODO This response body assumes the failed command was
6010fe1da619 wireprotoserver: document and improve the httplib workaround Gregory Szorc <gregory.szorc@gmail.com> parents: 35986 diff changeset	337 # "unbundle." That assumption is not always valid.
36804 b9b968e21f78 hgweb: rename req to wsgireq Gregory Szorc <gregory.szorc@gmail.com> parents: 36801 diff changeset	338 wsgireq.respond(e, HGTYPE, body='0\n%s\n' % pycompat.bytestr(e))
35986 98a00aa0288d wireprotoserver: move error response handling out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35984 diff changeset	339
98a00aa0288d wireprotoserver: move error response handling out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35984 diff changeset	340 return ''
98a00aa0288d wireprotoserver: move error response handling out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 35984 diff changeset	341
36064 5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	342 def _sshv1respondbytes(fout, value):
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	343 """Send a bytes response for protocol version 1."""
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	344 fout.write('%d\n' % len(value))
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	345 fout.write(value)
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	346 fout.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	347
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	348 def _sshv1respondstream(fout, source):
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	349 write = fout.write
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	350 for chunk in source.gen:
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	351 write(chunk)
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	352 fout.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	353
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	354 def _sshv1respondooberror(fout, ferr, rsp):
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	355 ferr.write(b'%s\n-\n' % rsp)
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	356 ferr.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	357 fout.write(b'\n')
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	358 fout.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 35988 diff changeset	359
36371 0c231df1ffdc wireprototypes: move baseprotocolhandler from wireprotoserver Gregory Szorc <gregory.szorc@gmail.com> parents: 36280 diff changeset	360 class sshv1protocolhandler(wireprototypes.baseprotocolhandler):
36065 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	361 """Handler for requests services via version 1 of SSH protocol."""
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	362 def __init__(self, ui, fin, fout):
35870 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	363 self._ui = ui
36065 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	364 self._fin = fin
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	365 self._fout = fout
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	366
35873 29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35872 diff changeset	367 @property
29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35872 diff changeset	368 def name(self):
36536 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36526 diff changeset	369 return wireprototypes.SSHV1
35873 29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35872 diff changeset	370
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	371 def getargs(self, args):
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	372 data = {}
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	373 keys = args.split()
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	374 for n in xrange(len(keys)):
35870 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	375 argline = self._fin.readline()[:-1]
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	376 arg, l = argline.split()
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	377 if arg not in keys:
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	378 raise error.Abort(_("unexpected parameter %r") % arg)
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	379 if arg == '*':
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	380 star = {}
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	381 for k in xrange(int(l)):
35870 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	382 argline = self._fin.readline()[:-1]
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	383 arg, l = argline.split()
35870 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	384 val = self._fin.read(int(l))
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	385 star[arg] = val
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	386 data['*'] = star
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	387 else:
35870 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	388 val = self._fin.read(int(l))
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	389 data[arg] = val
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	390 return [data[k] for k in keys]
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	391
36070 90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36069 diff changeset	392 def forwardpayload(self, fpout):
36372 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36371 diff changeset	393 # We initially send an empty response. This tells the client it is
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36371 diff changeset	394 # OK to start sending data. If a client sees any other response, it
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36371 diff changeset	395 # interprets it as an error.
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36371 diff changeset	396 _sshv1respondbytes(self._fout, b'')
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36371 diff changeset	397
36070 90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36069 diff changeset	398 # The file is in the form:
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36069 diff changeset	399 #
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36069 diff changeset	400 # <chunk size>\n<chunk>
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36069 diff changeset	401 # ...
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36069 diff changeset	402 # 0\n
35870 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	403 count = int(self._fin.readline())
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	404 while count:
35870 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	405 fpout.write(self._fin.read(count))
f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35869 diff changeset	406 count = int(self._fin.readline())
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	407
36066 2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	408 @contextlib.contextmanager
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	409 def mayberedirectstdio(self):
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	410 yield None
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36065 diff changeset	411
36069 957e773614d0 wireprotoserver: rename _client to client (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36068 diff changeset	412 def client(self):
36065 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	413 client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	414 return 'remote:ssh:' + client
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	415
36613 6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	416 def addcapabilities(self, repo, caps):
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	417 return caps
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36610 diff changeset	418
36801 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	419 def checkperm(self, perm):
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	420 pass
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36800 diff changeset	421
36215 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	422 class sshv2protocolhandler(sshv1protocolhandler):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	423 """Protocol handler for version 2 of the SSH protocol."""
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	424
36610 af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36536 diff changeset	425 @property
af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36536 diff changeset	426 def name(self):
af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36536 diff changeset	427 return wireprototypes.SSHV2
af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36536 diff changeset	428
36523 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	429 def _runsshserver(ui, repo, fin, fout, ev):
36215 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	430 # This function operates like a state machine of sorts. The following
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	431 # states are defined:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	432 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	433 # protov1-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	434 # Server is in protocol version 1 serving mode. Commands arrive on
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	435 # new lines. These commands are processed in this state, one command
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	436 # after the other.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	437 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	438 # protov2-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	439 # Server is in protocol version 2 serving mode.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	440 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	441 # upgrade-initial
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	442 # The server is going to process an upgrade request.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	443 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	444 # upgrade-v2-filter-legacy-handshake
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	445 # The protocol is being upgraded to version 2. The server is expecting
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	446 # the legacy handshake from version 1.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	447 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	448 # upgrade-v2-finish
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	449 # The upgrade to version 2 of the protocol is imminent.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	450 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	451 # shutdown
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	452 # The server is shutting down, possibly in reaction to a client event.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	453 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	454 # And here are their transitions:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	455 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	456 # protov1-serving -> shutdown
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	457 # When server receives an empty request or encounters another
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	458 # error.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	459 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	460 # protov1-serving -> upgrade-initial
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	461 # An upgrade request line was seen.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	462 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	463 # upgrade-initial -> upgrade-v2-filter-legacy-handshake
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	464 # Upgrade to version 2 in progress. Server is expecting to
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	465 # process a legacy handshake.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	466 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	467 # upgrade-v2-filter-legacy-handshake -> shutdown
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	468 # Client did not fulfill upgrade handshake requirements.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	469 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	470 # upgrade-v2-filter-legacy-handshake -> upgrade-v2-finish
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	471 # Client fulfilled version 2 upgrade requirements. Finishing that
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	472 # upgrade.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	473 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	474 # upgrade-v2-finish -> protov2-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	475 # Protocol upgrade to version 2 complete. Server can now speak protocol
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	476 # version 2.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	477 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	478 # protov2-serving -> protov1-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	479 # Ths happens by default since protocol version 2 is the same as
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	480 # version 1 except for the handshake.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	481
36214 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	482 state = 'protov1-serving'
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	483 proto = sshv1protocolhandler(ui, fin, fout)
36215 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	484 protoswitched = False
36214 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	485
36523 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	486 while not ev.is_set():
36214 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	487 if state == 'protov1-serving':
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	488 # Commands are issued on new lines.
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	489 request = fin.readline()[:-1]
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	490
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	491 # Empty lines signal to terminate the connection.
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	492 if not request:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	493 state = 'shutdown'
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	494 continue
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	495
36215 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	496 # It looks like a protocol upgrade request. Transition state to
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	497 # handle it.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	498 if request.startswith(b'upgrade '):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	499 if protoswitched:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	500 _sshv1respondooberror(fout, ui.ferr,
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	501 b'cannot upgrade protocols multiple '
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	502 b'times')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	503 state = 'shutdown'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	504 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	505
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	506 state = 'upgrade-initial'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	507 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	508
36214 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	509 available = wireproto.commands.commandavailable(request, proto)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	510
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	511 # This command isn't available. Send an empty response and go
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	512 # back to waiting for a new command.
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	513 if not available:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	514 _sshv1respondbytes(fout, b'')
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	515 continue
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	516
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	517 rsp = wireproto.dispatch(repo, proto, request)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	518
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	519 if isinstance(rsp, bytes):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	520 _sshv1respondbytes(fout, rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	521 elif isinstance(rsp, wireprototypes.bytesresponse):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	522 _sshv1respondbytes(fout, rsp.data)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	523 elif isinstance(rsp, wireprototypes.streamres):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	524 _sshv1respondstream(fout, rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	525 elif isinstance(rsp, wireprototypes.streamreslegacy):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	526 _sshv1respondstream(fout, rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	527 elif isinstance(rsp, wireprototypes.pushres):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	528 _sshv1respondbytes(fout, b'')
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	529 _sshv1respondbytes(fout, b'%d' % rsp.res)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	530 elif isinstance(rsp, wireprototypes.pusherr):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	531 _sshv1respondbytes(fout, rsp.res)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	532 elif isinstance(rsp, wireprototypes.ooberror):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	533 _sshv1respondooberror(fout, ui.ferr, rsp.message)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	534 else:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	535 raise error.ProgrammingError('unhandled response type from '
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	536 'wire protocol command: %s' % rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	537
36215 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	538 # For now, protocol version 2 serving just goes back to version 1.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	539 elif state == 'protov2-serving':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	540 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	541 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	542
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	543 elif state == 'upgrade-initial':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	544 # We should never transition into this state if we've switched
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	545 # protocols.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	546 assert not protoswitched
36536 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36526 diff changeset	547 assert proto.name == wireprototypes.SSHV1
36215 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	548
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	549 # Expected: upgrade <token> <capabilities>
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	550 # If we get something else, the request is malformed. It could be
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	551 # from a future client that has altered the upgrade line content.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	552 # We treat this as an unknown command.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	553 try:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	554 token, caps = request.split(b' ')[1:]
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	555 except ValueError:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	556 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	557 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	558 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	559
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	560 # Send empty response if we don't support upgrading protocols.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	561 if not ui.configbool('experimental', 'sshserver.support-v2'):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	562 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	563 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	564 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	565
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	566 try:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	567 caps = urlreq.parseqs(caps)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	568 except ValueError:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	569 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	570 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	571 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	572
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	573 # We don't see an upgrade request to protocol version 2. Ignore
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	574 # the upgrade request.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	575 wantedprotos = caps.get(b'proto', [b''])[0]
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	576 if SSHV2 not in wantedprotos:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	577 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	578 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	579 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	580
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	581 # It looks like we can honor this upgrade request to protocol 2.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	582 # Filter the rest of the handshake protocol request lines.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	583 state = 'upgrade-v2-filter-legacy-handshake'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	584 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	585
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	586 elif state == 'upgrade-v2-filter-legacy-handshake':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	587 # Client should have sent legacy handshake after an ``upgrade``
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	588 # request. Expected lines:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	589 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	590 # hello
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	591 # between
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	592 # pairs 81
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	593 # 0000...-0000...
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	594
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	595 ok = True
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	596 for line in (b'hello', b'between', b'pairs 81'):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	597 request = fin.readline()[:-1]
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	598
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	599 if request != line:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	600 _sshv1respondooberror(fout, ui.ferr,
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	601 b'malformed handshake protocol: '
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	602 b'missing %s' % line)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	603 ok = False
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	604 state = 'shutdown'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	605 break
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	606
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	607 if not ok:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	608 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	609
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	610 request = fin.read(81)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	611 if request != b'%s-%s' % (b'0' * 40, b'0' * 40):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	612 _sshv1respondooberror(fout, ui.ferr,
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	613 b'malformed handshake protocol: '
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	614 b'missing between argument value')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	615 state = 'shutdown'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	616 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	617
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	618 state = 'upgrade-v2-finish'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	619 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	620
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	621 elif state == 'upgrade-v2-finish':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	622 # Send the upgrade response.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	623 fout.write(b'upgraded %s %s\n' % (token, SSHV2))
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	624 servercaps = wireproto.capabilities(repo, proto)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	625 rsp = b'capabilities: %s' % servercaps.data
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	626 fout.write(b'%d\n%s\n' % (len(rsp), rsp))
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	627 fout.flush()
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	628
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	629 proto = sshv2protocolhandler(ui, fin, fout)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	630 protoswitched = True
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	631
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	632 state = 'protov2-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	633 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36214 diff changeset	634
36214 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	635 elif state == 'shutdown':
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	636 break
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	637
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	638 else:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	639 raise error.ProgrammingError('unhandled ssh server state: %s' %
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	640 state)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36213 diff changeset	641
36065 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	642 class sshserver(object):
36526 7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	643 def __init__(self, ui, repo, logfh=None):
36065 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	644 self._ui = ui
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	645 self._repo = repo
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	646 self._fin = ui.fin
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	647 self._fout = ui.fout
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	648
36526 7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	649 # Log write I/O to stdout and stderr if configured.
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	650 if logfh:
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	651 self._fout = util.makeloggingfileobject(
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	652 logfh, self._fout, 'o', logdata=True)
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	653 ui.ferr = util.makeloggingfileobject(
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	654 logfh, ui.ferr, 'e', logdata=True)
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36523 diff changeset	655
36065 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	656 hook.redirect(True)
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	657 ui.fout = repo.ui.fout = ui.ferr
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	658
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	659 # Prevent insertion/deletion of CRs
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	660 util.setbinary(self._fin)
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	661 util.setbinary(self._fout)
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36064 diff changeset	662
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	663 def serve_forever(self):
36523 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	664 self.serveuntil(threading.Event())
35859 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35858 diff changeset	665 sys.exit(0)
36523 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	666
e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	667 def serveuntil(self, ev):
e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	668 """Serve until a threading.Event is set."""
e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36372 diff changeset	669 _runsshserver(self._ui, self._repo, self._fin, self._fout, ev)

Mercurial > public > mercurial-scm > hg

annotate mercurial/wireprotoserver.py @ 36813:5a3c83412f79