| durin42 |
| hg-reviewers |
We currently mutate wsgireq.form in a few places. Since it is
independent from req.qsparams, we will need to make changes on
req.qsparams as well before consumers can use qsparams. So let's
do that.
Eventually, we'll delete wsgireq.form and all references to it.
| 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 (10 lines) |
| style = cmd.rfind('-') | style = cmd.rfind('-') | ||||
| if style != -1: | if style != -1: | ||||
| req.qsparams['style'] = cmd[:style] | req.qsparams['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): | ||||
| wsgireq.form['cmd'] = [cmd] | wsgireq.form['cmd'] = [cmd] | ||||
| req.qsparams['cmd'] = cmd | |||||
| if cmd == 'static': | if cmd == 'static': | ||||
| wsgireq.form['file'] = ['/'.join(args)] | wsgireq.form['file'] = ['/'.join(args)] | ||||
| req.qsparams['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', '/') | ||||
| wsgireq.form['node'] = [node] | wsgireq.form['node'] = [node] | ||||
| req.qsparams['node'] = node | |||||
| if args: | if args: | ||||
| wsgireq.form['file'] = args | wsgireq.form['file'] = args | ||||
| if 'file' in req.qsparams: | |||||
| del req.qsparams['file'] | |||||
| for a in args: | |||||
| req.qsparams.add('file', a) | |||||
| ua = req.headers.get('User-Agent', '') | ua = req.headers.get('User-Agent', '') | ||||
| if cmd == 'rev' and 'mercurial' in ua: | if cmd == 'rev' and 'mercurial' in ua: | ||||
| req.qsparams['style'] = 'raw' | req.qsparams['style'] = 'raw' | ||||
| if cmd == 'archive': | if cmd == 'archive': | ||||
| fn = wsgireq.form['node'][0] | fn = wsgireq.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): | ||||
| wsgireq.form['node'] = [fn[:-len(ext)]] | wsgireq.form['node'] = [fn[:-len(ext)]] | ||||
| req.qsparams['node'] = fn[:-len(next)] | |||||
| wsgireq.form['type'] = [type_] | wsgireq.form['type'] = [type_] | ||||
| req.qsparams['type'] = type_ | |||||
| else: | else: | ||||
| cmd = wsgireq.form.get('cmd', [''])[0] | cmd = wsgireq.form.get('cmd', [''])[0] | ||||
| # process the web interface request | # process the web interface request | ||||
| try: | try: | ||||
| tmpl = rctx.templater(wsgireq, req) | tmpl = rctx.templater(wsgireq, 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, wsgireq, None) | self.check_perm(rctx, wsgireq, None) | ||||
| if cmd == '': | if cmd == '': | ||||
| wsgireq.form['cmd'] = [tmpl.cache['default']] | wsgireq.form['cmd'] = [tmpl.cache['default']] | ||||
| req.qsparams['cmd'] = tmpl.cache['default'] | |||||
| cmd = wsgireq.form['cmd'][0] | cmd = wsgireq.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, wsgireq) # sets ETag header or raises NOT_MODIFIED | caching(self, wsgireq) # 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 | ||||