| indygreg |
| hg-reviewers |
This is just going to be a lot cleaner for our internals.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgweb_mod.py (12 lines) | |||
| M | mercurial/hgweb/request.py (6 lines) | |||
| M | mercurial/wireprotoserver.py (4 lines) |
| except ErrorResponse as inst: | except ErrorResponse as inst: | ||||
| return protohandler['handleerror'](inst) | return protohandler['handleerror'](inst) | ||||
| return protohandler['dispatch']() | return protohandler['dispatch']() | ||||
| # translate user-visible url structure to internal structure | # translate user-visible url structure to internal structure | ||||
| args = query.split('/', 2) | args = query.split('/', 2) | ||||
| if r'cmd' not in req.form and args and args[0]: | if 'cmd' not in req.form and args and args[0]: | ||||
| cmd = args.pop(0) | cmd = args.pop(0) | ||||
| style = cmd.rfind('-') | style = cmd.rfind('-') | ||||
| if style != -1: | if style != -1: | ||||
| req.form['style'] = [cmd[:style]] | req.form['style'] = [cmd[:style]] | ||||
| cmd = cmd[style + 1:] | cmd = cmd[style + 1:] | ||||
| # avoid accepting e.g. style parameter as command | # avoid accepting e.g. style parameter as command | ||||
| if util.safehasattr(webcommands, cmd): | if util.safehasattr(webcommands, cmd): | ||||
| req.form[r'cmd'] = [cmd] | req.form['cmd'] = [cmd] | ||||
| if cmd == 'static': | if cmd == 'static': | ||||
| req.form['file'] = ['/'.join(args)] | req.form['file'] = ['/'.join(args)] | ||||
| else: | else: | ||||
| if args and args[0]: | if args and args[0]: | ||||
| node = args.pop(0).replace('%2F', '/') | node = args.pop(0).replace('%2F', '/') | ||||
| req.form['node'] = [node] | req.form['node'] = [node] | ||||
| if args: | if args: | ||||
| req.form['file'] = args | req.form['file'] = args | ||||
| ua = req.env.get('HTTP_USER_AGENT', '') | ua = req.env.get('HTTP_USER_AGENT', '') | ||||
| if cmd == 'rev' and 'mercurial' in ua: | if cmd == 'rev' and 'mercurial' in ua: | ||||
| req.form['style'] = ['raw'] | req.form['style'] = ['raw'] | ||||
| if cmd == 'archive': | if cmd == 'archive': | ||||
| fn = req.form['node'][0] | fn = req.form['node'][0] | ||||
| for type_, spec in rctx.archivespecs.iteritems(): | for type_, spec in rctx.archivespecs.iteritems(): | ||||
| ext = spec[2] | ext = spec[2] | ||||
| if fn.endswith(ext): | if fn.endswith(ext): | ||||
| req.form['node'] = [fn[:-len(ext)]] | req.form['node'] = [fn[:-len(ext)]] | ||||
| req.form['type'] = [type_] | req.form['type'] = [type_] | ||||
| else: | else: | ||||
| cmd = pycompat.sysbytes(req.form.get(r'cmd', [r''])[0]) | cmd = req.form.get('cmd', [''])[0] | ||||
| # process the web interface request | # process the web interface request | ||||
| try: | try: | ||||
| tmpl = rctx.templater(req) | tmpl = rctx.templater(req) | ||||
| ctype = tmpl('mimetype', encoding=encoding.encoding) | ctype = tmpl('mimetype', encoding=encoding.encoding) | ||||
| ctype = templater.stringify(ctype) | ctype = templater.stringify(ctype) | ||||
| # check read permissions non-static content | # check read permissions non-static content | ||||
| if cmd != 'static': | if cmd != 'static': | ||||
| self.check_perm(rctx, req, None) | self.check_perm(rctx, req, None) | ||||
| if cmd == '': | if cmd == '': | ||||
| req.form[r'cmd'] = [tmpl.cache['default']] | req.form['cmd'] = [tmpl.cache['default']] | ||||
| cmd = req.form[r'cmd'][0] | cmd = req.form['cmd'][0] | ||||
| # Don't enable caching if using a CSP nonce because then it wouldn't | # Don't enable caching if using a CSP nonce because then it wouldn't | ||||
| # be a nonce. | # be a nonce. | ||||
| if rctx.configbool('web', 'cache') and not rctx.nonce: | if rctx.configbool('web', 'cache') and not rctx.nonce: | ||||
| caching(self, req) # sets ETag header or raises NOT_MODIFIED | caching(self, req) # sets ETag header or raises NOT_MODIFIED | ||||
| if cmd not in webcommands.__all__: | if cmd not in webcommands.__all__: | ||||
| msg = 'no such method: %s' % cmd | msg = 'no such method: %s' % cmd | ||||
| raise ErrorResponse(HTTP_BAD_REQUEST, msg) | raise ErrorResponse(HTTP_BAD_REQUEST, msg) | ||||
| elif cmd == 'file' and r'raw' in req.form.get(r'style', []): | elif cmd == 'file' and 'raw' in req.form.get('style', []): | ||||
| rctx.ctype = ctype | rctx.ctype = ctype | ||||
| content = webcommands.rawfile(rctx, req, tmpl) | content = webcommands.rawfile(rctx, req, tmpl) | ||||
| else: | else: | ||||
| content = getattr(webcommands, cmd)(rctx, req, tmpl) | content = getattr(webcommands, cmd)(rctx, req, tmpl) | ||||
| req.respond(HTTP_OK, ctype) | req.respond(HTTP_OK, ctype) | ||||
| return content | return content | ||||
| for k in shortcuts: | for k in shortcuts: | ||||
| if k in form: | if k in form: | ||||
| for name, value in shortcuts[k]: | for name, value in shortcuts[k]: | ||||
| if value is None: | if value is None: | ||||
| value = form[k] | value = form[k] | ||||
| form[name] = value | form[name] = value | ||||
| del form[k] | del form[k] | ||||
| # And strip the values | # And strip the values | ||||
| bytesform = {} | |||||
| for k, v in form.iteritems(): | for k, v in form.iteritems(): | ||||
| form[k] = [i.strip() for i in v] | bytesform[pycompat.bytesurl(k)] = [ | ||||
| return form | pycompat.bytesurl(i.strip()) for i in v] | ||||
| return bytesform | |||||
| class wsgirequest(object): | class wsgirequest(object): | ||||
| """Higher-level API for a WSGI request. | """Higher-level API for a WSGI request. | ||||
| WSGI applications are invoked with 2 arguments. They are used to | WSGI applications are invoked with 2 arguments. They are used to | ||||
| instantiate instances of this class, which provides higher-level APIs | instantiate instances of this class, which provides higher-level APIs | ||||
| for obtaining request parameters, writing HTTP output, etc. | for obtaining request parameters, writing HTTP output, etc. | ||||
| """ | """ | ||||
| an ``abstractprotocolserver`` instance suitable for handling the | an ``abstractprotocolserver`` instance suitable for handling the | ||||
| request. Otherwise, ``None`` is returned. | request. Otherwise, ``None`` is returned. | ||||
| ``req`` is a ``wsgirequest`` instance. | ``req`` is a ``wsgirequest`` instance. | ||||
| """ | """ | ||||
| # HTTP version 1 wire protocol requests are denoted by a "cmd" query | # HTTP version 1 wire protocol requests are denoted by a "cmd" query | ||||
| # string parameter. If it isn't present, this isn't a wire protocol | # string parameter. If it isn't present, this isn't a wire protocol | ||||
| # request. | # request. | ||||
| if r'cmd' not in req.form: | if 'cmd' not in req.form: | ||||
| return None | return None | ||||
| cmd = pycompat.sysbytes(req.form[r'cmd'][0]) | cmd = req.form['cmd'][0] | ||||
| # The "cmd" request parameter is used by both the wire protocol and hgweb. | # The "cmd" request parameter is used by both the wire protocol and hgweb. | ||||
| # While not all wire protocol commands are available for all transports, | # While not all wire protocol commands are available for all transports, | ||||
| # if we see a "cmd" value that resembles a known wire protocol command, we | # if we see a "cmd" value that resembles a known wire protocol command, we | ||||
| # route it to a protocol handler. This is better than routing possible | # route it to a protocol handler. This is better than routing possible | ||||
| # wire protocol requests to hgweb because it prevents hgweb from using | # wire protocol requests to hgweb because it prevents hgweb from using | ||||
| # known wire protocol commands and it is less confusing for machine | # known wire protocol commands and it is less confusing for machine | ||||
| # clients. | # clients. | ||||