- tor-commits - lists.torproject.org

[flashproxy/master] Copy parse_cookie_string to options.html.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 451912bfcfe591d389b13cadb70851d3fb09c788 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 25 12:11:55 2012 -0800 Copy parse_cookie_string to options.html. --- proxy/options.html | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 59f0125..b7e8c59 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -81,23 +81,38 @@ function set_cookie_disallowed() { document.cookie = COOKIE_NAME + "=0 ;path=/ ;expires=" + COOKIE_LIFETIME; } -/* Returns the value of the cookie, or undefined - if the cookie is not present. */ -function read_cookie() { - var str, j; - var cookies = document.cookie.split(";"); +function parse_cookie_string(cookies) { + var strings; + var result; - for (i in cookies) { - str = cookies[i]; + result = {}; + if (cookies) + strings = cookies.split(";"); + else + strings = []; + for (var i = 0; i < strings.length; i++) { + var string = strings[i]; + var j, name, value; - while (str[0] === " ") - str = str.substr(1); + j = string.indexOf("="); + if (j === -1) { + return null; + } + name = decodeURIComponent(string.substr(0, j).trim()); + value = decodeURIComponent(string.substr(j + 1).trim()); - j = str.indexOf("="); - if (COOKIE_NAME === str.substr(0, j)) - return str.substr(j + 1); + if (!(name in result)) + result[name] = value; } - return undefined; + + return result; +} + +/* Returns the value of the cookie, or undefined + if the cookie is not present. */ +function read_cookie() { + var cookies = parse_cookie_string(document.cookie); + return cookies[COOKIE_NAME]; } /* Updates the text telling the user what his current setting is.*/

1 0

[flashproxy/master] Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit d3dd285f70bb727db8d26fef4510bf4a2dfe170c Merge: 545a690 9ab1414 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 28 06:08:09 2012 -0800 Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in proxy/flashproxy-test.js | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-)

1 0

[flashproxy/master] Add a couple more cookie tests.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 10d23f9ee2a3f305807807b88c44ae42da1247ba Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 28 06:11:06 2012 -0800 Add a couple more cookie tests. --- proxy/flashproxy-test.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index 4c82376..aed5247 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -129,6 +129,10 @@ function test_parse_cookie_string() expected: {a: "b" } }, { cs: "a=", expected: { a: "" } }, + { cs: "key", + expected: null }, + { cs: "key=%26%20", + expected: { key: "& " } }, { cs: "a=\"\"", expected: { a: "\"\"" } }, ];

1 0

[flashproxy/master] Strip whitespace in cookie parsing tests.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit b9ebfac6910d4464e11825b2d2439de9b23c0e43 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 28 06:10:05 2012 -0800 Strip whitespace in cookie parsing tests. --- proxy/flashproxy-test.js | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index 19a830d..4c82376 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -124,10 +124,9 @@ function test_parse_cookie_string() { cs: "a=b; c=d", expected: { a: "b", c: "d" } }, { cs: "a=b ; c=d", - expected: { a: "b ", c: "d" } }, + expected: { a: "b", c: "d" } }, { cs: "a= b", - expected: {a: " b" } }, - /* The '=' character is always present. */ + expected: {a: "b" } }, { cs: "a=", expected: { a: "" } }, { cs: "a=\"\"",

1 0

[flashproxy/master] Adding opt-in page html and javascript.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 1f20f598494fba8612472545272d721f8f45468c Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:33:33 2012 -0500 Adding opt-in page html and javascript. Adding some functional html and javascript for the opt-in page (ticket #7063). There is no CSS for the page yet. --- proxy/options.html | 32 +++++++++++++++++++++++++ proxy/options.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/proxy/options.html b/proxy/options.html new file mode 100644 index 0000000..109c626 --- /dev/null +++ b/proxy/options.html @@ -0,0 +1,32 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8"> +</head> +<body> +<div> + <h4>Flash proxy options</h4> + <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: <img src="badge.png" alt="Internet Freedom"> + </p> + <p> + <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. + </p> +</div> +<div id="setting"> +</div> +<div id="buttons" style="display: none;"> + <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> +</div> +<script type="text/javascript" src="options.js"></script> +</body> +</html> diff --git a/proxy/options.js b/proxy/options.js new file mode 100644 index 0000000..9dd06d2 --- /dev/null +++ b/proxy/options.js @@ -0,0 +1,66 @@ +/* This is the javascript for the opt-in page. It sets/deletes + a cookie which controls whether the flashproxy javascript + code should run or disable itself. */ + +var COOKIE_NAME = "flashproxy"; +/* In seconds. */ +var COOKIE_LIFETIME = 60 * 60 * 24 * 365; + +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 (document.cookie.indexOf("test") !== -1) + return true; + } + return false; + } + + /* Updates the text telling the user what his current setting is. + According to the DOM level 2 specification, + http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038, + document.cookie is always defined and non-null, so this function + is safe if cookies are disabled. */ + function update_setting_text() { + var setting = document.getElementById("setting"); + var prefix = "<p>Your current setting is: "; + + if (document.cookie.indexOf(COOKIE_NAME) !== -1) { + setting.innerHTML = prefix + "use my browser as a proxy. " + + "Click no below to change your setting.</p>"; + } else { + setting.innerHTML = prefix + "do not use my browser as a proxy. " + + "Click yes below to change your setting.</p>"; + } + } + + function set_cookie() { + document.cookie = COOKIE_NAME + "=; max-age=" + COOKIE_LIFETIME; + } + + function del_cookie() { + document.cookie = COOKIE_NAME + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT"; + } + + if (cookies_enabled()) { + 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); + buttons.style.display = "block"; + update_setting_text(); + } else { + document.getElementById("cookies_disabled").style.display = "block"; + /* Manually set the text here as it refers to the buttons, + which won't show up if cookies are disabled. */ + document.getElementById("setting").innerHTML = "<p>Your current setting is: " + + "do not use my browser as a proxy.</p>"; + } +});

1 0

[flashproxy/master] Add opt-in page html and javascript.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 453589d0c15428428a48970c416be3748b90d7fd Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:33:33 2012 -0500 Add opt-in page html and javascript. Add some functional html and javascript for the opt-in page (ticket #7063). There is no CSS for the page yet. --- proxy/options.html | 32 +++++++++++++++++++++++++ proxy/options.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/proxy/options.html b/proxy/options.html new file mode 100644 index 0000000..109c626 --- /dev/null +++ b/proxy/options.html @@ -0,0 +1,32 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8"> +</head> +<body> +<div> + <h4>Flash proxy options</h4> + <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: <img src="badge.png" alt="Internet Freedom"> + </p> + <p> + <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. + </p> +</div> +<div id="setting"> +</div> +<div id="buttons" style="display: none;"> + <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> +</div> +<script type="text/javascript" src="options.js"></script> +</body> +</html> diff --git a/proxy/options.js b/proxy/options.js new file mode 100644 index 0000000..9dd06d2 --- /dev/null +++ b/proxy/options.js @@ -0,0 +1,66 @@ +/* This is the javascript for the opt-in page. It sets/deletes + a cookie which controls whether the flashproxy javascript + code should run or disable itself. */ + +var COOKIE_NAME = "flashproxy"; +/* In seconds. */ +var COOKIE_LIFETIME = 60 * 60 * 24 * 365; + +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 (document.cookie.indexOf("test") !== -1) + return true; + } + return false; + } + + /* Updates the text telling the user what his current setting is. + According to the DOM level 2 specification, + http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038, + document.cookie is always defined and non-null, so this function + is safe if cookies are disabled. */ + function update_setting_text() { + var setting = document.getElementById("setting"); + var prefix = "<p>Your current setting is: "; + + if (document.cookie.indexOf(COOKIE_NAME) !== -1) { + setting.innerHTML = prefix + "use my browser as a proxy. " + + "Click no below to change your setting.</p>"; + } else { + setting.innerHTML = prefix + "do not use my browser as a proxy. " + + "Click yes below to change your setting.</p>"; + } + } + + function set_cookie() { + document.cookie = COOKIE_NAME + "=; max-age=" + COOKIE_LIFETIME; + } + + function del_cookie() { + document.cookie = COOKIE_NAME + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT"; + } + + if (cookies_enabled()) { + 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); + buttons.style.display = "block"; + update_setting_text(); + } else { + document.getElementById("cookies_disabled").style.display = "block"; + /* Manually set the text here as it refers to the buttons, + which won't show up if cookies are disabled. */ + document.getElementById("setting").innerHTML = "<p>Your current setting is: " + + "do not use my browser as a proxy.</p>"; + } +});

1 0

[flashproxy/master] Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit fcc67c203e7246e4cd92f1fdeea2f16e3d3562bd Merge: 453589d 1f20f59 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:39:48 2012 -0500 Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in

1 0

[flashproxy/master] Clarify a comment.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 790d91fbd1c278b70459d11629c18636837a11a8 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Dec 5 19:47:38 2012 -0500 Clarify a comment. The wording of the comment about manually setting text about the user's setting is confusing, stating the manually-set text refers to the page buttons, which it doesn't. --- proxy/options.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 5e3a9df..1377373 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -54,8 +54,8 @@ window.addEventListener("load", function () { update_setting_text(); } else { document.getElementById("cookies_disabled").style.display = "block"; - /* Manually set the text here as it refers to the buttons, - which won't show up if cookies are disabled. */ + /* Manually set the text here as otherwise it will refer to + the buttons, which don't show if cookies are disabled. */ document.getElementById("setting").innerHTML = "<p>Your current setting is: " + "do not use my browser as a proxy.</p>"; }

1 0

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

28 Dec '12

commit 320a03e473ce29072540bf40d7f507ccd7db91f4 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:43:23 2012 -0500 Remove comment that is no longer relevant. Remove the comment above update_setting_text which asserts the function is safe to call with cookies disabled, since it is no longer called when cookies are disabled. --- proxy/options.js | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 9dd06d2..5e3a9df 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -23,11 +23,7 @@ window.addEventListener("load", function () { return false; } - /* Updates the text telling the user what his current setting is. - According to the DOM level 2 specification, - http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038, - document.cookie is always defined and non-null, so this function - is safe if cookies are disabled. */ + /* Updates the text telling the user what his current setting is.*/ function update_setting_text() { var setting = document.getElementById("setting"); var prefix = "<p>Your current setting is: ";

1 0

[flashproxy/master] Add CSS and noscript for options page.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 13711698e9326138dc5dd176080581b21829379b Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Dec 5 22:23:15 2012 -0500 Add CSS and noscript for options page. Add CSS for the options page, largely borrowed from crypto.stanford.edu/flashproxy. Also add a noscript tag in case the user has JavaScript disabled. The top-gradient.gif file is used in the background for the CSS. --- proxy/options.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++- proxy/top-gradient.gif | Bin 0 -> 1992 bytes 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 109c626..343aab7 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -2,20 +2,69 @@ <html> <head> <meta charset="utf-8"> +<style type="text/css"> +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; +} +.content { + 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; +} +p { + margin: 7px; +} +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> +<div class="content"> <div> - <h4>Flash proxy options</h4> + <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: <img src="badge.png" alt="Internet Freedom"> + 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> +</noscript> <div id="setting"> </div> <div id="buttons" style="display: none;"> @@ -27,6 +76,7 @@ order to set flash proxy settings. </p> </div> +</div> <script type="text/javascript" src="options.js"></script> </body> </html> diff --git a/proxy/top-gradient.gif b/proxy/top-gradient.gif new file mode 100644 index 0000000..ba8e7ca Binary files /dev/null and b/proxy/top-gradient.gif differ

1 0