tor-commits December 2012

tor-commits@lists.torproject.org

17 participants
1600 discussions

[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

[flashproxy/master] Remove top-gradient.gif.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 7d59a3596793cf6119be4c8037ddf312e4bed833 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 16:56:26 2012 -0800 Remove top-gradient.gif. --- proxy/options.html | 2 -- proxy/top-gradient.gif | Bin 1992 -> 0 bytes 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 343aab7..3387dae 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -6,8 +6,6 @@ body { font-family: Calibri, Arial, sans-serif; font-size: small; - background-image: url(top-gradient.gif); - background-repeat: repeat-x; background-color: #E7D19A; text-align: center; } diff --git a/proxy/top-gradient.gif b/proxy/top-gradient.gif deleted file mode 100644 index ba8e7ca..0000000 Binary files a/proxy/top-gradient.gif and /dev/null differ

1 0

[flashproxy/master] Whitespace in options.html.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 6d558301e413db7f522e554fb23b22d2c95c5e91 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 17:11:26 2012 -0800 Whitespace in options.html. --- proxy/options.html | 86 ++++++++++++++++++++++++++-------------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 3387dae..efe57bc 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -4,75 +4,75 @@ <meta charset="utf-8"> <style type="text/css"> body { - font-family: Calibri, Arial, sans-serif; - font-size: small; - background-color: #E7D19A; - text-align: center; + font-family: Calibri, Arial, sans-serif; + font-size: small; + background-color: #E7D19A; + text-align: center; } .content { - width: 760px; - margin: 0 auto; - background-color: white; - text-align: left; - border-style: solid; - border-width: 1px; - border-color: #D0A760; + width: 760px; + margin: 0 auto; + background-color: white; + text-align: left; + border-style: solid; + border-width: 1px; + border-color: #D0A760; } h1 { - padding: 18px 7px; - margin: 0 auto; - background-color: #900; - color: white; - font-size: 200%; - font-weight: bold; + padding: 18px 7px; + margin: 0 auto; + background-color: #900; + color: white; + font-size: 200%; + font-weight: bold; } p { - margin: 7px; + margin: 7px; } button { - margin: 0px 7px 7px; + margin: 0px 7px 7px; } .blank-link { - text-decoration: none; - color: white; + text-decoration: none; + color: white; } #flashproxy-badge { - background-color: #227; - vertical-align: middle; - margin-left: 2px; + background-color: #227; + vertical-align: middle; + margin-left: 2px; } </style> </head> <body> <div class="content"> <div> - <h1>Flash proxy options</h1> - <p> - This page enables you to use your web browser as a proxy to help - censored Internet users. When you click yes, your browser will act as a - censorship circumvention proxy as long as you are viewing a page with the - flash proxy badge:<a class="blank-link" href="http://crypto.stanford.edu/flashproxy/"><img id="flashproxy-badge" src="badge.png" alt="Internet Freedom"></a>. - </p> - <p> - <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. - </p> +<h1>Flash proxy options</h1> +<p> +This page enables you to use your web browser as a proxy to help +censored Internet users. When you click yes, your browser will act as a +censorship circumvention proxy as long as you are viewing a page with +the flash proxy badge: <a class="blank-link" href="http://crypto.stanford.edu/flashproxy/"><img id="flashproxy-badge" src="badge.png" alt="Internet Freedom"></a>. +</p> +<p> +<a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. +</p> </div> <noscript> - <p> - While javascript is disabled, your computer will not be a proxy. - Enable JavaScript to change your options. - </p> +<p> +While JavaScript is disabled, your computer will not be a proxy. Enable +JavaScript to change your options. +</p> </noscript> <div id="setting"> </div> <div id="buttons" style="display: none;"> - <button id="yes">Yes</button><button id="no">No</button> +<button id="yes">Yes</button><button id="no">No</button> </div> <div id="cookies_disabled" style="display: none;"> - <p> - It seems your browser has cookies disabled. You will need to enable them in - order to set flash proxy settings. - </p> +<p> +It seems your browser has cookies disabled. You will need to enable them +in order to set flash proxy settings. +</p> </div> </div> <script type="text/javascript" src="options.js"></script>

1 0

[flashproxy/master] Simplify setting and deletion of cookie.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 103f936ccf49d1a5e7ebb9e789429b781899b749 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 17:18:53 2012 -0800 Simplify setting and deletion of cookie. Use onclick handlers so it's more obvious from the HTML what clicking the buttons will do. Use "allowed" and "disallowed" to make it clear what the presence of the cookie means. --- proxy/options.html | 3 ++- proxy/options.js | 18 ++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index efe57bc..d9f70a3 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -66,7 +66,8 @@ JavaScript to change your options. <div id="setting"> </div> <div id="buttons" style="display: none;"> -<button id="yes">Yes</button><button id="no">No</button> +<button onclick="set_cookie_allowed()">Yes</button> +<button onclick="set_cookie_disallowed()">No</button> </div> <div id="cookies_disabled" style="display: none;"> <p> diff --git a/proxy/options.js b/proxy/options.js index f39f358..8382240 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -15,6 +15,14 @@ function add_event(elem, evt, handler) { elem.addEventListener(evt, handler); } +function set_cookie_allowed() { + document.cookie = COOKIE_NAME + "= ;path=/ ;expires=" + COOKIE_LIFETIME; +} + +function set_cookie_disallowed() { + document.cookie = COOKIE_NAME + "= ;path=/ ;expires=Thu, 01 Jan 1970 00:00:00 GMT"; +} + add_event(window, "load", function () { function cookie_present() { @@ -45,19 +53,9 @@ add_event(window, "load", function () { } } - function set_cookie() { - document.cookie = COOKIE_NAME + "= ;path=/ ;expires=" + COOKIE_LIFETIME; - } - - function del_cookie() { - document.cookie = COOKIE_NAME + "= ;path=/ ;expires=Thu, 01 Jan 1970 00:00:00 GMT"; - } - if (navigator.cookieEnabled) { var buttons = document.getElementById("buttons"); 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] Remove the image of the badge from the options page.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 5907288eae31f25adc7c2ba8da1796ce4a8ba15e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 17:22:57 2012 -0800 Remove the image of the badge from the options page. It's not clear that the image is not a real running badge. --- proxy/options.html | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index d9f70a3..f5c03a3 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -32,15 +32,6 @@ p { button { margin: 0px 7px 7px; } -.blank-link { - text-decoration: none; - color: white; -} -#flashproxy-badge { - background-color: #227; - vertical-align: middle; - margin-left: 2px; -} </style> </head> <body> @@ -51,7 +42,7 @@ button { This page enables you to use your web browser as a proxy to help censored Internet users. When you click yes, your browser will act as a censorship circumvention proxy as long as you are viewing a page with -the flash proxy badge: <a class="blank-link" href="http://crypto.stanford.edu/flashproxy/"><img id="flashproxy-badge" src="badge.png" alt="Internet Freedom"></a>. +the flash proxy badge. </p> <p> <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>.

1 0

[flashproxy/master] Use boolean value for the cookie.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 3a4d9af597e6ec0a48e830e6421048d45bc76eec Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 17:21:15 2012 -0800 Use boolean value for the cookie. Instead of relying on simple presence/absence, use a value of 1 or 0. --- proxy/options.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 8382240..c9a8713 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -16,11 +16,11 @@ function add_event(elem, evt, handler) { } function set_cookie_allowed() { - document.cookie = COOKIE_NAME + "= ;path=/ ;expires=" + COOKIE_LIFETIME; + document.cookie = COOKIE_NAME + "=1;path=/ ;expires=" + COOKIE_LIFETIME; } function set_cookie_disallowed() { - document.cookie = COOKIE_NAME + "= ;path=/ ;expires=Thu, 01 Jan 1970 00:00:00 GMT"; + document.cookie = COOKIE_NAME + "=0;path=/ ;expires=" + COOKIE_LIFETIME; } add_event(window, "load", function () {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2012