annotate init.d/kallithea-daemon-debian @ 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
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
1 #!/bin/sh -e
426
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
2 ########################################
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
3 #### THIS IS A DEBIAN INIT.D SCRIPT ####
426
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
4 ########################################
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
5
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
6 ### BEGIN INIT INFO
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
7 # Provides: kallithea
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
8 # Required-Start: $all
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
9 # Required-Stop: $all
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
10 # Default-Start: 2 3 4 5
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
11 # Default-Stop: 0 1 6
4190
99ad9d0af1a3 Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3225
diff changeset
12 # Short-Description: starts instance of kallithea
99ad9d0af1a3 Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3225
diff changeset
13 # Description: starts instance of kallithea using start-stop-daemon
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
14 ### END INIT INFO
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
15
4190
99ad9d0af1a3 Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3225
diff changeset
16 APP_NAME="kallithea"
3225
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
17 APP_HOMEDIR="opt"
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
18 APP_PATH="/$APP_HOMEDIR/$APP_NAME"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
19
426
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
20 CONF_NAME="production.ini"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
21
426
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
22 PID_PATH="$APP_PATH/$APP_NAME.pid"
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
23 LOG_PATH="$APP_PATH/$APP_NAME.log"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
24
3225
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
25 PYTHON_PATH="/$APP_HOMEDIR/$APP_NAME-venv"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
26
3225
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
27 RUN_AS="root"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
28
426
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
29 DAEMON="$PYTHON_PATH/bin/paster"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
30
426
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
31 DAEMON_OPTS="serve --daemon \
3225
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
32 --user=$RUN_AS \
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
33 --group=$RUN_AS \
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
34 --pid-file=$PID_PATH \
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
35 --log-file=$LOG_PATH $APP_PATH/$CONF_NAME"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
36
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
37
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
38 start() {
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
39 echo "Starting $APP_NAME"
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
40 PYTHON_EGG_CACHE="/tmp" start-stop-daemon -d $APP_PATH \
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
41 --start --quiet \
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
42 --pidfile $PID_PATH \
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
43 --user $RUN_AS \
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
44 --exec $DAEMON -- $DAEMON_OPTS
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
45 }
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
46
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
47 stop() {
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
48 echo "Stopping $APP_NAME"
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
49 start-stop-daemon -d $APP_PATH \
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
50 --stop --quiet \
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
51 --pidfile $PID_PATH || echo "$APP_NAME - Not running!"
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
52
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
53 if [ -f $PID_PATH ]; then
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
54 rm $PID_PATH
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
55 fi
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
56 }
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
57
3225
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
58 status() {
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
59 echo -n "Checking status of $APP_NAME ... "
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
60 pid=`cat $PID_PATH`
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
61 status=`ps ax | grep $pid | grep -ve grep`
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
62 if [ "$?" -eq 0 ]; then
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
63 echo "running"
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
64 else
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
65 echo "NOT running"
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
66 fi
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
67 }
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
68
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
69 case "$1" in
3225
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
70 status)
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
71 status
f9540f9c5999 little improvements for debian init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 1262
diff changeset
72 ;;
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
73 start)
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
74 start
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
75 ;;
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
76 stop)
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
77 stop
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
78 ;;
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
79 restart)
426
17d5028e055c updated init scripts to start-stop-daemons
Marcin Kuzminski <marcin@python-works.com>
parents: 38
diff changeset
80 echo "Restarting $APP_NAME"
432
90512560ed4d more with init scripts !
Marcin Kuzminski <marcin@python-works.com>
parents: 431
diff changeset
81 ### stop ###
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
82 stop
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
83 wait
432
90512560ed4d more with init scripts !
Marcin Kuzminski <marcin@python-works.com>
parents: 431
diff changeset
84 ### start ###
1262
238bea955b54 simplified example init.d script
Marcin Kuzminski <marcin@python-works.com>
parents: 552
diff changeset
85 start
433
aeafda5481e4 more on that neverending topic :) init scripts
Marcin Kuzminski <marcin@python-works.com>
parents: 432
diff changeset
86 ;;
12
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
87 *)
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
88 echo "Usage: $0 {start|stop|restart}"
5f30a6d558dc Added pylons manage script
Marcin Kuzminski
parents:
diff changeset
89 exit 1
6370
e285bb7abb28 scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents: 4190
diff changeset
90 esac