- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit f62c3d0c8eeb5f86d667c314ecb22cc6df5bada9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 17:45:29 2012 +0000 Update translations for vidalia_help --- es/server.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/server.po b/es/server.po index 9ed98a7..c001b63 100644 --- a/es/server.po +++ b/es/server.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-28 17:08+0000\n" +"PO-Revision-Date: 2012-12-28 17:44+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -365,7 +365,7 @@ msgid "" "known as <i>port forwarding</i>. Port forwarding configures your router or " "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." -msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesita saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como <i>redireccionamiento de puertos</i>. El redireccionamiento de puertos configura su router y/o firewall para \"redirigir\" todas las conexiones a ciertos puertos, hacia los puertos locales especificados en su ordenador." +msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesita saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como <i>redireccionamiento de puertos</i>. El redireccionamiento de puertos se configura para \"redirigir\" todas las conexiones por ciertos puertos de su router y/o firewall, hacia los puertos locales especificados de su ordenador." #. type: Content of: <html><body><p> #: en/server.html:208 @@ -376,7 +376,7 @@ msgid "" "your relay. Not all routers support automatic port forwarding, though. You " "can use the <i>Test</i> button next to the checkbox to find out if Vidalia " "is able to automatically set up port forwarding for you." -msgstr "Si marca la casilla <i>Intentar configurar automáticamente el redireccionamiento de puertos</i>, Vidalia intentará configurar automáticamente el redireccionamiento de puertos en la conexión de su red local para que otros clientes de Tor puedan conectarse a su repetidor; aunque no todos los routers soportan el redireccionamiento automático de puertos. Puede usar el botón <i>Prueba</i> junto a la casilla, para saber si Vidalia puede configurar automáticamente el redireccionamiento de puertos para usted." +msgstr "Si marca la casilla <i>Intentar configurar automáticamente el redireccionamiento de puertos</i>, Vidalia intentará configurar automáticamente el redireccionamiento de puertos de la conexión de su red local para que otros clientes de Tor puedan conectarse a su repetidor; aunque no todos los routers soportan el redireccionamiento automático de puertos. Puede usar el botón <i>Prueba</i> junto a la casilla, para saber si Vidalia puede configurar automáticamente el redireccionamiento de puertos por usted." #. type: Content of: <html><body><p> #: en/server.html:217

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit d5bb1174824bc39fbce9a0fbfcdbc30ebac05dff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 17:15:39 2012 +0000 Update translations for vidalia_help_completed --- es/server.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/server.po b/es/server.po index 2d116a1..9ed98a7 100644 --- a/es/server.po +++ b/es/server.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-28 11:42+0000\n" +"PO-Revision-Date: 2012-12-28 17:08+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -365,7 +365,7 @@ msgid "" "known as <i>port forwarding</i>. Port forwarding configures your router or " "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." -msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesitan saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como <i>redireccionamiento de puertos</i>. El redireccionamiento de puertos configura su router y/o firewall para \"redirigir\" todas las conexiones a estos por ciertos puertos, hacia los puertos locales adecuados en su ordenador." +msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesita saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como <i>redireccionamiento de puertos</i>. El redireccionamiento de puertos configura su router y/o firewall para \"redirigir\" todas las conexiones a ciertos puertos, hacia los puertos locales especificados en su ordenador." #. type: Content of: <html><body><p> #: en/server.html:208

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit 200ef6db50a7e8ea92fab08741af836c787f7e0b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 17:15:29 2012 +0000 Update translations for vidalia_help --- es/server.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/server.po b/es/server.po index 2d116a1..9ed98a7 100644 --- a/es/server.po +++ b/es/server.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-28 11:42+0000\n" +"PO-Revision-Date: 2012-12-28 17:08+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -365,7 +365,7 @@ msgid "" "known as <i>port forwarding</i>. Port forwarding configures your router or " "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." -msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesitan saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como <i>redireccionamiento de puertos</i>. El redireccionamiento de puertos configura su router y/o firewall para \"redirigir\" todas las conexiones a estos por ciertos puertos, hacia los puertos locales adecuados en su ordenador." +msgstr "Para hacer su repetidor accesible públicamente, su router y/o firewall necesita saber qué puertos permitir atravesar hasta su ordenador, configurando lo que se conoce como <i>redireccionamiento de puertos</i>. El redireccionamiento de puertos configura su router y/o firewall para \"redirigir\" todas las conexiones a ciertos puertos, hacia los puertos locales especificados en su ordenador." #. type: Content of: <html><body><p> #: en/server.html:208

1 0

r25975: {website} Projects Table Revisions General update for the volunteer pa (website/trunk/getinvolved/en)
by Damian Johnson 28 Dec '12

28 Dec '12

Author: atagar Date: 2012-12-28 17:01:06 +0000 (Fri, 28 Dec 2012) New Revision: 25975 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Projects Table Revisions General update for the volunteer page's projects table. This reverts quite a bit of Roger's additions in r25973 which added a bunch of projects without summaries or links (please don't do that!). Kept the good bits, though. :P * Merged Obfsproxy and PyObfsproxy. They both have the same project page, same bug tracker, and same description. Doing a joint listing is what we did for Onionoo too which has both a java and python implementation. * Dropping Anonbib. I asked arma about it on irc but he didn't reply. It's not a substantial coding project and the summary he wrote is essentially nothing. * Dropping "tor-ramdisk", "Tor cloud", "bridge-guard", "ExperimenTor", "Chutney", and "Torperf". They all had no summary and code/bug tracker links. If the author doesn't care enough about having their project listed to send those then we shouldn't list it. :) * Added missing link for torouter's code and Onionoo's bug tracker. * Removed the flag that Ooni Probe was in alpha. I'm not positive that it's in production, but it's been under highly active development long enough that I suspect it's ready. * Changed arm's description. It's definitely not still under active development, and the summary didn't really say what it *did*. * Adjust activity... * Flash Proxy: Moderate => Heavy ye god he's doing a ton of work! * Shadow: Moderate => Heavy again, almost daily improvements - I'm jealous * Txtorcon: Moderate => Heavy not as much as Flash Proxy or Shadow, but still unusually active * Ooni Probe: Moderate => Heavy not surprising, with multiple people dedicated to it * Tor2web: Light => Heavy lots 'o commits * Vidalia: Light => None chiiph has been gone for four months * Orbot: Moderate => Light no commits since October and I didn't find much activity on their github page... though things are so spread out it's hard to tell * Torouter: Light => None basically no activity since August * Torsocks: Heavy => Moderate no activity since October * Thandy: Light => None no commits since 2011 * Atlas: Moderate => Light essentially nothing since September * Compass: Heavy => Light nothing since September Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-12-27 21:00:00 UTC (rev 25974) +++ website/trunk/getinvolved/en/volunteer.wml 2012-12-28 17:01:06 UTC (rev 25975) @@ -140,7 +140,7 @@ <td><a href="#project-vidalia">Vidalia</a></td> <td>User Interface</td> <td>C++, Qt</td> - <td>Light</td> + <td>None</td> <td>chiiph</td> </tr> @@ -156,7 +156,7 @@ <td><a href="#project-orbot">Orbot</a></td> <td>User Interface</td> <td>Java</td> - <td>Moderate</td> + <td>Light</td> <td>n8fr8, ioerror</td> </tr> @@ -169,26 +169,10 @@ </tr> <tr> - <td><a href="#project-torramdisk">tor-ramdisk</a></td> - <td>OS image</td> - <td>Sys Admin</td> - <td>Light</td> - <td>blueness</td> - </tr> - - <tr class="alt"> - <td><a href="#project-torcloud">Tor cloud</a></td> - <td>OS image</td> - <td>Sys Admin</td> - <td>Light</td> - <td>runa</td> - </tr> - - <tr> <td>*<a href="#project-torouter">Torouter</a></td> <td>OS image</td> <td>Sys Admin</td> - <td>Light</td> + <td>None</td> <td>ioerror</td> </tr> @@ -196,7 +180,7 @@ <td><a href="#project-torsocks">Torsocks</a></td> <td>Usability</td> <td>C</td> - <td>Heavy</td> + <td>Moderate</td> <td>ioerror, nickm</td> </tr> @@ -212,39 +196,23 @@ <td><a href="#project-obfsproxy">Obfsproxy</a></td> <td>Client Add-on</td> <td>C</td> - <td>Light</td> - <td>nickm, asn</td> - </tr> - - <tr> - <td><a href="#project-pyobfsproxy">PyObfsproxy</a></td> - <td>Client Add-on</td> - <td>Python</td> <td>Moderate</td> - <td>asn</td> + <td>asn, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-flash-proxy">Flash Proxy</a></td> <td>Client Add-on</td> <td>Python, JavaScript, Go</td> - <td>Moderate</td> + <td>Heavy</td> <td>dcf, aallai, jct</td> </tr> - <tr> - <td><a href="#project-brdgrd">bridge-guard</a></td> - <td>Client Add-on</td> - <td>C</td> - <td>Light</td> - <td>phw</td> - </tr> - <tr class="alt"> <td>*<a href="#project-thandy">Thandy</a></td> <td>Updater</td> <td>Python</td> - <td>Light</td> + <td>None</td> <td>chiiph, Erinn, nickm</td> </tr> @@ -252,27 +220,11 @@ <td><a href="#project-shadow">Shadow</a></td> <td>Simulator</td> <td>C, Python</td> - <td>Moderate</td> + <td>Heavy</td> <td>robgjansen</td> </tr> <tr class="alt"> - <td><a href="#project-experimentor">ExperimenTor</a></td> - <td>Simulator</td> - <td>C, Perl</td> - <td>Light</td> - <td></td> - </tr> - - <tr> - <td><a href="#project-chutney">Chutney</a></td> - <td>Simulator</td> - <td>Python</td> - <td>Light</td> - <td>nickm</td> - </tr> - - <tr class="alt"> <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -284,7 +236,7 @@ <td><a href="#project-txtorcon">Txtorcon</a></td> <td>Library</td> <td>Python, Twisted</td> - <td>Moderate</td> + <td>Heavy</td> <td>meejah</td> </tr> @@ -316,7 +268,7 @@ <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> - <td>Moderate</td> + <td>Light</td> <td>hellais</td> </tr> @@ -332,19 +284,11 @@ <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> - <td>Heavy</td> + <td>Light</td> <td>gsathya, karsten</td> </tr> <tr class="alt"> - <td><a href="#project-torperf">Torperf</a></td> - <td>Client Service</td> - <td>C, Python</td> - <td>Light</td> - <td>karsten</td> - </tr> - - <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -352,7 +296,7 @@ <td>karsten, gsathya</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -360,7 +304,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -368,7 +312,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -376,7 +320,7 @@ <td>ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -384,15 +328,15 @@ <td>kaner, nickm</td> </tr> - <tr class="alt"> - <td>*<a href="#project-ooni-probe">Ooni Probe</a></td> + <tr> + <td><a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> - <td>Moderate</td> + <td>Heavy</td> <td>hellais, isis, ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -400,7 +344,7 @@ <td>aagbsn, mikeperry</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -408,22 +352,13 @@ <td>Sebastian</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-tor2web">Tor2web</a></td> <td>Client Service</td> - <td>python</td> - <td>Light</td> - <td>hellais, others</td> + <td>Python</td> + <td>Heavy</td> + <td>hellais</td> </tr> - - <tr class="alt"> - <td><a href="#project-anonbib">Anonbib</a></td> - <td>Website</td> - <td>python</td> - <td>Light</td> - <td>arma, nickm</td> - </tr> - </table> <sub> @@ -548,9 +483,11 @@ tracker</a>)</h3> <p> - Command-line monitor for Tor. This has been under very active development - by its author, Damian Johnson, since early 2009 to make it a better - general-purpose controller for *nix environments. + The anonymizing relay monitor (arm) is a terminal status monitor for Tor, + intended for command-line aficionados, ssh connections, and anyone with a + tty terminal. This works much like top does for system usage, providing + real time statistics for bandwidth, resource usage, connections, and quite + a bit more. </p>  - <a id="project-torramdisk"></a> - <h3><a href="http://opensource.dyc.edu/tor-ramdisk">Tor-ramdisk</a> (<a - href="">code</a>, <a - href="">bug tracker</a>)</h3> - - <p> - tor-ramdisk - </p> - - <a id="project-torcloud"></a> - <h3><a href="https://cloud.torproject.org/">Tor cloud</a> (<a - href="">code</a>, <a - href="">bug tracker</a>)</h3> - - <p> - Tor cloud - </p> - <a id="project-torouter"></a> <h3><a href="<wiki>doc/Torouter">Torouter</a> (<a + href="https://gitweb.torproject.org/torouter.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -670,13 +590,15 @@ <a id="project-obfsproxy"></a> <h3><a href="<page projects/obfsproxy>">Obfsproxy</a> (<a - href="https://gitweb.torproject.org/obfsproxy.git">code</a>, <a + href="https://gitweb.torproject.org/obfsproxy.git">C codebase</a>, <a + href="https://gitweb.torproject.org/user/asn/pyobfsproxy.git">python + codebase</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> A proxy that shapes Tor traffic, making it harder for censors to detect and - block Tor. + block Tor. This has both a C and python implementation. </p>  - <a id="project-pyobfsproxy"></a> - <h3><a href="<page projects/obfsproxy>">PyObfsproxy</a> (<a - href="https://gitweb.torproject.org/user/asn/pyobfsproxy.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug - tracker</a>)</h3> - - <p> - PyObfsproxy is a Python reimplementation of Obfsproxy, with the goal of - improving its agility in responding to new censor actions. - </p> - <a id="project-flash-proxy"></a> <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a @@ -742,26 +653,6 @@ accurate, efficient, controlled, and repeatable Tor experimentation. </p> - <a id="project-experimentor"></a> - <h3><a href="">ExperimenTor</a> (<a - href="">code</a>, <a - href="">bug - tracker</a>)</h3> - - <p> - ExperimenTor - </p> - - <a id="project-chutney"></a> - <h3><a href="">Chutney</a> (<a - href="">code</a>, <a - href="">bug - tracker</a>)</h3> - - <p> - Chutney - </p> - <a id="project-stem"></a> <h3><a href="https://stem.torproject.org/">Stem</a> (<a href="https://gitweb.torproject.org/stem.git">code</a>, <a @@ -873,21 +764,11 @@ <i><a href="#compassRefactoring">Compass Refactoring</a></i> </p> - <a id="project-torperf"></a> - <h3><a href="">Torperf</a> (<a - href="">code</a>, <a - href="">bug - tracker</a>)</h3> - - <p> - TorPerf - </p> - <a id="project-onionoo"></a> <h3><a href="<page projects/onionoo>">Onionoo</a> (<a href="https://gitweb.torproject.org/onionoo.git">java codebase</a>, <a href="https://gitweb.torproject.org/pyonionoo.git">python - codebase</a>)</h3> + codebase</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> Onionoo is a JSON based protocol to learn information about currently @@ -993,15 +874,6 @@ distributed to non-anonymous users. </p> - <a id="project-anonbib"></a> - <h3><a - href="http://freehaven.net/anonbib/">Anonymity Bibliography</a> (<a - href="https://gitweb.torproject.org/anonbib.git">code</a>)</h3> - - <p> - anonbib - </p> - <a id="Coding"></a> <a id="Summer"></a> <h2><a class="anchor" href="#Coding">Project Ideas</a></h2>

1 0

[flashproxy/master] Set cookie using expires instead of max-age.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit d2005a167b3ddce5f1947ab14a04d94896c803e1 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Dec 5 22:25:16 2012 -0500 Set cookie using expires instead of max-age. max-age is not supported in Internet Explorer. Also add / as path parameter so the badge can be hosted anywhere on the domain. --- proxy/options.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 1377373..350b472 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -3,8 +3,8 @@ code should run or disable itself. */ var COOKIE_NAME = "flashproxy"; -/* In seconds. */ -var COOKIE_LIFETIME = 60 * 60 * 24 * 365; +/* max-age is not supported in IE. */ +var COOKIE_LIFETIME = "Thu, 01 Jan 2020 00:00:00 GMT"; window.addEventListener("load", function () { @@ -38,11 +38,11 @@ window.addEventListener("load", function () { } function set_cookie() { - document.cookie = COOKIE_NAME + "=; max-age=" + COOKIE_LIFETIME; + document.cookie = COOKIE_NAME + "= ;path=/ ;expires=" + COOKIE_LIFETIME; } function del_cookie() { - document.cookie = COOKIE_NAME + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT"; + document.cookie = COOKIE_NAME + "= ;path=/ ;expires=Thu, 01 Jan 1970 00:00:00 GMT"; } if (cookies_enabled()) {

1 0

[flashproxy/master] Remove comment which is no longer relevant.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 26afbf68754eb6284c66b5bc2d336b2900dc7bbf Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Dec 6 15:09:50 2012 -0500 Remove comment which is no longer relevant. Remove a comment which descibed a function argument which was removed in the previous commit. --- proxy/options.js | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 665ab31..326043e 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -8,7 +8,6 @@ var COOKIE_LIFETIME = "Thu, 01 Jan 2020 00:00:00 GMT"; window.addEventListener("load", function () { - /* Checks for a cookie with name cookie */ function cookie_present() { var cookies = document.cookie.split(";");

1 0

[flashproxy/master] Change badge links to point to options page.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 435e89553dc2dd5c77eec2325ac92aa5d6452e24 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Dec 5 22:30:24 2012 -0500 Change badge links to point to options page. Badge links to options page instead of crypto.stanford.edu. Link assumes the options page is hosted in the same directory as the badge. --- proxy/embed.html | 2 +- proxy/flashproxy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/embed.html b/proxy/embed.html index 95821ce..9524f9c 100644 --- a/proxy/embed.html +++ b/proxy/embed.html @@ -81,7 +81,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<table id="flashproxy-badge" class="disabled"><tr><td><a href="//crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> +<table id="flashproxy-badge" class="disabled"><tr><td><a href="options.html" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> </noscript> </body> </html> diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 13a77f5..704e514 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -794,7 +794,7 @@ function Badge() { td = document.createElement("td"); tr.appendChild(td); a = document.createElement("a"); - a.setAttribute("href", "http://crypto.stanford.edu/flashproxy/"); + a.setAttribute("href", "options.html"); a.setAttribute("target", "_parent"); td.appendChild(a); img = document.createElement("img");

1 0

[flashproxy/master] Add wrapper function to attach DOM events.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit e2d353475109bfa587a685c006818980572974cb Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Dec 6 19:03:59 2012 -0500 Add wrapper function to attach DOM events. The current code uses the standard addEventListener which is not supported in IE <= 8. Add a small wrapper function which uses the IE attachEvent method if it is available. --- proxy/options.js | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 326043e..f39f358 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -6,7 +6,16 @@ var COOKIE_NAME = "flashproxy"; /* max-age is not supported in IE. */ var COOKIE_LIFETIME = "Thu, 01 Jan 2020 00:00:00 GMT"; -window.addEventListener("load", function () { +/* This wrapper will attach events correctly in older + versions of IE. */ +function add_event(elem, evt, handler) { + if (elem.attachEvent) + elem.attachEvent("on" + evt, handler); + else + elem.addEventListener(evt, handler); +} + +add_event(window, "load", function () { function cookie_present() { var cookies = document.cookie.split(";"); @@ -46,9 +55,9 @@ window.addEventListener("load", function () { if (navigator.cookieEnabled) { var buttons = document.getElementById("buttons"); - buttons.addEventListener("click", update_setting_text); - document.getElementById("yes").addEventListener("click", set_cookie); - document.getElementById("no").addEventListener("click", del_cookie); + add_event(buttons, "click", update_setting_text); + add_event(document.getElementById("yes"), "click", set_cookie); + add_event(document.getElementById("no"), "click", del_cookie); buttons.style.display = "block"; update_setting_text(); } else {

1 0

[flashproxy/master] Check for cookie by iterating through cookie names.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit a0a9f4caefa8d7a1189ab9984bcd1d62b25e3c3a Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Dec 6 14:37:08 2012 -0500 Check for cookie by iterating through cookie names. Check is currently done by searching entire document.cookie string for the cookie name. If an unrelated cookie has this name in its value, the cookie is incorrectly considered to be present. --- proxy/options.js | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 350b472..c10b189 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -17,7 +17,22 @@ window.addEventListener("load", function () { return true; } else if (navigator.cookieEnabled === undefined) { document.cookie = "test"; - if (document.cookie.indexOf("test") !== -1) + if (cookie_present("test")) + return true; + } + return false; + } + + /* Checks for a cookie with name cookie */ + function cookie_present(cookie) { + var cookies = document.cookie.split(";"); + + for (i in cookies) { + var name = cookies[i].split("=")[0]; + + while (name[0] === " ") + name = name.substr(1); + if (cookie === name) return true; } return false; @@ -28,7 +43,7 @@ window.addEventListener("load", function () { var setting = document.getElementById("setting"); var prefix = "<p>Your current setting is: "; - if (document.cookie.indexOf(COOKIE_NAME) !== -1) { + if (cookie_present(COOKIE_NAME)) { setting.innerHTML = prefix + "use my browser as a proxy. " + "Click no below to change your setting.</p>"; } else {

1 0

[flashproxy/master] Do not set test cookie to determine if cookies are enabled.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit dc50e832589bda7bf5851f7ef7c05a83fb7b93e1 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Dec 6 14:49:39 2012 -0500 Do not set test cookie to determine if cookies are enabled. If navigator.cookieEnabled is undefined, the current code will fall back to setting a test cookie to determine if cookies are enabled. This may overwrite an already present cookie, and may cause trouble for people who wish to host the badge on their own websites. This drops support for older browsers such as IE <= 4 and Netscape <= 6 (each more than 10 years old). --- proxy/options.js | 23 ++++------------------- 1 files changed, 4 insertions(+), 19 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index c10b189..665ab31 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -8,23 +8,8 @@ var COOKIE_LIFETIME = "Thu, 01 Jan 2020 00:00:00 GMT"; window.addEventListener("load", function () { - /* This checks if cookies are enabled in the browser. - document.cookie has special behavior, if cookies - are disabled it will not retain any values stored in it. */ - function cookies_enabled() { - /*Not supported in all browsers.*/ - if (navigator.cookieEnabled) { - return true; - } else if (navigator.cookieEnabled === undefined) { - document.cookie = "test"; - if (cookie_present("test")) - return true; - } - return false; - } - /* Checks for a cookie with name cookie */ - function cookie_present(cookie) { + function cookie_present() { var cookies = document.cookie.split(";"); for (i in cookies) { @@ -32,7 +17,7 @@ window.addEventListener("load", function () { while (name[0] === " ") name = name.substr(1); - if (cookie === name) + if (COOKIE_NAME === name) return true; } return false; @@ -43,7 +28,7 @@ window.addEventListener("load", function () { var setting = document.getElementById("setting"); var prefix = "<p>Your current setting is: "; - if (cookie_present(COOKIE_NAME)) { + if (cookie_present()) { setting.innerHTML = prefix + "use my browser as a proxy. " + "Click no below to change your setting.</p>"; } else { @@ -60,7 +45,7 @@ window.addEventListener("load", function () { document.cookie = COOKIE_NAME + "= ;path=/ ;expires=Thu, 01 Jan 1970 00:00:00 GMT"; } - if (cookies_enabled()) { + if (navigator.cookieEnabled) { var buttons = document.getElementById("buttons"); buttons.addEventListener("click", update_setting_text); document.getElementById("yes").addEventListener("click", set_cookie);

1 0