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

annotate mercurial/wireprotoserver.py @ 37545:93397c4633f6

wireproto: extract HTTP version 2 code to own module wireprotoserver has generic and version 1 server code. The wireproto module also has both version 1 and version 2 command implementations. Upcoming work I want to do will make it difficult for this code to live in the current locations. Plus, it kind of makes sense for the version 2 code to live in an isolated module. This commit copies the HTTPv2 bits from wireprotoserver into a new module. We do it as a file copy to preserve history. A future commit will be copying wire protocol commands into this module as well. But there is little history of that code, so it makes sense to take history for wireprotoserver. Differential Revision: https://phab.mercurial-scm.org/D3230

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 09 Apr 2018 19:35:04 -0700
parents	69e46c1834ac
children	734515aca84d

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
36104 2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 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
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	11 import sys
36552 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	12 import threading
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	13
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	14 from .i18n import _
37296 78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	15 from .thirdparty.zope import (
78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	16 interface as zi,
78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	17 )
35896 ef3a24a023ec wireprotoserver: rename hgweb.protocol to wireprotoserver (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35750 diff changeset	18 from . import (
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	19 encoding,
34509 e21f274cccea hgweb: in protocol adapter, avoid control reaching end of non-void function Augie Fackler <augie@google.com> parents: 33842 diff changeset	20 error,
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	21 hook,
34742 5a9cad0dfddb hgweb: when unpacking args from request form, convert to bytes Augie Fackler <augie@google.com> parents: 34740 diff changeset	22 pycompat,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	23 util,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	24 wireproto,
36111 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36110 diff changeset	25 wireprototypes,
37545 93397c4633f6 wireproto: extract HTTP version 2 code to own module Gregory Szorc <gregory.szorc@gmail.com> parents: 37535 diff changeset	26 wireprotov2server,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 20903 diff changeset	27 )
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	28 from .utils import (
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	29 procutil,
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	30 )
35896 ef3a24a023ec wireprotoserver: rename hgweb.protocol to wireprotoserver (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35750 diff changeset	31
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28530 diff changeset	32 stringio = util.stringio
5963 5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5915 diff changeset	33
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	34 urlerr = util.urlerr
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	35 urlreq = util.urlreq
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	36
35898 1b76a9e0a9de wireprotoserver: don't import symbol from hgweb.common Gregory Szorc <gregory.szorc@gmail.com> parents: 35897 diff changeset	37 HTTP_OK = 200
1b76a9e0a9de wireprotoserver: don't import symbol from hgweb.common Gregory Szorc <gregory.szorc@gmail.com> parents: 35897 diff changeset	38
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	39 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	40 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	41 HGERRTYPE = 'application/hg-error'
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	42
36565 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36555 diff changeset	43 SSHV1 = wireprototypes.SSHV1
3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36555 diff changeset	44 SSHV2 = wireprototypes.SSHV2
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35940 diff changeset	45
36852 14f70c44af6c wireprotoserver: access headers through parsed request Gregory Szorc <gregory.szorc@gmail.com> parents: 36821 diff changeset	46 def decodevaluefromheaders(req, headerprefix):
34744 0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	47 """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	48
0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	49 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	50 """
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	51 chunks = []
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	52 i = 1
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	53 while True:
36852 14f70c44af6c wireprotoserver: access headers through parsed request Gregory Szorc <gregory.szorc@gmail.com> parents: 36821 diff changeset	54 v = req.headers.get(b'%s-%d' % (headerprefix, i))
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	55 if v is None:
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	56 break
34744 0a2ef612ad50 hgweb: fix decodevaluefromheaders to always return a bytes value Augie Fackler <augie@google.com> parents: 34743 diff changeset	57 chunks.append(pycompat.bytesurl(v))
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	58 i += 1
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	59
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	60 return ''.join(chunks)
3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	61
37296 78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	62 @zi.implementer(wireprototypes.baseprotocolhandler)
78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	63 class httpv1protocolhandler(object):
36873 a755fd3b7146 hgweb: expose URL scheme and REMOTE_* attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 36868 diff changeset	64 def __init__(self, req, ui, checkperm):
36852 14f70c44af6c wireprotoserver: access headers through parsed request Gregory Szorc <gregory.szorc@gmail.com> parents: 36821 diff changeset	65 self._req = req
35906 d747cf39cf70 wireprotoserver: make attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35905 diff changeset	66 self._ui = ui
36809 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	67 self._checkperm = checkperm
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	68 self._protocaps = None
35913 29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35912 diff changeset	69
29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35912 diff changeset	70 @property
29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35912 diff changeset	71 def name(self):
36261 2e07dc514073 wireprotoserver: add version to HTTP protocol name (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36260 diff changeset	72 return 'http-v1'
30567 b3a9ef3d30e8 protocol: declare transport protocol name Gregory Szorc <gregory.szorc@gmail.com> parents: 30475 diff changeset	73
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	74 def getargs(self, args):
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	75 knownargs = self._args()
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	76 data = {}
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	77 keys = args.split()
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	78 for k in keys:
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	79 if k == '*':
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	80 star = {}
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	81 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	82 if key != 'cmd' and key not in keys:
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	83 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	84 data['*'] = star
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	85 else:
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	86 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	87 return [data[k] for k in keys]
35903 49426bb4476c wireprotoserver: add some blank lines between methods Gregory Szorc <gregory.szorc@gmail.com> parents: 35900 diff changeset	88
14093 ce99d887585f httprepo: long arguments support (issue2126) Steven Brown <StevenGBrown@gmail.com> parents: 13721 diff changeset	89 def _args(self):
36868 ec0af9c59270 hgweb: use a multidict for holding query string parameters Gregory Szorc <gregory.szorc@gmail.com> parents: 36867 diff changeset	90 args = self._req.qsparams.asdictoflists()
36852 14f70c44af6c wireprotoserver: access headers through parsed request Gregory Szorc <gregory.szorc@gmail.com> parents: 36821 diff changeset	91 postlen = int(self._req.headers.get(b'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	92 if postlen:
36115 a3d42d1865f1 wireprotoserver: define and use parse_qs from urllib Gregory Szorc <gregory.szorc@gmail.com> parents: 36113 diff changeset	93 args.update(urlreq.parseqs(
36863 da4e2f87167d hgweb: expose input stream on parsed WSGI request object Gregory Szorc <gregory.szorc@gmail.com> parents: 36861 diff changeset	94 self._req.bodyfh.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	95 return args
30759 3f5f0c98cd18 httppeer: extract code for HTTP header spanning Gregory Szorc <gregory.szorc@gmail.com> parents: 30567 diff changeset	96
36852 14f70c44af6c wireprotoserver: access headers through parsed request Gregory Szorc <gregory.szorc@gmail.com> parents: 36821 diff changeset	97 argvalue = decodevaluefromheaders(self._req, b'X-HgArg')
36115 a3d42d1865f1 wireprotoserver: define and use parse_qs from urllib Gregory Szorc <gregory.szorc@gmail.com> parents: 36113 diff changeset	98 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	99 return args
35903 49426bb4476c wireprotoserver: add some blank lines between methods Gregory Szorc <gregory.szorc@gmail.com> parents: 35900 diff changeset	100
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	101 def getprotocaps(self):
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	102 if self._protocaps is None:
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	103 value = decodevaluefromheaders(self._req, r'X-HgProto')
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	104 self._protocaps = set(value.split(' '))
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	105 return self._protocaps
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	106
37414 2d965bfeb8f6 wireproto: allow direct stream processing for unbundle Joerg Sonnenberger <joerg@bec.de> parents: 37393 diff changeset	107 def getpayload(self):
36853 ed0456fde625 hgweb: handle CONTENT_LENGTH Gregory Szorc <gregory.szorc@gmail.com> parents: 36852 diff changeset	108 # Existing clients always send Content-Length.
ed0456fde625 hgweb: handle CONTENT_LENGTH Gregory Szorc <gregory.szorc@gmail.com> parents: 36852 diff changeset	109 length = int(self._req.headers[b'Content-Length'])
ed0456fde625 hgweb: handle CONTENT_LENGTH Gregory Szorc <gregory.szorc@gmail.com> parents: 36852 diff changeset	110
33842 3c91cc0c5fde httppeer: add support for httppostargs when we're sending a file Augie Fackler <augie@google.com> parents: 33228 diff changeset	111 # 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	112 # minus the amount that was consumed by args.
36852 14f70c44af6c wireprotoserver: access headers through parsed request Gregory Szorc <gregory.szorc@gmail.com> parents: 36821 diff changeset	113 length -= int(self._req.headers.get(b'X-HgArgs-Post', 0))
37414 2d965bfeb8f6 wireproto: allow direct stream processing for unbundle Joerg Sonnenberger <joerg@bec.de> parents: 37393 diff changeset	114 return util.filechunkiter(self._req.bodyfh, limit=length)
35903 49426bb4476c wireprotoserver: add some blank lines between methods Gregory Szorc <gregory.szorc@gmail.com> parents: 35900 diff changeset	115
36104 2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	116 @contextlib.contextmanager
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	117 def mayberedirectstdio(self):
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	118 oldout = self._ui.fout
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	119 olderr = self._ui.ferr
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	120
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	121 out = util.stringio()
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	122
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	123 try:
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	124 self._ui.fout = out
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	125 self._ui.ferr = out
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	126 yield out
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	127 finally:
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	128 self._ui.fout = oldout
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	129 self._ui.ferr = olderr
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	130
36107 957e773614d0 wireprotoserver: rename _client to client (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36106 diff changeset	131 def client(self):
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	132 return 'remote:%s:%s:%s' % (
36873 a755fd3b7146 hgweb: expose URL scheme and REMOTE_* attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 36868 diff changeset	133 self._req.urlscheme,
a755fd3b7146 hgweb: expose URL scheme and REMOTE_* attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 36868 diff changeset	134 urlreq.quote(self._req.remotehost or ''),
a755fd3b7146 hgweb: expose URL scheme and REMOTE_* attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 36868 diff changeset	135 urlreq.quote(self._req.remoteuser or ''))
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	136
36642 6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	137 def addcapabilities(self, repo, caps):
37056 cd0ca979a8b8 wireproto: nominally don't expose "batch" to version 2 wire transports Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	138 caps.append(b'batch')
cd0ca979a8b8 wireproto: nominally don't expose "batch" to version 2 wire transports Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	139
36642 6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	140 caps.append('httpheader=%d' %
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	141 repo.ui.configint('server', 'maxhttpheaderlen'))
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	142 if repo.ui.configbool('experimental', 'httppostargs'):
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	143 caps.append('httppostargs')
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	144
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	145 # FUTURE advertise 0.2rx once support is implemented
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	146 # 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: 36639 diff changeset	147 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: 36639 diff changeset	148
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	149 compengines = wireproto.supportedcompengines(repo.ui, util.SERVERROLE)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	150 if compengines:
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	151 comptypes = ','.join(urlreq.quote(e.wireprotosupport().name)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	152 for e in compengines)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	153 caps.append('compression=%s' % comptypes)
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	154
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	155 return caps
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	156
36809 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	157 def checkperm(self, perm):
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	158 return self._checkperm(perm)
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	159
36269 72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36261 diff changeset	160 # This method exists mostly so that extensions like remotefilelog can
72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36261 diff changeset	161 # 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: 36261 diff changeset	162 # 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: 36261 diff changeset	163 # 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	164 def iscmd(cmd):
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	165 return cmd in wireproto.commands
368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11594 diff changeset	166
36883 02bea04b4c54 hgweb: transition permissions hooks to modern request type (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36873 diff changeset	167 def handlewsgirequest(rctx, req, res, checkperm):
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	168 """Possibly process a wire protocol request.
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	169
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	170 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: 36818 diff changeset	171 processed by this function.
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	172
36818 886fba199022 hgweb: only recognize wire protocol commands from query string (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 36812 diff changeset	173 ``req`` is a ``parsedrequest`` instance.
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	174 ``res`` is a ``wsgiresponse`` instance.
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	175
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	176 Returns a bool indicating if the request was serviced. If set, the caller
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	177 should stop processing the request, as a response has already been issued.
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	178 """
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	179 # Avoid cycle involving hg module.
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	180 from .hgweb import common as hgwebcommon
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	181
36809 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	182 repo = rctx.repo
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	183
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	184 # 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: 36021 diff changeset	185 # 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: 36021 diff changeset	186 # request.
36868 ec0af9c59270 hgweb: use a multidict for holding query string parameters Gregory Szorc <gregory.szorc@gmail.com> parents: 36867 diff changeset	187 if 'cmd' not in req.qsparams:
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	188 return False
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	189
36868 ec0af9c59270 hgweb: use a multidict for holding query string parameters Gregory Szorc <gregory.szorc@gmail.com> parents: 36867 diff changeset	190 cmd = req.qsparams['cmd']
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	191
cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	192 # 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: 36021 diff changeset	193 # 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: 36021 diff changeset	194 # 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: 36021 diff changeset	195 # 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: 36021 diff changeset	196 # 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: 36021 diff changeset	197 # 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: 36021 diff changeset	198 # clients.
36269 72812ad205d1 wireprotoserver: return to using iscmd() method Augie Fackler <augie@google.com> parents: 36261 diff changeset	199 if not iscmd(cmd):
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	200 return False
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	201
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	202 # 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: 36818 diff changeset	203 # 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: 36818 diff changeset	204 # 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: 36818 diff changeset	205 # 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: 36818 diff changeset	206 if req.dispatchpath:
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	207 res.status = hgwebcommon.statusmessage(404)
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	208 res.headers['Content-Type'] = HGTYPE
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	209 # TODO This is not a good response to issue for this request. This
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	210 # is mostly for BC for now.
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	211 res.setbodybytes('0\n%s\n' % b'Not Found')
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	212 return True
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	213
36873 a755fd3b7146 hgweb: expose URL scheme and REMOTE_* attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 36868 diff changeset	214 proto = httpv1protocolhandler(req, repo.ui,
36883 02bea04b4c54 hgweb: transition permissions hooks to modern request type (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36873 diff changeset	215 lambda perm: checkperm(rctx, req, perm))
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	216
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	217 # 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: 36818 diff changeset	218 # 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: 36818 diff changeset	219 # 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: 36818 diff changeset	220 # is associated with the wire protocol.
158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	221 try:
36873 a755fd3b7146 hgweb: expose URL scheme and REMOTE_* attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 36868 diff changeset	222 _callhttp(repo, req, res, proto, cmd)
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	223 except hgwebcommon.ErrorResponse as e:
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	224 for k, v in e.headers:
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	225 res.headers[k] = v
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	226 res.status = hgwebcommon.statusmessage(e.code, pycompat.bytestr(e))
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	227 # TODO This response body assumes the failed command was
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	228 # "unbundle." That assumption is not always valid.
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	229 res.setbodybytes('0\n%s\n' % pycompat.bytestr(e))
36820 158d4ecc03c8 wireprotoserver: move all wire protocol handling logic out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36818 diff changeset	230
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	231 return True
36023 cdc93fe1da77 wireprotoserver: move protocol parsing and dispatch out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36021 diff changeset	232
37049 1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	233 def handlewsgiapirequest(rctx, req, res, checkperm):
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	234 """Handle requests to /api/*."""
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	235 assert req.dispatchparts[0] == b'api'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	236
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	237 repo = rctx.repo
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	238
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	239 # This whole URL space is experimental for now. But we want to
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	240 # reserve the URL space. So, 404 all URLs if the feature isn't enabled.
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	241 if not repo.ui.configbool('experimental', 'web.apiserver'):
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	242 res.status = b'404 Not Found'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	243 res.headers[b'Content-Type'] = b'text/plain'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	244 res.setbodybytes(_('Experimental API server endpoint not enabled'))
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	245 return
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	246
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	247 # The URL space is /api/<protocol>/*. The structure of URLs under varies
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	248 # by <protocol>.
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	249
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	250 # Registered APIs are made available via config options of the name of
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	251 # the protocol.
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	252 availableapis = set()
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	253 for k, v in API_HANDLERS.items():
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	254 section, option = v['config']
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	255 if repo.ui.configbool(section, option):
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	256 availableapis.add(k)
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	257
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	258 # Requests to /api/ list available APIs.
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	259 if req.dispatchparts == [b'api']:
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	260 res.status = b'200 OK'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	261 res.headers[b'Content-Type'] = b'text/plain'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	262 lines = [_('APIs can be accessed at /api/<name>, where <name> can be '
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	263 'one of the following:\n')]
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	264 if availableapis:
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	265 lines.extend(sorted(availableapis))
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	266 else:
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	267 lines.append(_('(no available APIs)\n'))
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	268 res.setbodybytes(b'\n'.join(lines))
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	269 return
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	270
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	271 proto = req.dispatchparts[1]
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	272
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	273 if proto not in API_HANDLERS:
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	274 res.status = b'404 Not Found'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	275 res.headers[b'Content-Type'] = b'text/plain'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	276 res.setbodybytes(_('Unknown API: %s\nKnown APIs: %s') % (
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	277 proto, b', '.join(sorted(availableapis))))
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	278 return
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	279
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	280 if proto not in availableapis:
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	281 res.status = b'404 Not Found'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	282 res.headers[b'Content-Type'] = b'text/plain'
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	283 res.setbodybytes(_('API %s not enabled\n') % proto)
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	284 return
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	285
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	286 API_HANDLERS[proto]['handler'](rctx, req, res, checkperm,
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	287 req.dispatchparts[2:])
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	288
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	289 # Maps API name to metadata so custom API can be registered.
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	290 API_HANDLERS = {
37545 93397c4633f6 wireproto: extract HTTP version 2 code to own module Gregory Szorc <gregory.szorc@gmail.com> parents: 37535 diff changeset	291 wireprotov2server.HTTPV2: {
37049 1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	292 'config': ('experimental', 'web.api.http-v2'),
37545 93397c4633f6 wireproto: extract HTTP version 2 code to own module Gregory Szorc <gregory.szorc@gmail.com> parents: 37535 diff changeset	293 'handler': wireprotov2server.handlehttpv2request,
37049 1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	294 },
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	295 }
1cfef5693203 wireproto: support /api/* URL space for exposing APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 36883 diff changeset	296
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	297 def _httpresponsetype(ui, proto, prefer_uncompressed):
36110 341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	298 """Determine the appropriate response type and compression settings.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	299
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	300 Returns a tuple of (mediatype, compengine, engineopts).
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	301 """
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	302 # Determine the response media type and compression engine based
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	303 # on the request parameters.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	304
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	305 if '0.2' in proto.getprotocaps():
36110 341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	306 # All clients are expected to support uncompressed data.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	307 if prefer_uncompressed:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	308 return HGTYPE2, util._noopengine(), {}
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	309
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	310 # Now find an agreed upon compression format.
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	311 compformats = wireproto.clientcompressionsupport(proto)
36110 341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	312 for engine in wireproto.supportedcompengines(ui, util.SERVERROLE):
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	313 if engine.wireprotosupport().name in compformats:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	314 opts = {}
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	315 level = ui.configint('server', '%slevel' % engine.name())
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	316 if level is not None:
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	317 opts['level'] = level
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	318
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	319 return HGTYPE2, engine, opts
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	320
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	321 # No mutually supported compression format. Fall back to the
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	322 # legacy protocol.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	323
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	324 # Don't allow untrusted settings because disabling compression or
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	325 # 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: 36109 diff changeset	326 # the server's network or CPU.
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	327 opts = {'level': ui.configint('server', 'zliblevel')}
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	328 return HGTYPE, util.compengines['zlib'], opts
341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	329
36873 a755fd3b7146 hgweb: expose URL scheme and REMOTE_* attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 36868 diff changeset	330 def _callhttp(repo, req, res, proto, cmd):
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	331 # Avoid cycle involving hg module.
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	332 from .hgweb import common as hgwebcommon
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	333
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	334 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	335 # 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	336 # 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	337 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	338 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	339 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	340 yield name
e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	341
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	342 for chunk in gen:
a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	343 yield chunk
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	344
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	345 def setresponse(code, contenttype, bodybytes=None, bodygen=None):
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	346 if code == HTTP_OK:
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	347 res.status = '200 Script output follows'
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	348 else:
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	349 res.status = hgwebcommon.statusmessage(code)
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	350
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	351 res.headers['Content-Type'] = contenttype
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	352
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	353 if bodybytes is not None:
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	354 res.setbodybytes(bodybytes)
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	355 if bodygen is not None:
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	356 res.setbodygen(bodygen)
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	357
36021 5a56bf4180ad wireproto: function for testing if wire protocol command is available Gregory Szorc <gregory.szorc@gmail.com> parents: 36015 diff changeset	358 if not wireproto.commands.commandavailable(cmd, proto):
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	359 setresponse(HTTP_OK, HGERRTYPE,
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	360 _('requested wire protocol command is not available over '
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	361 'HTTP'))
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	362 return
36021 5a56bf4180ad wireproto: function for testing if wire protocol command is available Gregory Szorc <gregory.szorc@gmail.com> parents: 36015 diff changeset	363
36809 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	364 proto.checkperm(wireproto.commands[cmd].permission)
36807 c638a13093cf wireprotoserver: check permissions in main dispatch function Gregory Szorc <gregory.szorc@gmail.com> parents: 36806 diff changeset	365
36806 7574c8173d5e wireprotoserver: check if command available before calling it Gregory Szorc <gregory.szorc@gmail.com> parents: 36768 diff changeset	366 rsp = wireproto.dispatch(repo, proto, cmd)
7574c8173d5e wireprotoserver: check if command available before calling it Gregory Szorc <gregory.szorc@gmail.com> parents: 36768 diff changeset	367
34510 c23fa3103925 hgweb: in protocol adapter, look for bytes instances, not str Augie Fackler <augie@google.com> parents: 34509 diff changeset	368 if isinstance(rsp, bytes):
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	369 setresponse(HTTP_OK, HGTYPE, bodybytes=rsp)
36112 2f7290555c96 wireproto: introduce type for raw byte responses (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36111 diff changeset	370 elif isinstance(rsp, wireprototypes.bytesresponse):
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	371 setresponse(HTTP_OK, HGTYPE, bodybytes=rsp.data)
36111 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36110 diff changeset	372 elif isinstance(rsp, wireprototypes.streamreslegacy):
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	373 setresponse(HTTP_OK, HGTYPE, bodygen=rsp.gen)
36111 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36110 diff changeset	374 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	375 gen = rsp.gen
30475 2add671bf55b wireproto: perform chunking and compression at protocol layer (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30376 diff changeset	376
30764 e75463e3179f protocol: send application/mercurial-0.2 responses to capable clients Gregory Szorc <gregory.szorc@gmail.com> parents: 30759 diff changeset	377 # 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	378 # is here because we only compress streamres at the moment.
36110 341c886e411e wireprotoserver: move responsetype() out of http handler Gregory Szorc <gregory.szorc@gmail.com> parents: 36109 diff changeset	379 mediatype, engine, engineopts = _httpresponsetype(
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	380 repo.ui, proto, rsp.prefer_uncompressed)
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	381 gen = engine.compressstream(gen, engineopts)
30475 2add671bf55b wireproto: perform chunking and compression at protocol layer (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30376 diff changeset	382
35750 a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	383 if mediatype == HGTYPE2:
a39a9df7ecca wireproto: split streamres into legacy and modern case Joerg Sonnenberger <joerg@bec.de> parents: 35705 diff changeset	384 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	385
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	386 setresponse(HTTP_OK, mediatype, bodygen=gen)
36111 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36110 diff changeset	387 elif isinstance(rsp, wireprototypes.pushres):
36105 caca3ac2ac04 wireproto: use maybecapturestdio() for push responses (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36104 diff changeset	388 rsp = '%d\n%s' % (rsp.res, rsp.output)
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	389 setresponse(HTTP_OK, HGTYPE, bodybytes=rsp)
36111 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36110 diff changeset	390 elif isinstance(rsp, wireprototypes.pusherr):
12703 40bb5853fc4b wireproto: introduce pusherr() to deal with "unsynced changes" error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11626 diff changeset	391 rsp = '0\n%s\n' % rsp.res
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	392 res.drain = True
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	393 setresponse(HTTP_OK, HGTYPE, bodybytes=rsp)
36111 cd6ab329c5c7 wireprototypes: move wire protocol response types to new module Gregory Szorc <gregory.szorc@gmail.com> parents: 36110 diff changeset	394 elif isinstance(rsp, wireprototypes.ooberror):
36867 a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	395 setresponse(HTTP_OK, HGERRTYPE, bodybytes=rsp.message)
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	396 else:
a88d68dc3ee8 hgweb: create dedicated type for WSGI responses Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	397 raise error.ProgrammingError('hgweb.protocol internal failure', rsp)
36025 98a00aa0288d wireprotoserver: move error response handling out of hgweb Gregory Szorc <gregory.szorc@gmail.com> parents: 36023 diff changeset	398
36102 5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	399 def _sshv1respondbytes(fout, value):
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	400 """Send a bytes response for protocol version 1."""
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	401 fout.write('%d\n' % len(value))
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	402 fout.write(value)
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	403 fout.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	404
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	405 def _sshv1respondstream(fout, source):
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	406 write = fout.write
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	407 for chunk in source.gen:
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	408 write(chunk)
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	409 fout.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	410
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	411 def _sshv1respondooberror(fout, ferr, rsp):
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	412 ferr.write(b'%s\n-\n' % rsp)
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	413 ferr.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	414 fout.write(b'\n')
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	415 fout.flush()
5767664d39a5 wireprotoserver: extract SSH response handling functions Gregory Szorc <gregory.szorc@gmail.com> parents: 36027 diff changeset	416
37296 78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	417 @zi.implementer(wireprototypes.baseprotocolhandler)
78103e4138b1 wireproto: port protocol handler to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37295 diff changeset	418 class sshv1protocolhandler(object):
36103 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	419 """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: 36102 diff changeset	420 def __init__(self, ui, fin, fout):
35910 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35909 diff changeset	421 self._ui = ui
36103 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	422 self._fin = fin
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	423 self._fout = fout
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	424 self._protocaps = set()
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	425
35913 29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35912 diff changeset	426 @property
29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35912 diff changeset	427 def name(self):
36565 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36555 diff changeset	428 return wireprototypes.SSHV1
35913 29759c46aa1a wireprotoserver: make name part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35912 diff changeset	429
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	430 def getargs(self, args):
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	431 data = {}
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	432 keys = args.split()
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	433 for n in xrange(len(keys)):
35910 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35909 diff changeset	434 argline = self._fin.readline()[:-1]
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	435 arg, l = argline.split()
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	436 if arg not in keys:
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	437 raise error.Abort(_("unexpected parameter %r") % arg)
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	438 if arg == '*':
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	439 star = {}
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	440 for k in xrange(int(l)):
35910 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35909 diff changeset	441 argline = self._fin.readline()[:-1]
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	442 arg, l = argline.split()
35910 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35909 diff changeset	443 val = self._fin.read(int(l))
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	444 star[arg] = val
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	445 data['*'] = star
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	446 else:
35910 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35909 diff changeset	447 val = self._fin.read(int(l))
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	448 data[arg] = val
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	449 return [data[k] for k in keys]
1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	450
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	451 def getprotocaps(self):
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	452 return self._protocaps
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	453
37414 2d965bfeb8f6 wireproto: allow direct stream processing for unbundle Joerg Sonnenberger <joerg@bec.de> parents: 37393 diff changeset	454 def getpayload(self):
36403 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36402 diff changeset	455 # 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: 36402 diff changeset	456 # 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: 36402 diff changeset	457 # interprets it as an error.
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36402 diff changeset	458 _sshv1respondbytes(self._fout, b'')
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36402 diff changeset	459
36108 90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36107 diff changeset	460 # The file is in the form:
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36107 diff changeset	461 #
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36107 diff changeset	462 # <chunk size>\n<chunk>
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36107 diff changeset	463 # ...
90ca4986616c wireprotoserver: rename getfile() to forwardpayload() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36107 diff changeset	464 # 0\n
35910 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35909 diff changeset	465 count = int(self._fin.readline())
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	466 while count:
37414 2d965bfeb8f6 wireproto: allow direct stream processing for unbundle Joerg Sonnenberger <joerg@bec.de> parents: 37393 diff changeset	467 yield self._fin.read(count)
35910 f1efc0caeab7 wireprotoserver: make some instance attributes private Gregory Szorc <gregory.szorc@gmail.com> parents: 35909 diff changeset	468 count = int(self._fin.readline())
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	469
36104 2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	470 @contextlib.contextmanager
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	471 def mayberedirectstdio(self):
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	472 yield None
2ad145fbde54 wireprotoserver: add context manager mechanism for redirecting stdio Gregory Szorc <gregory.szorc@gmail.com> parents: 36103 diff changeset	473
36107 957e773614d0 wireprotoserver: rename _client to client (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36106 diff changeset	474 def client(self):
36103 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	475 client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	476 return 'remote:ssh:' + client
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	477
36642 6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	478 def addcapabilities(self, repo, caps):
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	479 if self.name == wireprototypes.SSHV1:
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37296 diff changeset	480 caps.append(b'protocaps')
37056 cd0ca979a8b8 wireproto: nominally don't expose "batch" to version 2 wire transports Gregory Szorc <gregory.szorc@gmail.com> parents: 37055 diff changeset	481 caps.append(b'batch')
36642 6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	482 return caps
6e585bca962e wireproto: add transport specific capabilities in the transport Gregory Szorc <gregory.szorc@gmail.com> parents: 36639 diff changeset	483
36809 66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	484 def checkperm(self, perm):
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	485 pass
66de4555cefd wireproto: formalize permissions checking as part of protocol interface Gregory Szorc <gregory.szorc@gmail.com> parents: 36808 diff changeset	486
36253 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	487 class sshv2protocolhandler(sshv1protocolhandler):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	488 """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: 36252 diff changeset	489
36639 af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	490 @property
af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	491 def name(self):
af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	492 return wireprototypes.SSHV2
af0d38f015bb wireprotoserver: identify requests via version 2 of SSH protocol as such Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	493
37533 df4985497986 wireproto: implement capabilities for wire protocol v2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37485 diff changeset	494 def addcapabilities(self, repo, caps):
df4985497986 wireproto: implement capabilities for wire protocol v2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37485 diff changeset	495 return caps
df4985497986 wireproto: implement capabilities for wire protocol v2 Gregory Szorc <gregory.szorc@gmail.com> parents: 37485 diff changeset	496
36552 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	497 def _runsshserver(ui, repo, fin, fout, ev):
36253 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	498 # 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: 36252 diff changeset	499 # states are defined:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	500 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	501 # protov1-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	502 # 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: 36252 diff changeset	503 # 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: 36252 diff changeset	504 # after the other.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	505 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	506 # protov2-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	507 # Server is in protocol version 2 serving mode.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	508 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	509 # upgrade-initial
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	510 # 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: 36252 diff changeset	511 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	512 # upgrade-v2-filter-legacy-handshake
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	513 # 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: 36252 diff changeset	514 # the legacy handshake from version 1.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	515 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	516 # upgrade-v2-finish
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	517 # 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: 36252 diff changeset	518 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	519 # shutdown
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	520 # 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: 36252 diff changeset	521 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	522 # And here are their transitions:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	523 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	524 # protov1-serving -> shutdown
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	525 # 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: 36252 diff changeset	526 # error.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	527 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	528 # protov1-serving -> upgrade-initial
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	529 # An upgrade request line was seen.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	530 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	531 # upgrade-initial -> upgrade-v2-filter-legacy-handshake
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	532 # 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: 36252 diff changeset	533 # process a legacy handshake.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	534 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	535 # upgrade-v2-filter-legacy-handshake -> shutdown
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	536 # Client did not fulfill upgrade handshake requirements.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	537 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	538 # upgrade-v2-filter-legacy-handshake -> upgrade-v2-finish
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	539 # Client fulfilled version 2 upgrade requirements. Finishing that
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	540 # upgrade.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	541 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	542 # upgrade-v2-finish -> protov2-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	543 # 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: 36252 diff changeset	544 # version 2.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	545 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	546 # protov2-serving -> protov1-serving
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	547 # 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: 36252 diff changeset	548 # version 1 except for the handshake.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	549
36252 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	550 state = 'protov1-serving'
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	551 proto = sshv1protocolhandler(ui, fin, fout)
36253 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	552 protoswitched = False
36252 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	553
36552 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	554 while not ev.is_set():
36252 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	555 if state == 'protov1-serving':
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	556 # Commands are issued on new lines.
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	557 request = fin.readline()[:-1]
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	558
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	559 # Empty lines signal to terminate the connection.
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	560 if not request:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	561 state = 'shutdown'
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	562 continue
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	563
36253 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	564 # 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: 36252 diff changeset	565 # handle it.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	566 if request.startswith(b'upgrade '):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	567 if protoswitched:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	568 _sshv1respondooberror(fout, ui.ferr,
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	569 b'cannot upgrade protocols multiple '
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	570 b'times')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	571 state = 'shutdown'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	572 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	573
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	574 state = 'upgrade-initial'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	575 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	576
36252 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	577 available = wireproto.commands.commandavailable(request, proto)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	578
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	579 # 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: 36251 diff changeset	580 # back to waiting for a new command.
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	581 if not available:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	582 _sshv1respondbytes(fout, b'')
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	583 continue
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	584
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	585 rsp = wireproto.dispatch(repo, proto, request)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	586
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	587 if isinstance(rsp, bytes):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	588 _sshv1respondbytes(fout, rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	589 elif isinstance(rsp, wireprototypes.bytesresponse):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	590 _sshv1respondbytes(fout, rsp.data)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	591 elif isinstance(rsp, wireprototypes.streamres):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	592 _sshv1respondstream(fout, rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	593 elif isinstance(rsp, wireprototypes.streamreslegacy):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	594 _sshv1respondstream(fout, rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	595 elif isinstance(rsp, wireprototypes.pushres):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	596 _sshv1respondbytes(fout, b'')
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	597 _sshv1respondbytes(fout, b'%d' % rsp.res)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	598 elif isinstance(rsp, wireprototypes.pusherr):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	599 _sshv1respondbytes(fout, rsp.res)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	600 elif isinstance(rsp, wireprototypes.ooberror):
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	601 _sshv1respondooberror(fout, ui.ferr, rsp.message)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	602 else:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	603 raise error.ProgrammingError('unhandled response type from '
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	604 'wire protocol command: %s' % rsp)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	605
36253 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	606 # 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: 36252 diff changeset	607 elif state == 'protov2-serving':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	608 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	609 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	610
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	611 elif state == 'upgrade-initial':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	612 # 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: 36252 diff changeset	613 # protocols.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	614 assert not protoswitched
36565 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36555 diff changeset	615 assert proto.name == wireprototypes.SSHV1
36253 464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	616
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	617 # Expected: upgrade <token> <capabilities>
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	618 # 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: 36252 diff changeset	619 # 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: 36252 diff changeset	620 # We treat this as an unknown command.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	621 try:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	622 token, caps = request.split(b' ')[1:]
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	623 except ValueError:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	624 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	625 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	626 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	627
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	628 # 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: 36252 diff changeset	629 if not ui.configbool('experimental', 'sshserver.support-v2'):
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	630 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	631 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	632 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	633
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	634 try:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	635 caps = urlreq.parseqs(caps)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	636 except ValueError:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	637 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	638 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	639 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	640
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	641 # 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: 36252 diff changeset	642 # the upgrade request.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	643 wantedprotos = caps.get(b'proto', [b''])[0]
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	644 if SSHV2 not in wantedprotos:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	645 _sshv1respondbytes(fout, b'')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	646 state = 'protov1-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	647 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	648
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	649 # 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: 36252 diff changeset	650 # 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: 36252 diff changeset	651 state = 'upgrade-v2-filter-legacy-handshake'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	652 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	653
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	654 elif state == 'upgrade-v2-filter-legacy-handshake':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	655 # 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: 36252 diff changeset	656 # request. Expected lines:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	657 #
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	658 # hello
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	659 # between
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	660 # pairs 81
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	661 # 0000...-0000...
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	662
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	663 ok = True
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	664 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: 36252 diff changeset	665 request = fin.readline()[:-1]
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	666
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	667 if request != line:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	668 _sshv1respondooberror(fout, ui.ferr,
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	669 b'malformed handshake protocol: '
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	670 b'missing %s' % line)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	671 ok = False
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	672 state = 'shutdown'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	673 break
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	674
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	675 if not ok:
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	676 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	677
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	678 request = fin.read(81)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	679 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: 36252 diff changeset	680 _sshv1respondooberror(fout, ui.ferr,
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	681 b'malformed handshake protocol: '
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	682 b'missing between argument value')
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	683 state = 'shutdown'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	684 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	685
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	686 state = 'upgrade-v2-finish'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	687 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	688
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	689 elif state == 'upgrade-v2-finish':
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	690 # Send the upgrade response.
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	691 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: 36252 diff changeset	692 servercaps = wireproto.capabilities(repo, proto)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	693 rsp = b'capabilities: %s' % servercaps.data
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	694 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: 36252 diff changeset	695 fout.flush()
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	696
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	697 proto = sshv2protocolhandler(ui, fin, fout)
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	698 protoswitched = True
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	699
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	700 state = 'protov2-serving'
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	701 continue
464bedc0fdb4 wireprotoserver: handle SSH protocol version 2 upgrade requests Gregory Szorc <gregory.szorc@gmail.com> parents: 36252 diff changeset	702
36252 3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	703 elif state == 'shutdown':
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	704 break
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	705
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	706 else:
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	707 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: 36251 diff changeset	708 state)
3b3a987bbbaa wireprotoserver: move SSH server operation to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 36251 diff changeset	709
36103 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	710 class sshserver(object):
36555 7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36552 diff changeset	711 def __init__(self, ui, repo, logfh=None):
36103 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	712 self._ui = ui
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	713 self._repo = repo
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	714 self._fin = ui.fin
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	715 self._fout = ui.fout
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	716
36555 7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36552 diff changeset	717 # 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: 36552 diff changeset	718 if logfh:
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36552 diff changeset	719 self._fout = util.makeloggingfileobject(
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36552 diff changeset	720 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: 36552 diff changeset	721 ui.ferr = util.makeloggingfileobject(
7cc4a9b9732a wireprotoserver: support logging SSH server I/O to a file descriptor Gregory Szorc <gregory.szorc@gmail.com> parents: 36552 diff changeset	722 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: 36552 diff changeset	723
36103 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	724 hook.redirect(True)
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	725 ui.fout = repo.ui.fout = ui.ferr
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	726
bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	727 # Prevent insertion/deletion of CRs
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	728 procutil.setbinary(self._fin)
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	729 procutil.setbinary(self._fout)
36103 bf676267f64f wireprotoserver: split ssh protocol handler and server Gregory Szorc <gregory.szorc@gmail.com> parents: 36102 diff changeset	730
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	731 def serve_forever(self):
36552 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	732 self.serveuntil(threading.Event())
35899 1bf5263fe5cc wireprotoserver: move sshserver into module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35898 diff changeset	733 sys.exit(0)
36552 e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	734
e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	735 def serveuntil(self, ev):
e7411fb7ba7f wireprotoserver: ability to run an SSH server until an event is set Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	736 """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: 36403 diff changeset	737 _runsshserver(self._ui, self._repo, self._fin, self._fout, ev)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/wireprotoserver.py @ 37545:93397c4633f6