Mercurial > public > mercurial-scm > hg
diff mercurial/hgweb/hgweb_mod.py @ 30766:d7bf7d2bd5ab
hgweb: support Content Security Policy
Content-Security-Policy (CSP) is a web security feature that allows
servers to declare what loaded content is allowed to do. For example,
a policy can prevent loading of images, JavaScript, CSS, etc unless
the source of that content is whitelisted (by hostname, URI scheme,
hashes of content, etc). It's a nifty security feature that provides
extra mitigation against some attacks, notably XSS.
Mitigation against these attacks is important for Mercurial because
hgweb renders repository data, which is commonly untrusted. While we
make attempts to escape things, etc, there's the possibility that
malicious data could be injected into the site content. If this happens
today, the full power of the web browser is available to that
malicious content. A restrictive CSP policy (defined by the server
operator and sent in an HTTP header which is outside the control of
malicious content), could restrict browser capabilities and mitigate
security problems posed by malicious data.
CSP works by emitting an HTTP header declaring the policy that browsers
should apply. Ideally, this header would be emitted by a layer above
Mercurial (likely the HTTP server doing the WSGI "proxying"). This
works for some CSP policies, but not all.
For example, policies to allow inline JavaScript may require setting
a "nonce" attribute on <script>. This attribute value must be unique
and non-guessable. And, the value must be present in the HTTP header
and the HTML body. This means that coordinating the value between
Mercurial and another HTTP server could be difficult: it is much
easier to generate and emit the nonce in a central location.
This commit introduces support for emitting a
Content-Security-Policy header from hgweb. A config option defines
the header value. If present, the header is emitted. A special
"%nonce%" syntax in the value triggers generation of a nonce and
inclusion in <script> elements in templates. The inclusion of a
nonce does not occur unless "%nonce%" is present. This makes this
commit completely backwards compatible and the feature opt-in.
The nonce is a type 4 UUID, which is the flavor that is randomly
generated. It has 122 random bits, which should be plenty to satisfy
the guarantees of a nonce.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 10 Jan 2017 23:37:08 -0800 |
parents | e38e7ea21987 |
children | bd3cb917761a |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Tue Jan 10 20:47:48 2017 -0800 +++ b/mercurial/hgweb/hgweb_mod.py Tue Jan 10 23:37:08 2017 -0800 @@ -19,6 +19,7 @@ HTTP_OK, HTTP_SERVER_ERROR, caching, + cspvalues, permhooks, ) from .request import wsgirequest @@ -115,6 +116,8 @@ # of the request. self.websubtable = app.websubtable + self.csp, self.nonce = cspvalues(self.repo.ui) + # Trust the settings from the .hg/hgrc files by default. def config(self, section, name, default=None, untrusted=True): return self.repo.ui.config(section, name, default, @@ -201,6 +204,7 @@ 'sessionvars': sessionvars, 'pathdef': makebreadcrumb(req.url), 'style': style, + 'nonce': self.nonce, } tmpl = templater.templater.frommapfile(mapfile, filters={'websub': websubfilter}, @@ -318,6 +322,13 @@ encoding.encoding = rctx.config('web', 'encoding', encoding.encoding) rctx.repo.ui.environ = req.env + if rctx.csp: + # hgwebdir may have added CSP header. Since we generate our own, + # replace it. + req.headers = [h for h in req.headers + if h[0] != 'Content-Security-Policy'] + req.headers.append(('Content-Security-Policy', rctx.csp)) + # work with CGI variables to create coherent structure # use SCRIPT_NAME, PATH_INFO and QUERY_STRING as well as our REPO_NAME @@ -414,7 +425,9 @@ req.form['cmd'] = [tmpl.cache['default']] cmd = req.form['cmd'][0] - if rctx.configbool('web', 'cache', True): + # Don't enable caching if using a CSP nonce because then it wouldn't + # be a nonce. + if rctx.configbool('web', 'cache', True) and not rctx.nonce: caching(self, req) # sets ETag header or raises NOT_MODIFIED if cmd not in webcommands.__all__: msg = 'no such method: %s' % cmd