May 2012 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 22 May '12

22 May '12

commit e9dc3d04168e556ef8d535510cb171d5b57eea9f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 22 06:45:14 2012 +0000 Update translations for vidalia_alpha --- fr/vidalia_fr.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index 3134873..3ae2d0e 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -1,6 +1,7 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2012. +# Jonathan Metzman <jon.metzman(a)gmail.com>, 2012. # Pierre Antoine <pierre.antoine(a)ieee.org>, 2011. # <pouicpouicpouic(a)gmail.com>, 2011. # Sylvie SEGUI <seguisylvie(a)yahoo.fr>, 2012. @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-30 12:14+0000\n" -"Last-Translator: arpalord <arpalord(a)gmail.com>\n" +"PO-Revision-Date: 2012-05-22 06:44+0000\n" +"Last-Translator: Jonathan Metzman <jon.metzman(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -198,30 +199,30 @@ msgstr "Sélectionnez un fichier à utiliser pour le chemin de la socket de Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Configurer automatiquement le ControlPort" msgctxt "AdvancedPage" msgid "" "WARNING: If you hand pick the password it will be saved as plain text" " in Vidalia's configuration file. Using a random password is safer." -msgstr "" +msgstr " AVERTISSEMENT : Si vous choisissez vous-même le mot de passe, il sera enregistré en tant que texte brut dans le fichier de configuration de Vidalia. L'utilisation d'un mot de passe aléatoire est plus sûr." msgctxt "AdvancedPage" msgid "Panic" -msgstr "" +msgstr "Panique" msgctxt "AdvancedPage" msgid "" "WARNING: The panic button will erease the application if pressed" -msgstr "" +msgstr " AVERTISSEMENT : Le bouton de panique va effacer l'application si elle est pressée" msgctxt "AdvancedPage" msgid "Enable panic button" -msgstr "" +msgstr "Activer le bouton de panique" msgctxt "AdvancedPage" msgid "Panic path:" -msgstr "" +msgstr "Chemin de panique:" msgctxt "AdvancedPage" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 22 May '12

22 May '12

commit 7dbb3301dd6c26e0e956f4403a6a45d91247bae3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 22 06:45:10 2012 +0000 Update translations for vidalia --- fr/vidalia_fr.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index ebb7d39..bb1460f 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -1,6 +1,7 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2012. +# Jonathan Metzman <jon.metzman(a)gmail.com>, 2012. # mehditaileb <mehditaileb(a)liberte-info.net>, 2011. # Pierre Antoine <pierre.antoine(a)ieee.org>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-30 12:25+0000\n" -"Last-Translator: arpalord <arpalord(a)gmail.com>\n" +"PO-Revision-Date: 2012-05-22 06:30+0000\n" +"Last-Translator: Jonathan Metzman <jon.metzman(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3120,7 +3121,7 @@ msgstr "Trafic du relai pour le réseau Tor (point de sortie)" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Relay traffic inside the Tor network (non-exit relay)" msgctxt "ServerPage" msgid "Mirror the Relay Directory"

1 0

r25651: {website} update mirror lists. (in website/trunk: . include)
by Andrew Lewman 21 May '12

21 May '12

Author: phobos Date: 2012-05-21 15:59:12 +0000 (Mon, 21 May 2012) New Revision: 25651 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirror lists. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-05-20 08:25:31 UTC (rev 25650) +++ website/trunk/include/mirrors-table.wmi 2012-05-21 15:59:12 UTC (rev 25651) @@ -103,6 +103,23 @@ <tr> + <td>IS</td> + + <td>torproject.is</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IT</td> <td></td> @@ -188,23 +205,6 @@ <tr> - <td>US</td> - - <td>hessmo</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>LT</td> <td></td> @@ -562,40 +562,6 @@ <tr> - <td>INT</td> - - <td>CoralCDN</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IL</td> <td>Host4site</td> @@ -683,14 +649,14 @@ <td>PT</td> - <td></td> + <td>5ª Coluna</td> <td>Out of date</td> <td> - </td> - <td><a href="http://5coluna.com/downloads/tor/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> <td> - </td> - <td><a href="https://5coluna.com/downloads/tor/">https</a></td> + <td><a href="https://torproject.pt/dist/">https</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -715,6 +681,23 @@ <tr> + <td>US</td> + + <td>hessmo</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td></td> @@ -732,6 +715,23 @@ <tr> + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>crypto.is</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-05-20 08:25:31 UTC (rev 25650) +++ website/trunk/update-mirrors.pl 2012-05-21 15:59:12 UTC (rev 25651) @@ -839,7 +839,7 @@ }, mirror057 => { adminContact => "", - orgName => "", + orgName => "5ª Coluna", isoCC => "PT", subRegion => "", region => "PT", @@ -850,8 +850,8 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://5coluna.com/downloads/tor/", - httpsDistMirror => "https://5coluna.com/downloads/tor/", + httpDistMirror => "http://torproject.pt/", + httpsDistMirror => "https://torproject.pt/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", },

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 21 May '12

21 May '12

commit 87e1b8d3da6f7ecf1d0f8681d9e916629da4f31d Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 21 08:45:31 2012 +0000 Update translations for https_everywhere_completed --- ar/ssl-observatory.dtd | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index 428fb21..a0c383e 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -84,4 +84,7 @@ www.something.com, ولكن ليس من قام بالزيارة أو الصفح <!ENTITY ssl-observatory.warning.text "أصدر مرصد SSLمن الـEFF تحذيراً حول شهادات HTTPS لهذا الموقع:"> <!ENTITY ssl-observatory.warning.defense "إن كنت مسجل الدخول إلى هذا الموقع، ننصحك بتغيير كلمة السر باستخدام اتصال آمن بالإنترنت."> - +<!ENTITY ssl-observatory.prefs.self_signed +"قدم و تحقق من الشهادات الموثقة بشكل ذاتي"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"هذا مفضل , فمشاكل التشفير شائعة بشكل خاص في الأجهزة المدمجة">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 21 May '12

21 May '12

commit f11a20f1c165e357fe38e4ba587baaad74a5ce46 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 21 08:45:28 2012 +0000 Update translations for https_everywhere --- ar/ssl-observatory.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index e72ce60..a0c383e 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -85,6 +85,6 @@ www.something.com, ولكن ليس من قام بالزيارة أو الصفح <!ENTITY ssl-observatory.warning.defense "إن كنت مسجل الدخول إلى هذا الموقع، ننصحك بتغيير كلمة السر باستخدام اتصال آمن بالإنترنت."> <!ENTITY ssl-observatory.prefs.self_signed -""> +"قدم و تحقق من الشهادات الموثقة بشكل ذاتي"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -""> +"هذا مفضل , فمشاكل التشفير شائعة بشكل خاص في الأجهزة المدمجة">

1 0

[stem/master] Adding separate funtion for launching tor with tmp torrc
by atagar＠torproject.org 20 May '12

20 May '12

commit 4d6c8c8943d9540d5fcc6c39c503ca523e4683d3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 20 14:49:31 2012 -0700 Adding separate funtion for launching tor with tmp torrc Like Vidalia, adding a function that creates a torrc, launches tor with it, then removes it from disk. This is preferable to using the commandline arguments since the those shouldn't be used for substantial data nor the hashed password. This replaces launch_tor()'s options argument, though I added a more genral args replacement that can be used to do the same if the user wants. --- stem/process.py | 52 ++++++++++++++++++++++++++++++++++++++++-------- test/integ/process.py | 26 ++++++----------------- test/runner.py | 2 + 3 files changed, 52 insertions(+), 28 deletions(-) diff --git a/stem/process.py b/stem/process.py index 32bf1a7..a65c124 100644 --- a/stem/process.py +++ b/stem/process.py @@ -1,7 +1,8 @@ """ Helper functions for working with tor as a process. -launch_tor - starts up a tor process +launch_tor - starts up a tor process +launch_tor_with_config - starts a tor process with a custom torrc """ import re @@ -18,7 +19,7 @@ DEFAULT_INIT_TIMEOUT = 90 NO_TORRC = "<no torrc>" -def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): +def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): """ Initializes a tor process. This blocks until initialization completes or we error out. @@ -30,7 +31,7 @@ def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_pe Arguments: tor_cmd (str) - command for starting tor - options (dict) - configuration options, such as ("ControlPort": "9051") + args (list) - additional arguments for tor torrc_path (str) - location of the torrc for us to use completion_percent (int) - percent of bootstrap completion at which this'll return @@ -53,18 +54,15 @@ def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_pe # starts a tor subprocess, raising an OSError if it fails runtime_args, temp_file = [tor_cmd], None + if args: runtime_args += args + if torrc_path: if torrc_path == NO_TORRC: - temp_file = tempfile.mkstemp("-empty-torrc", text = True)[1] + temp_file = tempfile.mkstemp(prefix = "empty-torrc-", text = True)[1] runtime_args += ["-f", temp_file] else: runtime_args += ["-f", torrc_path] - if options: - for key, value in options.items(): - value = value.replace('"', '\\"') - runtime_args += ["--%s" % key.lower(), value] - tor_process = subprocess.Popen(runtime_args, stdout = subprocess.PIPE, stderr = subprocess.PIPE) if timeout: @@ -112,3 +110,39 @@ def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_pe if ": " in msg: msg = msg.split(": ")[-1].strip() last_problem = msg +def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): + """ + Initializes a tor process, like launch_tor(), but with a customized + configuration. This writes a temporary torrc to disk, launches tor, then + deletes the torrc. + + Arguments: + config (dict) - configuration options, such as ("ControlPort": "9051") + tor_cmd (str) - command for starting tor + completion_percent (int) - percent of bootstrap completion at which + this'll return + init_msg_handler (functor) - optional functor that will be provided with + tor's initialization stdout as we get it + timeout (int) - time after which the attempt to start tor is + aborted, no timeouts are applied if None + + Returns: + subprocess.Popen instance for the tor subprocess + + Raises: + OSError if we either fail to create the tor process or reached a timeout + without success + """ + + torrc_path = tempfile.mkstemp(prefix = "torrc-", text = True)[1] + + try: + with open(torrc_path, "w") as torrc_file: + for key, value in config.items(): + torrc_file.write("%s %s\n" % (key, value)) + + return launch_tor(tor_cmd, None, torrc_path, completion_percent, init_msg_handler, timeout) + finally: + try: os.remove(torrc_path) + except: pass + diff --git a/test/integ/process.py b/test/integ/process.py index f189f46..b7e5040 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -9,26 +9,19 @@ import stem.socket import stem.process import test.runner -# Tests are target independent. Only run once even if there's multiple targets. - -RAN_TESTS = [] - class TestProcess(unittest.TestCase): - def test_launch_tor_options(self): + def test_launch_tor_with_config(self): """ - Runs launch_tor with options specified via the commandline rather than the - torrc. + Exercises launch_tor_with_config. """ - test_name = 'test_launch_tor_options' - if test_name in RAN_TESTS: self.skipTest("(already ran)") + test.runner.only_run_once(self, "test_launch_tor_with_config") # Launch tor without a torrc, but with a control port. Confirms that this # works by checking that we're still able to access the new instance. - tor_process = stem.process.launch_tor( - options = {'SocksPort': '2777', 'ControlPort': '2778'}, - torrc_path = stem.process.NO_TORRC, + tor_process = stem.process.launch_tor_with_config( + config = {'SocksPort': '2777', 'ControlPort': '2778'}, completion_percent = 5 ) @@ -45,21 +38,16 @@ class TestProcess(unittest.TestCase): finally: if control_socket: control_socket.close() tor_process.kill() - - RAN_TESTS.append(test_name) def test_launch_tor_with_timeout(self): """ Runs launch_tor where it times out before completing. """ - test_name = 'test_launch_tor_with_timeout' - if test_name in RAN_TESTS: self.skipTest("(already ran)") + test.runner.only_run_once(self, "test_launch_tor_with_timeout") start_time = time.time() - self.assertRaises(OSError, stem.process.launch_tor, "tor", {'SocksPort': '2777'}, stem.process.NO_TORRC, 100, None, 2) + self.assertRaises(OSError, stem.process.launch_tor_with_config, {'SocksPort': '2777'}, "tor", 100, None, 2) runtime = time.time() - start_time self.assertTrue(runtime > 2 and runtime < 3) - - RAN_TESTS.append(test_name) diff --git a/test/runner.py b/test/runner.py index 2dc0cbb..286d4a8 100644 --- a/test/runner.py +++ b/test/runner.py @@ -123,6 +123,8 @@ def require_version(test_case, req_version): def only_run_once(test_case, test_name): """ Skips the test if it has ran before. If it hasn't then flags it as being ran. + This is useful to prevent lengthy tests that are independent of integ targets + from being run repeatedly with RUN_ALL. Arguments: test_case (unittest.TestCase) - test being ran

1 0

[stem/master] Disabling launch_tor timeout when on windows
by atagar＠torproject.org 20 May '12

20 May '12

commit 688f321287f5e9c53451dd91608dc3aa5088a621 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 20 15:05:10 2012 -0700 Disabling launch_tor timeout when on windows On windows the python signal module lacks a SIGALRM attribute, breaking launch_tor. Disabling timeouts on windows to avoid this issue - ideally we should find an alternative method for timeing out the function on windows but that can wait. Caught by pythonirc101. Issue is discussed on... https://trac.torproject.org/projects/tor/ticket/5783 --- stem/process.py | 8 ++++++++ stem/util/system.py | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/stem/process.py b/stem/process.py index a65c124..e004faf 100644 --- a/stem/process.py +++ b/stem/process.py @@ -11,6 +11,8 @@ import signal import tempfile import subprocess +import stem.util.system + # number of seconds before we time out our attempt to start a tor instance DEFAULT_INIT_TIMEOUT = 90 @@ -29,6 +31,9 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce while. Usually this is done in 50 seconds or so, but occasionally calls seem to get stuck, taking well over the default timeout. + Our timeout argument does not work on Windows... + https://trac.torproject.org/projects/tor/ticket/5783 + Arguments: tor_cmd (str) - command for starting tor args (list) - additional arguments for tor @@ -48,6 +53,9 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce without success """ + if stem.util.system.is_windows(): + timeout = None + # double check that we have a torrc to work with if not torrc_path in (None, NO_TORRC) and not os.path.exists(torrc_path): raise OSError("torrc doesn't exist (%s)" % torrc_path) diff --git a/stem/util/system.py b/stem/util/system.py index 6ecc0aa..a4ba186 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -44,13 +44,23 @@ GET_CWD_PWDX = "pwdx %s" GET_CWD_LSOF = "lsof -a -p %s -d cwd -Fn" GET_BSD_JAIL_ID_PS = "ps -p %s -o jid" +def is_windows(): + """ + Checks if we are running on Windows. + + Returns: + bool to indicate if we're on Windows + """ + + return platform.system() == "Windows" + def is_bsd(): """ Checks if we are within the BSD family of operating systems. This presently recognizes Macs, FreeBSD, and OpenBSD but may be expanded later. Returns: - bool to indicate if we're a BSD OS + bool to indicate if we're on a BSD OS """ return platform.system() in ("Darwin", "FreeBSD", "OpenBSD") @@ -78,7 +88,7 @@ def is_available(command, cached=True): cmd_exists = False for path in os.environ["PATH"].split(os.pathsep): cmd_path = os.path.join(path, command) - if platform.system() == "Windows": cmd_path += ".exe" + if is_windows(): cmd_path += ".exe" if os.path.exists(cmd_path) and os.access(cmd_path, os.X_OK): cmd_exists = True

1 0

[stem/master] Stating runtime when launch_tor timeout test fails
by atagar＠torproject.org 20 May '12

20 May '12

commit ce07df9962bc464c338cbee0753e40169f801505 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 20 15:11:55 2012 -0700 Stating runtime when launch_tor timeout test fails Just had a transient testing failure from test_launch_tor_with_timeout. There's nothing to go on since we don't even know how long the test took, so providing that information on failure. Might need to mess with the bounds a bit if this happens again. --- test/integ/process.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index b7e5040..470faa7 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -49,5 +49,7 @@ class TestProcess(unittest.TestCase): start_time = time.time() self.assertRaises(OSError, stem.process.launch_tor_with_config, {'SocksPort': '2777'}, "tor", 100, None, 2) runtime = time.time() - start_time - self.assertTrue(runtime > 2 and runtime < 3) + + if not (runtime > 2 and runtime < 3): + self.fail("Test should have taken 2-3 seconds, took %i instead" % timeout)

1 0

r25650: {website} Fix the publish script to point to a real hostname (website/trunk)
by Sebastian Hahn 20 May '12

20 May '12

Author: sebastian Date: 2012-05-20 08:25:31 +0000 (Sun, 20 May 2012) New Revision: 25650 Modified: website/trunk/publish Log: Fix the publish script to point to a real hostname Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-05-18 15:37:34 UTC (rev 25649) +++ website/trunk/publish 2012-05-20 08:25:31 UTC (rev 25650) @@ -29,10 +29,10 @@ --exclude releases \ --exclude torbutton-current.xpi \ --exclude project \ - -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs + -Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum ' +ssh www-master.torproject.org ' ( find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1)

1 0

[torbutton/master] Bug 5729: Make New Identity and new windows identical
by mikeperry＠torproject.org 20 May '12

20 May '12

commit fef1bcae29d71ba419b94e35e2f4f8278373e230 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat May 19 20:22:53 2012 -0700 Bug 5729: Make New Identity and new windows identical We should be loading the home page for new identity windows too, why not. People need to know if they are out of date. --- src/chrome/content/torbutton.js | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4a46cac..9e519d5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1372,7 +1372,7 @@ function torbutton_new_identity() { * 2. Disables Javascript and plugins on all tabs * 3. Clears state: * a. OCSP - * b. Cache + * b. Cache + image cache * c. Site-specific zoom * d. Cookies+DOM Storage+safe browsing key * e. google wifi geolocation token @@ -1381,6 +1381,8 @@ function torbutton_new_identity() { * h. last open location url * i. clear content prefs * 4. Sends tor the NEWNYM signal to get a new circuit + * 5. Opens a new window with the default homepage + * 6. Closes this window * * XXX: intermediate SSL certificates are not cleared. */ @@ -1545,10 +1547,15 @@ function torbutton_do_new_identity() { } } - // gBrowser should always be here. - torbutton_set_window_size(gBrowser.contentWindow); + // Open a new window with the TBB check homepage + var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", + Components.interfaces.nsIPrefLocalizedString).data; + window.open(homepage); torbutton_log(3, "New identity successful"); + + // Close the current window for added safety + window.close(); } // toggles plugins: true for disabled, false for enabled @@ -4094,12 +4101,21 @@ function torbutton_set_window_size(bWin) { // at this point... bWin.innerWidth = 200; bWin.innerHeight = 200; + + // XXX: This is sufficient to prevent some kind of weird resize race condition on Linux. + // Why or how, you ask? I have no fucking clue, man. + if (bWin.innerWidth != 200 || bWin.innerHeight != 200) { + bWin.innerHeight = 200; + bWin.innerWidth = 200; + } torbutton_log(3, "About to resize new window: "+window.outerWidth+"x"+window.outerHeight +" inner: "+bWin.innerWidth+"x"+bWin.innerHeight+ " in state "+window.windowState+" Have "+availWidth.value+"x"+availHeight.value); var maxHeight = availHeight.value - (window.outerHeight - bWin.innerHeight) - 1; var maxWidth = availWidth.value - (window.outerWidth - bWin.innerWidth); + + torbutton_log(3, "Got max dimensions: "+maxWidth+"x"+maxHeight); var width; var height;

1 0