| durin42 |
| hg-reviewers |
We only had one consumer of this simple function. While it could be
a generic function, let's not over abstract the code.
As part of inlining, we port it off wsgirequest, fix some Python 3
issues, and set a response header on our new response object so it
is ready once we start using it to send responses.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/common.py (6 lines) | |||
| M | mercurial/hgweb/hgweb_mod.py (9 lines) |
| web.contact is the primary source, but if that is not set, try | web.contact is the primary source, but if that is not set, try | ||||
| ui.username or $EMAIL as a fallback to display something useful. | ui.username or $EMAIL as a fallback to display something useful. | ||||
| """ | """ | ||||
| return (config("web", "contact") or | return (config("web", "contact") or | ||||
| config("ui", "username") or | config("ui", "username") or | ||||
| encoding.environ.get("EMAIL") or "") | encoding.environ.get("EMAIL") or "") | ||||
| def caching(web, req): | |||||
| tag = r'W/"%d"' % web.mtime | |||||
| if req.env.get('HTTP_IF_NONE_MATCH') == tag: | |||||
| raise ErrorResponse(HTTP_NOT_MODIFIED) | |||||
| req.headers.append(('ETag', tag)) | |||||
| def cspvalues(ui): | def cspvalues(ui): | ||||
| """Obtain the Content-Security-Policy header and nonce value. | """Obtain the Content-Security-Policy header and nonce value. | ||||
| Returns a 2-tuple of the CSP header value and the nonce value. | Returns a 2-tuple of the CSP header value and the nonce value. | ||||
| First value is ``None`` if CSP isn't enabled. Second value is ``None`` | First value is ``None`` if CSP isn't enabled. Second value is ``None`` | ||||
| if CSP isn't enabled or if the CSP header doesn't need a nonce. | if CSP isn't enabled or if the CSP header doesn't need a nonce. | ||||
| """ | """ | ||||
| from .common import ( | from .common import ( | ||||
| ErrorResponse, | ErrorResponse, | ||||
| HTTP_BAD_REQUEST, | HTTP_BAD_REQUEST, | ||||
| HTTP_NOT_FOUND, | HTTP_NOT_FOUND, | ||||
| HTTP_NOT_MODIFIED, | HTTP_NOT_MODIFIED, | ||||
| HTTP_OK, | HTTP_OK, | ||||
| HTTP_SERVER_ERROR, | HTTP_SERVER_ERROR, | ||||
| caching, | |||||
| cspvalues, | cspvalues, | ||||
| permhooks, | permhooks, | ||||
| ) | ) | ||||
| from .. import ( | from .. import ( | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| formatter, | formatter, | ||||
| if cmd == '': | if cmd == '': | ||||
| req.qsparams['cmd'] = tmpl.cache['default'] | req.qsparams['cmd'] = tmpl.cache['default'] | ||||
| cmd = req.qsparams['cmd'] | cmd = req.qsparams['cmd'] | ||||
| # 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 | tag = 'W/"%d"' % self.mtime | ||||
| if req.headers.get('If-None-Match') == tag: | |||||
| raise ErrorResponse(HTTP_NOT_MODIFIED) | |||||
| wsgireq.headers.append((r'ETag', pycompat.sysstr(tag))) | |||||
| res.headers['ETag'] = tag | |||||
| 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 req.qsparams.get('style') == 'raw': | elif cmd == 'file' and req.qsparams.get('style') == 'raw': | ||||
| rctx.ctype = ctype | rctx.ctype = ctype | ||||
| content = webcommands.rawfile(rctx, wsgireq, tmpl) | content = webcommands.rawfile(rctx, wsgireq, tmpl) | ||||
| else: | else: | ||||
| content = getattr(webcommands, cmd)(rctx, wsgireq, tmpl) | content = getattr(webcommands, cmd)(rctx, wsgireq, tmpl) | ||||