| durin42 |
| hg-reviewers |
These aren't part of the protocol interface. So they should be
_ prefixed.
| Lint Skipped |
| Unit Tests Skipped |
| break | break | ||||
| chunks.append(pycompat.bytesurl(v)) | chunks.append(pycompat.bytesurl(v)) | ||||
| i += 1 | i += 1 | ||||
| return ''.join(chunks) | return ''.join(chunks) | ||||
| class webproto(abstractserverproto): | class webproto(abstractserverproto): | ||||
| def __init__(self, req, ui): | def __init__(self, req, ui): | ||||
| self.req = req | self._req = req | ||||
| self.ui = ui | self._ui = ui | ||||
| self.name = 'http' | self.name = 'http' | ||||
| def getargs(self, args): | def getargs(self, args): | ||||
| knownargs = self._args() | knownargs = self._args() | ||||
| data = {} | data = {} | ||||
| keys = args.split() | keys = args.split() | ||||
| for k in keys: | for k in keys: | ||||
| if k == '*': | if k == '*': | ||||
| star = {} | star = {} | ||||
| for key in knownargs.keys(): | for key in knownargs.keys(): | ||||
| if key != 'cmd' and key not in keys: | if key != 'cmd' and key not in keys: | ||||
| star[key] = knownargs[key][0] | star[key] = knownargs[key][0] | ||||
| data['*'] = star | data['*'] = star | ||||
| else: | else: | ||||
| data[k] = knownargs[k][0] | data[k] = knownargs[k][0] | ||||
| return [data[k] for k in keys] | return [data[k] for k in keys] | ||||
| def _args(self): | def _args(self): | ||||
| args = self.req.form.copy() | args = self._req.form.copy() | ||||
| if pycompat.ispy3: | if pycompat.ispy3: | ||||
| args = {k.encode('ascii'): [v.encode('ascii') for v in vs] | args = {k.encode('ascii'): [v.encode('ascii') for v in vs] | ||||
| for k, vs in args.items()} | for k, vs in args.items()} | ||||
| postlen = int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) | postlen = int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0)) | ||||
| if postlen: | if postlen: | ||||
| args.update(cgi.parse_qs( | args.update(cgi.parse_qs( | ||||
| self.req.read(postlen), keep_blank_values=True)) | self._req.read(postlen), keep_blank_values=True)) | ||||
| return args | return args | ||||
| argvalue = decodevaluefromheaders(self.req, r'X-HgArg') | argvalue = decodevaluefromheaders(self._req, r'X-HgArg') | ||||
| args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) | args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) | ||||
| return args | return args | ||||
| def getfile(self, fp): | def getfile(self, fp): | ||||
| length = int(self.req.env[r'CONTENT_LENGTH']) | length = int(self._req.env[r'CONTENT_LENGTH']) | ||||
| # If httppostargs is used, we need to read Content-Length | # If httppostargs is used, we need to read Content-Length | ||||
| # minus the amount that was consumed by args. | # minus the amount that was consumed by args. | ||||
| length -= int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) | length -= int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0)) | ||||
| for s in util.filechunkiter(self.req, limit=length): | for s in util.filechunkiter(self._req, limit=length): | ||||
| fp.write(s) | fp.write(s) | ||||
| def redirect(self): | def redirect(self): | ||||
| self.oldio = self.ui.fout, self.ui.ferr | self._oldio = self._ui.fout, self._ui.ferr | ||||
| self.ui.ferr = self.ui.fout = stringio() | self._ui.ferr = self._ui.fout = stringio() | ||||
| def restore(self): | def restore(self): | ||||
| val = self.ui.fout.getvalue() | val = self._ui.fout.getvalue() | ||||
| self.ui.ferr, self.ui.fout = self.oldio | self._ui.ferr, self._ui.fout = self._oldio | ||||
| return val | return val | ||||
| def _client(self): | def _client(self): | ||||
| return 'remote:%s:%s:%s' % ( | return 'remote:%s:%s:%s' % ( | ||||
| self.req.env.get('wsgi.url_scheme') or 'http', | self._req.env.get('wsgi.url_scheme') or 'http', | ||||
| urlreq.quote(self.req.env.get('REMOTE_HOST', '')), | urlreq.quote(self._req.env.get('REMOTE_HOST', '')), | ||||
| urlreq.quote(self.req.env.get('REMOTE_USER', ''))) | urlreq.quote(self._req.env.get('REMOTE_USER', ''))) | ||||
| def responsetype(self, prefer_uncompressed): | def responsetype(self, prefer_uncompressed): | ||||
| """Determine the appropriate response type and compression settings. | """Determine the appropriate response type and compression settings. | ||||
| Returns a tuple of (mediatype, compengine, engineopts). | Returns a tuple of (mediatype, compengine, engineopts). | ||||
| """ | """ | ||||
| # Determine the response media type and compression engine based | # Determine the response media type and compression engine based | ||||
| # on the request parameters. | # on the request parameters. | ||||
| protocaps = decodevaluefromheaders(self.req, r'X-HgProto').split(' ') | protocaps = decodevaluefromheaders(self._req, r'X-HgProto').split(' ') | ||||
| if '0.2' in protocaps: | if '0.2' in protocaps: | ||||
| # All clients are expected to support uncompressed data. | # All clients are expected to support uncompressed data. | ||||
| if prefer_uncompressed: | if prefer_uncompressed: | ||||
| return HGTYPE2, util._noopengine(), {} | return HGTYPE2, util._noopengine(), {} | ||||
| # Default as defined by wire protocol spec. | # Default as defined by wire protocol spec. | ||||
| compformats = ['zlib', 'none'] | compformats = ['zlib', 'none'] | ||||
| for cap in protocaps: | for cap in protocaps: | ||||
| if cap.startswith('comp='): | if cap.startswith('comp='): | ||||
| compformats = cap[5:].split(',') | compformats = cap[5:].split(',') | ||||
| break | break | ||||
| # Now find an agreed upon compression format. | # Now find an agreed upon compression format. | ||||
| for engine in wireproto.supportedcompengines(self.ui, self, | for engine in wireproto.supportedcompengines(self._ui, self, | ||||
| util.SERVERROLE): | util.SERVERROLE): | ||||
| if engine.wireprotosupport().name in compformats: | if engine.wireprotosupport().name in compformats: | ||||
| opts = {} | opts = {} | ||||
| level = self.ui.configint('server', | level = self._ui.configint('server', | ||||
| '%slevel' % engine.name()) | '%slevel' % engine.name()) | ||||
| if level is not None: | if level is not None: | ||||
| opts['level'] = level | opts['level'] = level | ||||
| return HGTYPE2, engine, opts | return HGTYPE2, engine, opts | ||||
| # No mutually supported compression format. Fall back to the | # No mutually supported compression format. Fall back to the | ||||
| # legacy protocol. | # legacy protocol. | ||||
| # Don't allow untrusted settings because disabling compression or | # Don't allow untrusted settings because disabling compression or | ||||
| # setting a very high compression level could lead to flooding | # setting a very high compression level could lead to flooding | ||||
| # the server's network or CPU. | # the server's network or CPU. | ||||
| opts = {'level': self.ui.configint('server', 'zliblevel')} | opts = {'level': self._ui.configint('server', 'zliblevel')} | ||||
| return HGTYPE, util.compengines['zlib'], opts | return HGTYPE, util.compengines['zlib'], opts | ||||
| def iscmd(cmd): | def iscmd(cmd): | ||||
| return cmd in wireproto.commands | return cmd in wireproto.commands | ||||
| def callhttp(repo, req, cmd): | def callhttp(repo, req, cmd): | ||||
| proto = webproto(req, repo.ui) | proto = webproto(req, repo.ui) | ||||