annotate .travis.yml @ 6532:33b71a130b16

templates: properly escape inline JavaScript values TLDR: Kallithea has issues with escaping values for use in inline JS. Despite judicious poking of the code, no actual security vulnerabilities have been found, just lots of corner-case bugs. This patch fixes those, and hardens the code against actual security issues. The long version: To embed a Python value (typically a 'unicode' plain-text value) in a larger file, it must be escaped in a context specific manner. Example: >>> s = u'<script>alert("It\'s a trap!");</script>' 1) Escaped for insertion into HTML element context >>> print cgi.escape(s) &lt;script&gt;alert("It's a trap!");&lt;/script&gt; 2) Escaped for insertion into HTML element or attribute context >>> print h.escape(s) &lt;script&gt;alert(&#34;It&#39;s a trap!&#34;);&lt;/script&gt; This is the default Mako escaping, as usually used by Kallithea. 3) Encoded as JSON >>> print json.dumps(s) "<script>alert(\"It's a trap!\");</script>" 4) Escaped for insertion into a JavaScript file >>> print '(' + json.dumps(s) + ')' ("<script>alert(\"It's a trap!\");</script>") The parentheses are not actually required for strings, but may be needed to avoid syntax errors if the value is a number or dict (object). 5) Escaped for insertion into a HTML inline <script> element >>> print h.js(s) ("\x3cscript\x3ealert(\"It's a trap!\");\x3c/script\x3e") Here, we need to combine JS and HTML escaping, further complicated by the fact that "<script>" tag contents can either be parsed in XHTML mode (in which case '<', '>' and '&' must additionally be XML escaped) or HTML mode (in which case '</script>' must be escaped, but not using HTML escaping, which is not available in HTML "<script>" tags). Therefore, the XML special characters (which can only occur in string literals) are escaped using JavaScript string literal escape sequences. (This, incidentally, is why modern web security best practices ban all use of inline JavaScript...) Unsurprisingly, Kallithea does not do (5) correctly. In most cases, Kallithea might slap a pair of single quotes around the HTML escaped Python value. A typical benign example: $('#child_link').html('${_('No revisions')}'); This works in English, but if a localized version of the string contains an apostrophe, the result will be broken JavaScript. In the more severe cases, where the text is user controllable, it leaves the door open to injections. In this example, the script inserts the string as HTML, so Mako's implicit HTML escaping makes sense; but in many other cases, HTML escaping is actually an error, because the value is not used by the script in an HTML context. The good news is that the HTML escaping thwarts attempts at XSS, since it's impossible to inject syntactically valid JavaScript of any useful complexity. It does allow JavaScript errors and gibberish to appear on the page, though. In these cases, the escaping has been fixed to use either the new 'h.js' helper, which does JavaScript escaping (but not HTML escaping), OR the new 'h.jshtml' helper (which does both), in those cases where it was unclear if the value might be used (by the script) in an HTML context. Some of these can probably be "relaxed" from h.jshtml to h.js later, but for now, using h.jshtml fixes escaping and doesn't introduce new errors. In a few places, Kallithea JSON encodes values in the controller, then inserts the JSON (without any further escaping) into <script> tags. This is also wrong, and carries actual risk of XSS vulnerabilities. However, in all cases, security vulnerabilities were narrowly avoided due to other filtering in Kallithea. (E.g. many special characters are banned from appearing in usernames.) In these cases, the escaping has been fixed and moved to the template, making it immediately visible that proper escaping has been performed. Mini-FAQ (frequently anticipated questions): Q: Why do everything in one big, hard to review patch? Q: Why add escaping in specific case FOO, it doesn't seem needed? Because the goal here is to have "escape everywhere" as the default policy, rather than identifying individual bugs and fixing them one by one by adding escaping where needed. As such, this patch surely introduces a lot of needless escaping. This is no different from how Mako/Pylons HTML escape everything by default, even when not needed: it's errs on the side of needless work, to prevent erring on the side of skipping required (and security critical) work. As for reviewability, the most important thing to notice is not where escaping has been introduced, but any places where it might have been missed (or where h.jshtml is needed, but h.js is used). Q: The added escaping is kinda verbose/ugly. That is not a question, but yes, I agree. Hopefully it'll encourage us to move away from inline JavaScript altogether. That's a significantly larger job, though; with luck this patch will keep us safe and secure until such a time as we can implement the real fix. Q: Why not use Mako filter syntax ("${val|h.js}")? Because of long-standing Mako bug #140, preventing use of 'h' in filters. Q: Why not work around bug #140, or even use straight "${val|js}"? Because Mako still applies the default h.escape filter before the explicitly specified filters. Q: Where do we go from here? Longer term, we should stop doing variable expansions in script blocks, and instead pass data to JS via e.g. data attributes, or asynchronously using AJAX calls. Once we've done that, we can remove inline JavaScript altogether in favor of separate script files, and set a strict Content Security Policy explicitly blocking inline scripting, and thus also the most common kind of cross-site scripting attack.
author Søren Løvborg <sorenl@unity3d.com>
date Tue, 28 Feb 2017 17:19:00 +0100
parents e285bb7abb28
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2561
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
1 language: python
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
2 python:
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
3 - "2.6"
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
4 - "2.7"
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
5
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4522
diff changeset
6 env:
4206
703d3208424c Rename various strings for tests
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4180
diff changeset
7 - TEST_DB=sqlite:////tmp/kallithea_test.sqlite
703d3208424c Rename various strings for tests
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4180
diff changeset
8 - TEST_DB=mysql://root@127.0.0.1/kallithea_test
703d3208424c Rename various strings for tests
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4180
diff changeset
9 - TEST_DB=postgresql://postgres@127.0.0.1/kallithea_test
2561
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
10
2834
925c77b9d3f1 travis configu updates
Marcin Kuzminski <marcin@python-works.com>
parents: 2743
diff changeset
11 services:
925c77b9d3f1 travis configu updates
Marcin Kuzminski <marcin@python-works.com>
parents: 2743
diff changeset
12 - mysql
925c77b9d3f1 travis configu updates
Marcin Kuzminski <marcin@python-works.com>
parents: 2743
diff changeset
13 - postgresql
925c77b9d3f1 travis configu updates
Marcin Kuzminski <marcin@python-works.com>
parents: 2743
diff changeset
14
2561
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
15 # command to install dependencies
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
16 before_script:
4206
703d3208424c Rename various strings for tests
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4180
diff changeset
17 - mysql -e 'create database kallithea_test;'
703d3208424c Rename various strings for tests
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4180
diff changeset
18 - psql -c 'create database kallithea_test;' -U postgres
2742
63d3d20cad95 Take that travis !
Marcin Kuzminski <marcin@python-works.com>
parents: 2638
diff changeset
19 - git --version
63d3d20cad95 Take that travis !
Marcin Kuzminski <marcin@python-works.com>
parents: 2638
diff changeset
20
63d3d20cad95 Take that travis !
Marcin Kuzminski <marcin@python-works.com>
parents: 2638
diff changeset
21 before_install:
2743
64ee7cf4a76d remove GIT before installing this ppa to fix upgrade issues
Marcin Kuzminski <marcin@python-works.com>
parents: 2742
diff changeset
22 - sudo apt-get remove git
2742
63d3d20cad95 Take that travis !
Marcin Kuzminski <marcin@python-works.com>
parents: 2638
diff changeset
23 - sudo add-apt-repository ppa:pdoes/ppa -y
63d3d20cad95 Take that travis !
Marcin Kuzminski <marcin@python-works.com>
parents: 2638
diff changeset
24 - sudo apt-get update -y
63d3d20cad95 Take that travis !
Marcin Kuzminski <marcin@python-works.com>
parents: 2638
diff changeset
25 - sudo apt-get install git -y
2561
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
26
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
27 install:
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
28 - pip install mysql-python psycopg2 mock unittest2
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
29 - pip install . --use-mirrors
2742
63d3d20cad95 Take that travis !
Marcin Kuzminski <marcin@python-works.com>
parents: 2638
diff changeset
30
2561
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
31 # command to run tests
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
32 script: nosetests
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
33
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
34 notifications:
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
35 email:
4213
13c0ab8eb343 Update address for Travis
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4206
diff changeset
36 - ci@kallithea-scm.org
4180
08af8038e1cc Change IRC channel and Twitter account; remove google group
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3975
diff changeset
37 irc: "irc.freenode.org#kallithea"
2561
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
38
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
39 branches:
6ccf86ebfd4e tox+travis with multiple dbs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
40 only:
3975
69377d1d7604 Use master branch on master bookmark to test with travis
Marcin Kuzminski <marcin@python-works.com>
parents: 2834
diff changeset
41 - master