annotate scripts/dbmigrate-test @ 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 2c3d30095d5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6025
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
1 #!/bin/sh -e
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
2
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
3 if [ $# -lt 2 ] || [ $# -gt 3 ]; then
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
4 cat >&2 <<EOD
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
5 usage: $0 CONFIG_FILE FROM_REV [TO_REV]
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
6
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
7 Runs a database migration from FROM_REV to TO_REV (default: current
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
8 working directory parent), using the specified CONFIG_FILE (.ini file).
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
9
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
10 Test is run using a clean Kallithea install, in a temporary virtual
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
11 environment. FROM_REV and (optional) TO_REV should be Mercurial revision
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
12 identifiers (e.g. changeset hash or a version number tag). The working
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
13 directory is not touched, but the database referenced in the config file
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
14 will be (re)created.
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
15
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
16 Only SQLite is available out of the box; for MySQL or PostgreSQL, set
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
17 the EXTRA environment variable to the required package(s), and it'll
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
18 be installed in the virtual environment. (E.g. EXTRA=MySQL-python or
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
19 EXTRA=psycopg2.)
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
20
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
21 The temporary directory is not removed, allowing follow-up examination
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
22 of the upgrade results. It is, however, created in /tmp by default,
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
23 which many Linux distributions automatically clean at regular intervals.
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
24 EOD
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
25 exit 1
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
26 fi
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
27
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
28 config_file=$(readlink -f "$1")
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
29 from_rev=$2
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
30 to_rev=$3
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
31 source_repo=$(dirname "$(dirname "$(readlink -f "$0")")")
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
32
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
33 announce() {
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
34 echo
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
35 echo "$1"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
36 echo
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
37 }
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
38
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
39 quiet_if_ok() (
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
40 local output
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
41 local st
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
42 set +e
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
43 output=$("$@" < /dev/null 2>&1)
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
44 st=$?
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
45 if [ $st -ne 0 ]; then
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
46 echo "$output" >&2
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
47 echo "Command $@ returned exit status $st." >&2
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
48 exit 1
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
49 fi
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
50 )
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
51
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
52 HG() {
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
53 "${HG:-hg}" --repository "$source_repo" "$@"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
54 }
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
55
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
56 # If upgrading to "current revision", warn if working directory is dirty.
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
57 if [ ! "$to_rev" ] && [ "$(HG status -mard)" ]; then
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
58 announce "Warning: Uncommitted changes in working directory will be ignored!"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
59 fi
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
60
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
61 from_rev_hash=$(HG id --id --rev "${from_rev:-.}")
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
62 to_rev_hash=$(HG id --id --rev "${to_rev:-.}")
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
63 temp=$(readlink -f "$(mktemp --tmpdir -d 'dbmigrate-test.XXXXXX')")
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
64
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
65 cat <<EOD
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
66 Config file: $config_file
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
67 EOD
6214
f973b866fffc Turbogears2 migration: use sqlalchemy.url iso sqlalchemy.db1.url
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents: 6025
diff changeset
68 sed -n -e 's/^sqlalchemy\.url *= */Database URL: /p' "$config_file"
6025
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
69 cat <<EOD
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
70 Working dir: $temp
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
71 Repository: $source_repo
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
72 Upgrade from: $from_rev_hash (${from_rev:-current})
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
73 Upgrade to: $to_rev_hash (${to_rev:-current})
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
74 Extra packages: ${EXTRA:-(none)}
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
75 EOD
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
76
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
77 mkdir "$temp/repos" # empty
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
78
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
79 # Enable caching for old pip versions (this will cache the pip upgrade)
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
80 # Newer pip versions cache automatically, and don't use this variable.
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
81 if [ ! "$PIP_DOWNLOAD_CACHE" ]; then
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
82 export PIP_DOWNLOAD_CACHE=$HOME/.cache/pip/legacy
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
83 fi
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
84
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
85 install_kallithea() {
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
86 local prefix=$1
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
87 local rev=$2
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
88
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
89 announce "Installing Kallithea $rev in $prefix..."
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
90
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
91 "${VIRTUALENV:-virtualenv}" --quiet "$prefix-env"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
92 HG archive --rev "$rev" "$prefix"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
93
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
94 (
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
95 cd "$prefix"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
96 . "$prefix-env/bin/activate"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
97 pip install --quiet --upgrade pip setuptools mercurial $EXTRA
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
98 pip install --quiet -e .
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
99 )
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
100 }
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
101
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
102 install_kallithea "$temp/from" "$from_rev_hash"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
103 (
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
104 cd "$temp/from"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
105 . "$temp/from-env/bin/activate"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
106 announce "Initializing database..."
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
107 quiet_if_ok paster setup-db "$config_file" --repos="$temp/repos" --user=doe --email=doe@example.com --password=123456 --no-public-access --force-yes
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
108 alembic -c "$config_file" current -v
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
109 )
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
110
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
111 install_kallithea "$temp/to" "$to_rev_hash"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
112 (
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
113 cd "$temp/to"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
114 . "$temp/to-env/bin/activate"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
115
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
116 announce "Commencing database upgrade from shown Alembic revision to head..."
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
117 alembic -c "$config_file" current -v
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
118 alembic -c "$config_file" upgrade head
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
119 announce "Upgrade complete, now at the shown Alembic revision:"
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
120 alembic -c "$config_file" current -v
51b1af58589b db: script to test database upgrades
Søren Løvborg <sorenl@unity3d.com>
parents:
diff changeset
121 )