March 2011 - tor-commits - lists.torproject.org

[metrics-web/master] Escape parameter values in HTML output.
by karsten＠torproject.org 22 Mar '11

22 Mar '11

commit 654217676bf16b953e476c6fc0ba2bd54917424e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 22 17:19:00 2011 +0100 Escape parameter values in HTML output. Problem in exonerator.html spotted by Alexander Zenkov. Thanks! --- .../torproject/ernie/web/DescriptorServlet.java | 3 +- .../torproject/ernie/web/ExoneraTorServlet.java | 23 +++++++++++++------- src/org/torproject/ernie/web/RelayServlet.java | 3 +- 3 files changed, 19 … [View More]insertions(+), 10 deletions(-) diff --git a/src/org/torproject/ernie/web/DescriptorServlet.java b/src/org/torproject/ernie/web/DescriptorServlet.java index 0ea8ea2..9e84baf 100644 --- a/src/org/torproject/ernie/web/DescriptorServlet.java +++ b/src/org/torproject/ernie/web/DescriptorServlet.java @@ -137,7 +137,8 @@ public class DescriptorServlet extends HttpServlet { } } if (descId == null) { - out.write(" Sorry, \"" + descIdParameter + "\" is not a " + out.write(" Sorry, \"" + + StringEscapeUtils.escapeHtml(descIdParameter) + "\" is not a " + "valid descriptor identifier. Please provide at least the " + "first 8 hex characters of a descriptor identifier.\n"); writeFooter(out); diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java index 35e292d..e501129 100644 --- a/src/org/torproject/ernie/web/ExoneraTorServlet.java +++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java @@ -14,6 +14,7 @@ import javax.servlet.http.*; import javax.sql.*; import org.apache.commons.codec.binary.*; +import org.apache.commons.lang.*; public class ExoneraTorServlet extends HttpServlet { @@ -184,8 +185,9 @@ public class ExoneraTorServlet extends HttpServlet { + Integer.parseInt(ipParts[3]); } else { ipWarning = "\"" + (ipParameter.length() > 20 ? - ipParameter.substring(0, 20) + "[...]" : - ipParameter) + "\" is not a valid IP address."; + StringEscapeUtils.escapeHtml(ipParameter.substring(0, 20)) + + "[...]" : StringEscapeUtils.escapeHtml(ipParameter)) + + "\" is not a valid IP address."; } } @@ -210,8 +212,10 @@ public class ExoneraTorServlet extends HttpServlet { /* We have no way to handle this exception, other than leaving timestampStr at "". */ timestampWarning = "\"" + (timestampParameter.length() > 20 ? - timestampParameter.substring(0, 20) + "[...]" : - timestampParameter) + "\" is not a valid timestamp."; + StringEscapeUtils.escapeHtml(timestampParameter. + substring(0, 20)) + "[...]" : + StringEscapeUtils.escapeHtml(timestampParameter)) + + "\" is not a valid timestamp."; } } @@ -244,8 +248,9 @@ public class ExoneraTorServlet extends HttpServlet { targetIPParts = targetIP.split("\\."); } else { targetAddrWarning = "\"" + (targetAddrParameter.length() > 20 ? - timestampParameter.substring(0, 20) + "[...]" : - timestampParameter) + "\" is not a valid IP address."; + StringEscapeUtils.escapeHtml(targetAddrParameter.substring( + 0, 20)) + "[...]" : StringEscapeUtils.escapeHtml( + targetAddrParameter)) + "\" is not a valid IP address."; } } @@ -266,8 +271,10 @@ public class ExoneraTorServlet extends HttpServlet { } } else { targetPortWarning = "\"" + (targetPortParameter.length() > 8 ? - targetPortParameter.substring(0, 8) + "[...]" : - targetPortParameter) + "\" is not a valid TCP port."; + StringEscapeUtils.escapeHtml(targetPortParameter. + substring(0, 8)) + "[...]" : + StringEscapeUtils.escapeHtml(targetPortParameter)) + + "\" is not a valid TCP port."; } } diff --git a/src/org/torproject/ernie/web/RelayServlet.java b/src/org/torproject/ernie/web/RelayServlet.java index 88331aa..48da03b 100644 --- a/src/org/torproject/ernie/web/RelayServlet.java +++ b/src/org/torproject/ernie/web/RelayServlet.java @@ -146,7 +146,8 @@ public class RelayServlet extends HttpServlet { } } if (!validParameter) { - out.write(" Sorry, \"" + fingerprintParameter + out.write(" Sorry, \"" + + StringEscapeUtils.escapeHtml(fingerprintParameter) + "\" is not a valid relay fingerprint. Please provide at " + "least the first 8 hex characters of a relay " + "fingerprint.\n"); [View Less]

1 0

r24416: {website} updated translations for the website (as wml) (in website/trunk: . about/pl ar da docs/ar docs/pl donate/pl download/ar getinvolved/pl pl press/pl projects/pl torbutton/pl)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 15:51:53 +0000 (Tue, 22 Mar 2011) New Revision: 24416 Added: website/trunk/da/ website/trunk/da/index.wml website/trunk/docs/ar/faq-abuse.wml website/trunk/docs/ar/tor-doc-windows.wml website/trunk/download/ar/download.wml Modified: website/trunk/about/pl/board.wml website/trunk/about/pl/contact.wml website/trunk/about/pl/contributors.wml website/trunk/about/pl/corepeople.wml website/trunk/about/pl/financials.wml website/trunk/… [View More]

1 0

r24415: {translation} updated translations from transifex for the website (in translation/trunk/projects/website/po: .tx ar ar/about ar/docs ar/donate ar/download ar/getinvolved ar/press ar/projects ar/torbutton fr my pl_PL pl_PL/about pl_PL/docs pl_PL/download pl_PL/projects pl_PL/torbutton zh_CN/about)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 15:50:11 +0000 (Tue, 22 Mar 2011) New Revision: 24415 Modified: translation/trunk/projects/website/po/.tx/config translation/trunk/projects/website/po/ar/1-high.index.po translation/trunk/projects/website/po/ar/about/3-low.board.po translation/trunk/projects/website/po/ar/about/3-low.corepeople.po translation/trunk/projects/website/po/ar/about/3-low.financials.po translation/trunk/projects/website/po/ar/about/3-low.sponsors.po translation/… [View More]

1 0

r24414: {website} we need the td tag, do not remove it (in website/trunk/download: ar fr pl ru)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 14:21:58 +0000 (Tue, 22 Mar 2011) New Revision: 24414 Modified: website/trunk/download/ar/download-easy.wml website/trunk/download/fr/download-easy.wml website/trunk/download/pl/download-easy.wml website/trunk/download/pl/download-unix.wml website/trunk/download/pl/download.wml website/trunk/download/pl/thankyou.wml website/trunk/download/ru/download-easy.wml Log: we need the td tag, do not remove it Modified: website/trunk/download/ar/… [View More]download-easy.wml =================================================================== --- website/trunk/download/ar/download-easy.wml 2011-03-22 13:48:25 UTC (rev 24413) +++ website/trunk/download/ar/download-easy.wml 2011-03-22 14:21:58 UTC (rev 24414) @@ -26,6 +26,7 @@ projects/torbrowser>">تعلم المزيد ومزيد من اللغات«</a></td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe">ويندوز 7، فيستا، إكس بي</a>  (<a @@ -34,6 +35,7 @@ </td> </tr> <tr> +<td> <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">Apple OS X Intel</a>  (<a @@ -42,6 +44,7 @@ </td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz">غنو/لينكس i686</a>  (<a Modified: website/trunk/download/fr/download-easy.wml =================================================================== --- website/trunk/download/fr/download-easy.wml 2011-03-22 13:48:25 UTC (rev 24413) +++ website/trunk/download/fr/download-easy.wml 2011-03-22 14:21:58 UTC (rev 24414) @@ -26,6 +26,7 @@ projects/torbrowser>">En lire plus & Autre langages »</a></td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe">Windows 7, Vista, XP</a>  (<a @@ -34,6 +35,7 @@ </td> </tr> <tr> +<td> <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">Apple OS X Intel</a>  (<a @@ -42,6 +44,7 @@ </td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz">GNU/Linux i686</a>  (<a Modified: website/trunk/download/pl/download-easy.wml =================================================================== --- website/trunk/download/pl/download-easy.wml 2011-03-22 13:48:25 UTC (rev 24413) +++ website/trunk/download/pl/download-easy.wml 2011-03-22 14:21:58 UTC (rev 24414) @@ -27,6 +27,7 @@ projects/torbrowser>">Dowiedz się więcej i sprawdź inne języki »</a></td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Windows 7, Vista, XP</a>  (<a @@ -35,6 +36,7 @@ </td> </tr> <tr> +<td> <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Apple OS X Intel</a>  (<a @@ -43,6 +45,7 @@ </td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">GNU/Linux i686</a>  (<a Modified: website/trunk/download/pl/download-unix.wml =================================================================== --- website/trunk/download/pl/download-unix.wml 2011-03-22 13:48:25 UTC (rev 24413) +++ website/trunk/download/pl/download-unix.wml 2011-03-22 14:21:58 UTC (rev 24414) @@ -212,4 +212,4 @@ -#include <foot.wmi> +#include "foot.wmi" Modified: website/trunk/download/pl/download.wml =================================================================== --- website/trunk/download/pl/download.wml 2011-03-22 13:48:25 UTC (rev 24413) +++ website/trunk/download/pl/download.wml 2011-03-22 14:21:58 UTC (rev 24414) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24149 $ +# Revision: $Revision: 24337 $ # Translation-Priority: 3-low #include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> @@ -264,7 +264,7 @@ <div class="warning"> -<a name="warning"></a> +<a name="warning"></a> <a name="Warning"></a> <h2><a class="anchor" href="#warning">Uwaga: Chcesz, żeby Tor naprawdę działał?</a></h2> ...to prosimy nie poprzestawaj tylko na instalacji. Musisz zmienić część @@ -395,4 +395,4 @@ -#include <foot.wmi> +#include "foot.wmi" Modified: website/trunk/download/pl/thankyou.wml =================================================================== --- website/trunk/download/pl/thankyou.wml 2011-03-22 13:48:25 UTC (rev 24413) +++ website/trunk/download/pl/thankyou.wml 2011-03-22 14:21:58 UTC (rev 24414) @@ -102,4 +102,4 @@ </div> -#include <foot.wmi> +#include "foot.wmi" Modified: website/trunk/download/ru/download-easy.wml =================================================================== --- website/trunk/download/ru/download-easy.wml 2011-03-22 13:48:25 UTC (rev 24413) +++ website/trunk/download/ru/download-easy.wml 2011-03-22 14:21:58 UTC (rev 24414) @@ -27,6 +27,7 @@ & другие языки »</a></td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Windows 7, Vista, XP</a>  (<a @@ -35,6 +36,7 @@ </td> </tr> <tr> +<td> <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Apple OS X Intel</a>  (<a @@ -43,6 +45,7 @@ </td> </tr> <tr class="gray"> +<td> <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">GNU/Linux i686</a>  (<a [View Less]

1 0

r24413: {website} we want to use pl instead of pl_PL (website/trunk)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 13:48:25 +0000 (Tue, 22 Mar 2011) New Revision: 24413 Modified: website/trunk/po2wml.sh Log: we want to use pl instead of pl_PL Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-03-22 13:40:22 UTC (rev 24412) +++ website/trunk/po2wml.sh 2011-03-22 13:48:25 UTC (rev 24413) @@ -233,6 +233,13 @@ nosubdir fi + # If the current directory is "pl_PL" use "pl" instead + if [… [View More]

1 0

r24412: {website} include flipped arrow in the nav (website/trunk/css)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 13:40:22 +0000 (Tue, 22 Mar 2011) New Revision: 24412 Modified: website/trunk/css/layout-rtl.css Log: include flipped arrow in the nav Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-03-22 13:05:22 UTC (rev 24411) +++ website/trunk/css/layout-rtl.css 2011-03-22 13:40:22 UTC (rev 24412) @@ -127,10 +127,9 @@ } #sidenav ul li.dropdown a:link, -#sidenav ul … [View More]

1 0

r24411: {website} include flipped calendar icon (website/trunk/css)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 13:05:22 +0000 (Tue, 22 Mar 2011) New Revision: 24411 Modified: website/trunk/css/layout-rtl.css Log: include flipped calendar icon Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-03-22 12:55:28 UTC (rev 24410) +++ website/trunk/css/layout-rtl.css 2011-03-22 13:05:22 UTC (rev 24411) @@ -174,6 +174,7 @@ } .calendar { + background: url(../images/icon-… [View More]

1 0

r24410: {} flipped calendar icon (website/trunk/images)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 12:55:28 +0000 (Tue, 22 Mar 2011) New Revision: 24410 Added: website/trunk/images/icon-calendar-flipped.jpg Log: flipped calendar icon Added: website/trunk/images/icon-calendar-flipped.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/icon-calendar-flipped.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r24409: {website} remove one ruleset in typography-rtl.css (website/trunk/css)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 12:50:27 +0000 (Tue, 22 Mar 2011) New Revision: 24409 Modified: website/trunk/css/typography-rtl.css Log: remove one ruleset in typography-rtl.css Modified: website/trunk/css/typography-rtl.css =================================================================== --- website/trunk/css/typography-rtl.css 2011-03-22 12:45:31 UTC (rev 24408) +++ website/trunk/css/typography-rtl.css 2011-03-22 12:50:27 UTC (rev 24409) @@ -11,7 +11,7 @@ #nav ul li a:link, #nav … [View More]

1 0

r24408: {website} removed translator comments in ar ru pl and fr, removed dupe (in website/trunk/download: . ar fr pl ru)
by Runa Sandvik 22 Mar '11

22 Mar '11

Author: runa Date: 2011-03-22 12:45:31 +0000 (Tue, 22 Mar 2011) New Revision: 24408 Removed: website/trunk/download/pl_PL/ Modified: website/trunk/download/ar/download-easy.wml website/trunk/download/fr/download-easy.wml website/trunk/download/pl/download-easy.wml website/trunk/download/ru/download-easy.wml Log: removed translator comments in ar ru pl and fr, removed dupe pl_PL Modified: website/trunk/download/ar/download-easy.wml ================================================… [View More]=================== --- website/trunk/download/ar/download-easy.wml 2011-03-22 12:39:46 UTC (rev 24407) +++ website/trunk/download/ar/download-easy.wml 2011-03-22 12:45:31 UTC (rev 24408) @@ -26,7 +26,6 @@ projects/torbrowser>">تعلم المزيد ومزيد من اللغات«</a></td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe">ويندوز 7، فيستا، إكس بي</a>  (<a @@ -35,7 +34,6 @@ </td> </tr> <tr> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">Apple OS X Intel</a>  (<a @@ -44,7 +42,6 @@ </td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz">غنو/لينكس i686</a>  (<a Modified: website/trunk/download/fr/download-easy.wml =================================================================== --- website/trunk/download/fr/download-easy.wml 2011-03-22 12:39:46 UTC (rev 24407) +++ website/trunk/download/fr/download-easy.wml 2011-03-22 12:45:31 UTC (rev 24408) @@ -26,7 +26,6 @@ projects/torbrowser>">En lire plus & Autre langages »</a></td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe">Windows 7, Vista, XP</a>  (<a @@ -35,7 +34,6 @@ </td> </tr> <tr> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">Apple OS X Intel</a>  (<a @@ -44,7 +42,6 @@ </td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz">GNU/Linux i686</a>  (<a Modified: website/trunk/download/pl/download-easy.wml =================================================================== --- website/trunk/download/pl/download-easy.wml 2011-03-22 12:39:46 UTC (rev 24407) +++ website/trunk/download/pl/download-easy.wml 2011-03-22 12:45:31 UTC (rev 24408) @@ -5,7 +5,7 @@ ## translation metadata -# Revision: $Revision: 21396 $ +# Revision: $Revision: 24336 $ # Translation-Priority: 1-high #include "head.wmi" TITLE="Tor: Easy Download Selector" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> @@ -27,7 +27,6 @@ projects/torbrowser>">Dowiedz się więcej i sprawdź inne języki »</a></td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Windows 7, Vista, XP</a>  (<a @@ -36,7 +35,6 @@ </td> </tr> <tr> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Apple OS X Intel</a>  (<a @@ -45,7 +43,6 @@ </td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">GNU/Linux i686</a>  (<a @@ -128,4 +125,4 @@ -#include <foot.wmi> +#include "foot.wmi" Modified: website/trunk/download/ru/download-easy.wml =================================================================== --- website/trunk/download/ru/download-easy.wml 2011-03-22 12:39:46 UTC (rev 24407) +++ website/trunk/download/ru/download-easy.wml 2011-03-22 12:45:31 UTC (rev 24408) @@ -27,7 +27,6 @@ & другие языки »</a></td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Windows 7, Vista, XP</a>  (<a @@ -36,7 +35,6 @@ </td> </tr> <tr> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Apple OS X Intel</a>  (<a @@ -45,7 +43,6 @@ </td> </tr> <tr class="gray"> -<td># Translators: please point to the version of TBB in your language, if there is one. <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">GNU/Linux i686</a>  (<a [View Less]

1 0