- tor-commits - lists.torproject.org

[stem/master] Mocking utility functions
by atagar＠torproject.org 11 Jan '12

11 Jan '12

commit 11cbf61c2dca7cde628e5eec4f3dd4da7867860f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 10 09:49:26 2012 -0800 Mocking utility functions As the tests grow I've found that I'm repeating a lot of mocking logic. Making a nice, general purpose utility to make mocking easier and less error prone. A benefit of this (and the original goal) is that we'll be able to remove stem.util.system.CALL_MOCKING. Testing code in the library is icky, and once we swap over the system integ tests we'll be able to remove this override function. --- test/__init__.py | 2 +- test/mocking.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++ test/unit/util/system.py | 40 ++++++++++++++---------- 3 files changed, 100 insertions(+), 17 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index a663300..93250e2 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,5 +2,5 @@ Unit and integration tests for the stem library. """ -__all__ = ["output", "runner"] +__all__ = ["mocking", "output", "runner"] diff --git a/test/mocking.py b/test/mocking.py new file mode 100644 index 0000000..740bcb7 --- /dev/null +++ b/test/mocking.py @@ -0,0 +1,75 @@ +""" +Helper functions for creating mock objects and monkey patching to help with +testing. +""" + +import inspect +import itertools + +# Once we've mocked a function we can't rely on its __module__ or __name__ +# attributes, so instead we associate a unique 'mock_id' attribute that maps +# back to the original attributes. + +MOCK_ID = itertools.count(0) + +# mock_id => (module, function_name, original_function) + +MOCK_STATE = {} + +def no_op(): + def _no_op(*args): pass + return _no_op + +def return_value(value): + def _return_value(*args): return value + return _return_value + +def return_true(): return return_value(True) +def return_false(): return return_value(False) +def return_none(): return return_value(None) + +def mock(target, mock_call): + """ + Mocks the given function, saving the initial implementation so it can be + reverted later. + + Arguments: + target (function) - function to be mocked + mock_call (functor) - mocking to replace the function with + """ + + if "mock_id" in target.__dict__: + # we're overriding an already mocked function + mocking_id = target.__dict__["mock_id"] + target_module, target_function, _ = MOCK_STATE[mocking_id] + else: + # this is a new mocking, save the original state + mocking_id = MOCK_ID.next() + target_module = inspect.getmodule(target) + target_function = target.__name__ + MOCK_STATE[mocking_id] = (target_module, target_function, target) + + mock_wrapper = lambda *args: mock_call(*args) + mock_wrapper.__dict__["mock_id"] = mocking_id + + # mocks the function with this wrapper + target_module.__dict__[target_function] = mock_wrapper + +def revert_mocking(): + """ + Reverts any mocking done by this function. + """ + + # Reverting mocks in reverse order. If we properly reuse mock_ids then this + # shouldn't matter, but might as well be safe. + + mock_ids = MOCK_STATE.keys() + mock_ids.sort() + mock_ids.reverse() + + for mock_id in mock_ids: + module, function, impl = MOCK_STATE[mock_id] + module.__dict__[function] = impl + + MOCK_STATE.clear() + diff --git a/test/unit/util/system.py b/test/unit/util/system.py index e3d1225..4821073 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -7,6 +7,8 @@ system running the tests. import functools import unittest +import test.mocking +import stem.util.proc import stem.util.system as system # Base responses for the get_pid_by_name tests. The 'success' and @@ -74,9 +76,13 @@ class TestSystem(unittest.TestCase): Tests the stem.util.system contents. """ + def setUp(self): + test.mocking.mock(stem.util.proc.is_available, test.mocking.return_false()) + test.mocking.mock(system.is_available, test.mocking.return_true()) + test.mocking.mock(system.call, test.mocking.return_none()) + def tearDown(self): - # resets call mocking back to being disabled - system.CALL_MOCKING = None + test.mocking.revert_mocking() def test_is_running(self): """ @@ -87,7 +93,7 @@ class TestSystem(unittest.TestCase): running_commands = ["irssi", "moc", "tor", "ps", " firefox "] for ps_cmd in (system.IS_RUNNING_PS_LINUX, system.IS_RUNNING_PS_BSD): - system.CALL_MOCKING = functools.partial(mock_call, ps_cmd, running_commands) + test.mocking.mock(system.call, functools.partial(mock_call, ps_cmd, running_commands)) self.assertTrue(system.is_running("irssi")) self.assertTrue(system.is_running("moc")) @@ -97,7 +103,7 @@ class TestSystem(unittest.TestCase): self.assertEqual(False, system.is_running("something_else")) # mock both calls failing - system.CALL_MOCKING = lambda cmd: None + test.mocking.mock(system.call, test.mocking.return_none()) self.assertFalse(system.is_running("irssi")) self.assertEquals(None, system.is_running("irssi")) @@ -109,7 +115,7 @@ class TestSystem(unittest.TestCase): responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["1111"] responses["multiple_results"] = ["123", "456", "789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PGREP, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PGREP, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -123,7 +129,7 @@ class TestSystem(unittest.TestCase): responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["1111"] responses["multiple_results"] = ["123 456 789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PIDOF, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PIDOF, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -134,10 +140,11 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_name function with the linux variant of ps. """ + test.mocking.mock(system.is_bsd, test.mocking.return_false()) responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["PID", " 1111"] responses["multiple_results"] = ["PID", " 123", " 456", " 789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PS_LINUX, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PS_LINUX, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -148,7 +155,8 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_name function with the bsd variant of ps. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PS_BSD, GET_PID_BY_NAME_PS_BSD) + test.mocking.mock(system.is_bsd, test.mocking.return_true()) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PS_BSD, GET_PID_BY_NAME_PS_BSD)) self.assertEquals(1, system.get_pid_by_name("launchd")) self.assertEquals(11, system.get_pid_by_name("DirectoryService")) self.assertEquals(None, system.get_pid_by_name("blarg")) @@ -161,7 +169,7 @@ class TestSystem(unittest.TestCase): responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["1111"] responses["multiple_results"] = ["123", "456", "789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_LSOF, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_LSOF, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -172,7 +180,7 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a netstat response. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_PORT_NETSTAT, GET_PID_BY_PORT_NETSTAT_RESULTS) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_PORT_NETSTAT, GET_PID_BY_PORT_NETSTAT_RESULTS)) self.assertEquals(1641, system.get_pid_by_port(9051)) self.assertEquals(1641, system.get_pid_by_port("9051")) self.assertEquals(None, system.get_pid_by_port(631)) @@ -183,7 +191,7 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a sockstat response. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_PORT_SOCKSTAT % 9051, GET_PID_BY_PORT_SOCKSTAT_RESULTS) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_PORT_SOCKSTAT % 9051, GET_PID_BY_PORT_SOCKSTAT_RESULTS)) self.assertEquals(4397, system.get_pid_by_port(9051)) self.assertEquals(4397, system.get_pid_by_port("9051")) self.assertEquals(None, system.get_pid_by_port(123)) @@ -193,7 +201,7 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a lsof response. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_PORT_LSOF, GET_PID_BY_PORT_LSOF_RESULTS) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_PORT_LSOF, GET_PID_BY_PORT_LSOF_RESULTS)) self.assertEquals(1745, system.get_pid_by_port(9051)) self.assertEquals(1745, system.get_pid_by_port("9051")) self.assertEquals(329, system.get_pid_by_port(80)) @@ -205,7 +213,7 @@ class TestSystem(unittest.TestCase): """ lsof_query = system.GET_PID_BY_FILE_LSOF % "/tmp/foo" - system.CALL_MOCKING = functools.partial(mock_call, lsof_query, ["4762"]) + test.mocking.mock(system.call, functools.partial(mock_call, lsof_query, ["4762"])) self.assertEquals(4762, system.get_pid_by_open_file("/tmp/foo")) self.assertEquals(None, system.get_pid_by_open_file("/tmp/somewhere_else")) @@ -221,7 +229,7 @@ class TestSystem(unittest.TestCase): "7878": None, } - system.CALL_MOCKING = functools.partial(mock_call, system.GET_CWD_PWDX, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_CWD_PWDX, responses)) for test_input in responses: expected_response = "/home/atagar" if test_input == "3799" else None @@ -238,7 +246,7 @@ class TestSystem(unittest.TestCase): "7878": None, } - system.CALL_MOCKING = functools.partial(mock_call, system.GET_CWD_LSOF, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_CWD_LSOF, responses)) for test_input in responses: expected_response = "/Users/atagar/tor/src/or" if test_input == "75717" else None @@ -258,7 +266,7 @@ class TestSystem(unittest.TestCase): "6666": None } - system.CALL_MOCKING = functools.partial(mock_call, system.GET_BSD_JAIL_ID_PS, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_BSD_JAIL_ID_PS, responses)) for test_input in responses: expected_response = 1 if test_input == "1111" else 0

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 11 Jan '12

11 Jan '12

commit 9d1c66683a80d4f63fd92907a13c112b056cea02 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 18:15:17 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 213 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 112 insertions(+), 101 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 54150bf..168460d 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-11 17:43+0000\n" +"PO-Revision-Date: 2012-01-11 17:58+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -963,155 +963,155 @@ msgstr "Rússia" msgctxt "CountryInfo" msgid "Rwanda" -msgstr "" +msgstr "Ruanda" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" -msgstr "" +msgstr "Saint Kitts i Nevis" msgctxt "CountryInfo" msgid "Saint Lucia" -msgstr "" +msgstr "Santa Llúcia" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "" +msgstr "Saint Vincent i les Grenadines" msgctxt "CountryInfo" msgid "Samoa" -msgstr "" +msgstr "Samoa" msgctxt "CountryInfo" msgid "San Marino" -msgstr "" +msgstr "Sant Marino" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "" +msgstr "São Tomé i Príncipe " msgctxt "CountryInfo" msgid "Saudi Arabia" -msgstr "" +msgstr "Aràbia Saudita" msgctxt "CountryInfo" msgid "Senegal" -msgstr "" +msgstr "Senegal" msgctxt "CountryInfo" msgid "Serbia" -msgstr "" +msgstr "Sèrbia" msgctxt "CountryInfo" msgid "Seychelles" -msgstr "" +msgstr "Seychelles" msgctxt "CountryInfo" msgid "Sierra Leone" -msgstr "" +msgstr "Sierra Leona" msgctxt "CountryInfo" msgid "Singapore" -msgstr "" +msgstr "Singapur" msgctxt "CountryInfo" msgid "Slovakia" -msgstr "" +msgstr "Eslovàquia" msgctxt "CountryInfo" msgid "Slovenia" -msgstr "" +msgstr "Eslovènia" msgctxt "CountryInfo" msgid "Solomon Islands" -msgstr "" +msgstr "Illes Salomó" msgctxt "CountryInfo" msgid "Somalia" -msgstr "" +msgstr "Somàlia" msgctxt "CountryInfo" msgid "South Africa" -msgstr "" +msgstr "Àfrica del Sud" msgctxt "CountryInfo" msgid "Spain" -msgstr "" +msgstr "Espanya" msgctxt "CountryInfo" msgid "Sri Lanka" -msgstr "" +msgstr "Sri Lanka" msgctxt "CountryInfo" msgid "Sudan" -msgstr "" +msgstr "Sudan" msgctxt "CountryInfo" msgid "Suriname" -msgstr "" +msgstr "Surinam" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "Suazilàndia" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "Suècia" msgctxt "CountryInfo" msgid "Switzerland" -msgstr "" +msgstr "Suïssa" msgctxt "CountryInfo" msgid "Syria" -msgstr "" +msgstr "Síria" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "" +msgstr "Tatgiquistan" msgctxt "CountryInfo" msgid "Tanzania" -msgstr "" +msgstr "Tanzània" msgctxt "CountryInfo" msgid "Thailand" -msgstr "" +msgstr "Tailàndia" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "" +msgstr "Timor Oriental" msgctxt "CountryInfo" msgid "Togo" -msgstr "" +msgstr "Togo" msgctxt "CountryInfo" msgid "Tonga" -msgstr "" +msgstr "Tonga" msgctxt "CountryInfo" msgid "Trinidad & Tobago" -msgstr "" +msgstr "Trinitat i Tobago " msgctxt "CountryInfo" msgid "Tunisia" -msgstr "" +msgstr "Tuníssia" msgctxt "CountryInfo" msgid "Turkey" -msgstr "" +msgstr "Turquia" msgctxt "CountryInfo" msgid "Turkmenistan" -msgstr "" +msgstr "Turcmenistan" msgctxt "CountryInfo" msgid "Tuvalu" -msgstr "" +msgstr "Tuvalu" msgctxt "CountryInfo" msgid "Uganda" -msgstr "" +msgstr "Uganda" msgctxt "CountryInfo" msgid "Ukraine" @@ -1294,6 +1294,8 @@ msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Hem estat incapaços de reiniciar Vidalia de manera automàtica. Si us plau, " +"reinicieu Vidalia manualment." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1603,7 +1605,7 @@ msgstr "" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Info" msgctxt "LogTreeItem" msgid "Notice" @@ -1611,15 +1613,15 @@ msgstr "" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Avís" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Error" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Desconegut" msgctxt "MainWindow" msgid "Start Tor" @@ -2105,6 +2107,9 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"Tot el que s'envïi per aquesta connexió serà monitoritzat. Si us plau, " +"reviseu la configuració de la vostra aplicació i utilitzeu només protocols " +"xifrats, com SSL." msgctxt "MainWindow" msgid "failed (%1)" @@ -2405,15 +2410,15 @@ msgstr "" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "Bàsic" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Estat del Tor" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Avançat" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2444,6 +2449,8 @@ msgid "" "Messages that appear frequently \n" "during normal Tor operation." msgstr "" +"Missatges que apareixen sovient\n" +"durant l'operació normal del Tor" msgctxt "MessageLog" msgid "" @@ -2696,31 +2703,31 @@ msgstr "" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adreça:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Tipus:" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Heu de seleccionar el tipus de proxy." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -2736,11 +2743,11 @@ msgstr "En línia" msgctxt "RouterDescriptor" msgid "Hibernating" -msgstr "" +msgstr "S'està hibernant" msgctxt "RouterDescriptor" msgid "Offline" -msgstr "" +msgstr "Fora de línia:" msgctxt "RouterDescriptorView" msgid "Location:" @@ -2772,7 +2779,7 @@ msgstr "Copia" msgctxt "RouterInfoDialog" msgid "Hibernating" -msgstr "" +msgstr "S'està hibernant:" msgctxt "RouterInfoDialog" msgid "Online" @@ -2840,7 +2847,7 @@ msgstr "Fora de línia" msgctxt "RouterListItem" msgid "Hibernating" -msgstr "" +msgstr "S'està hibernant" msgctxt "RouterListItem" msgid "%1 KB/s" @@ -3104,7 +3111,7 @@ msgstr "" msgctxt "ServerPage" msgid "No Recent Usage" -msgstr "" +msgstr "No hi ha ús recent" msgctxt "ServerPage" msgid "No clients have used your relay recently." @@ -3118,7 +3125,7 @@ msgstr "" msgctxt "ServerPage" msgid "Bridge History" -msgstr "" +msgstr "Història del pont" msgctxt "ServerPage" msgid "Vidalia was unable to retrieve your bridge's usage history." @@ -3132,11 +3139,11 @@ msgstr "" msgctxt "ServerPage" msgid "The returned response was: %1" -msgstr "" +msgstr "La resposta retornada ha estat: %1" msgctxt "ServerPage" msgid "Help censored users reach the Tor network" -msgstr "" +msgstr "Ajudeu als usuaris censurats d'accedir a la xarxa del Tor" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" @@ -3144,11 +3151,11 @@ msgstr "" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Què és això?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Distribueix de manera automàtica l'adreça del meu pont" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3246,19 +3253,19 @@ msgstr "Creat pel Tor" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Copia al porta-retalls" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "S'està executant el Tor" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Esteu executant la versió \"%1\" del Tor" msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "El Tor no s'està executant" msgctxt "StatusEventWidget" msgid "" @@ -3266,6 +3273,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"Feu clic a \"Inicia el Tor\" en el panell de control de Vidalia per a " +"reiniciar el programari. En el cas que el Tor aborti de manera inesperada, " +"seleccioneu \"Avançat\" per a conéixer més detalls sobre els errors" msgctxt "StatusEventWidget" msgid "" @@ -3540,6 +3550,7 @@ msgstr "Incapaç d'iniciar el servei del Tor." msgctxt "TorSettings" msgid "Failed to hash the control password." msgstr "" +"La generació d'una funció resum per a la contrasenya de control ha fallit." msgctxt "TorrcDialog" msgid "Editing torrc" @@ -3609,7 +3620,7 @@ msgstr "Èxit" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "" +msgstr "No s'han trobat dispositius UPnP habilitats" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" @@ -3617,7 +3628,7 @@ msgstr "" msgctxt "UPNPControl" msgid "WSAStartup failed" -msgstr "" +msgstr "WSAStartup ha fallat" msgctxt "UPNPControl" msgid "Failed to add a port mapping" @@ -3633,7 +3644,7 @@ msgstr "" msgctxt "UPNPControl" msgid "Unknown error" -msgstr "" +msgstr "Error desconegut" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" @@ -3649,7 +3660,7 @@ msgstr "" msgctxt "UPNPTestDialog" msgid "Test completed successfully!" -msgstr "" +msgstr "El test ha estat completat correctament!" msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" @@ -3673,31 +3684,31 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." -msgstr "" +msgstr "S'està verificant actualitzacions disponibles..." msgctxt "UpdateProgressDialog" msgid "Hide" -msgstr "" +msgstr "Oculta" msgctxt "UpdateProgressDialog" msgid "Downloading updates..." -msgstr "" +msgstr "S'estan descarregant actualitzacions..." msgctxt "UpdateProgressDialog" msgid "Installing updated software..." -msgstr "" +msgstr "S'està actualitzant el programari..." msgctxt "UpdateProgressDialog" msgid "Done! Your software is now up to date." -msgstr "" +msgstr "Fet! El seu programari està actualitzat." msgctxt "UpdateProgressDialog" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "UpdateProgressDialog" msgid "Software Updates" -msgstr "" +msgstr "Actualitzacions de programari" msgctxt "UpdateProgressDialog" msgid "Checking for updates..." @@ -3705,11 +3716,11 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Cancel" -msgstr "" +msgstr "Cancel·la" msgctxt "UpdatesAvailableDialog" msgid "Software Updates Available" -msgstr "" +msgstr "Actualitzacions de programari disponibles" msgctxt "UpdatesAvailableDialog" msgid "Remind Me Later" @@ -3717,7 +3728,7 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Install" -msgstr "" +msgstr "Instal·la" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" @@ -3725,35 +3736,35 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Package" -msgstr "" +msgstr "Paquet" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "Versió" msgctxt "VMessageBox" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "VMessageBox" msgid "Cancel" -msgstr "" +msgstr "Cancel·la" msgctxt "VMessageBox" msgid "Yes" -msgstr "" +msgstr "Sí" msgctxt "VMessageBox" msgid "No" -msgstr "" +msgstr "No" msgctxt "VMessageBox" msgid "Help" -msgstr "" +msgstr "Ajuda" msgctxt "VMessageBox" msgid "Retry" -msgstr "" +msgstr "Reintenta" msgctxt "VMessageBox" msgid "Show Log" @@ -3761,51 +3772,51 @@ msgstr "" msgctxt "VMessageBox" msgid "Show Settings" -msgstr "" +msgstr "Mostra les preferències" msgctxt "VMessageBox" msgid "Continue" -msgstr "" +msgstr "Continua" msgctxt "VMessageBox" msgid "Quit" -msgstr "" +msgstr "Surt" msgctxt "VMessageBox" msgid "Browse" -msgstr "" +msgstr "Navega" msgctxt "Vidalia" msgid "Invalid Argument" -msgstr "" +msgstr "Argument invàlid" msgctxt "Vidalia" msgid "Vidalia is already running" -msgstr "" +msgstr "Vidalia ja s'està executant" msgctxt "Vidalia" msgid "Displays this usage message and exits." -msgstr "" +msgstr "Mostra el missatge d'ús i surt." msgctxt "Vidalia" msgid "Resets ALL stored Vidalia settings." -msgstr "" +msgstr "Reinicialitza TOTES les preferències de Vidalia emmagatzemades." msgctxt "Vidalia" msgid "Sets the directory Vidalia uses for data files." -msgstr "" +msgstr "Estableix la carpeta que Vidalia utilitza per als fitxers de dades." msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's pidfile." -msgstr "" +msgstr "Estableix el nom i la ubicació del pidfile de Vidalia" msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's logfile." -msgstr "" +msgstr "Estableix el nom i la ubicació del fitxer de registre de Vidalia." msgctxt "Vidalia" msgid "Sets the verbosity of Vidalia's logging." -msgstr "" +msgstr "Estableix el nivell de detall del fitxer de registre de Vidalia." msgctxt "Vidalia" msgid "Sets Vidalia's interface style."

1 0

r25304: {website} Updating my people page entry Changing the wording a bit and (website/trunk/about/en)
by Damian Johnson 11 Jan '12

11 Jan '12

Author: atagar Date: 2012-01-11 17:45:34 +0000 (Wed, 11 Jan 2012) New Revision: 25304 Modified: website/trunk/about/en/corepeople.wml Log: Updating my people page entry Changing the wording a bit and noting the project that I'm currently working on (stem). Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2012-01-11 17:23:06 UTC (rev 25303) +++ website/trunk/about/en/corepeople.wml 2012-01-11 17:45:34 UTC (rev 25304) @@ -87,11 +87,12 @@ Arora fork</a>, the <a href="http://code.google.com/p/torsocks/">torsocks scripts</a>, and other useful peripheral tools.</dd> - <dt>Damian Johnson, Arm Developer</dt> - <dd>Builds <a href="http://atagar.com/arm">Arm</a>, - a command-line application for monitoring Tor relays and - providing real-time status information such as the current - configuration, bandwidth usage, message log, etc.</dd> + <dt>Damian Johnson, Developer</dt> + <dd>Author of <a href="http://atagar.com/arm">arm</a>, a command-line + application that provides real-time status information for Tor relays + and <a + href="https://trac.torproject.org/projects/tor/wiki/doc/stem">Stem</a>, + a controller library for interacting with Tor.</dd> <dt>George Kadianakis, Developer</dt> <dd>Developer of pluggable transports and bridge-scanning resistance.</dd>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 11 Jan '12

11 Jan '12

commit 61da6cc21cbeb4612cb5383ecb04759536048cc4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 17:45:16 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 9e4e2b7..54150bf 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-11 13:26+0000\n" +"PO-Revision-Date: 2012-01-11 17:43+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -919,47 +919,47 @@ msgstr "" msgctxt "CountryInfo" msgid "Palestine" -msgstr "" +msgstr "Palestina" msgctxt "CountryInfo" msgid "Panama" -msgstr "" +msgstr "Panamà" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "" +msgstr "Nova Guinea Pàpua" msgctxt "CountryInfo" msgid "Paraguay" -msgstr "" +msgstr "Paraguai" msgctxt "CountryInfo" msgid "Peru" -msgstr "" +msgstr "Perú" msgctxt "CountryInfo" msgid "Philippines" -msgstr "" +msgstr "Filipines" msgctxt "CountryInfo" msgid "Poland" -msgstr "" +msgstr "Polònia" msgctxt "CountryInfo" msgid "Portugal" -msgstr "" +msgstr "Portugal" msgctxt "CountryInfo" msgid "Qatar" -msgstr "" +msgstr "Qatar" msgctxt "CountryInfo" msgid "Romania" -msgstr "" +msgstr "Romania" msgctxt "CountryInfo" msgid "Russia" -msgstr "" +msgstr "Rússia" msgctxt "CountryInfo" msgid "Rwanda"

1 0

[torspec/master] Rename "geoip-start" to "geoip-start-time".
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 164351f8b4ccb470c3056057979090601bdf9880 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 11 18:10:28 2012 +0100 Rename "geoip-start" to "geoip-start-time". "geoip-start-time" was replaced by "bridge-stats-end" in e1e5c1b3. However, it was always written as "geoip-start-time" in the code whereas dir-spec.txt says "geoip-start". Fixing dir-spec.txt. --- dir-spec.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index f1aef64..9506d74 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -628,7 +628,7 @@ SHA1 digest of the GeoIP database file that is used to resolve IP addresses to country codes. - ("geoip-start" YYYY-MM-DD HH:MM:SS NL) + ("geoip-start-time" YYYY-MM-DD HH:MM:SS NL) ("geoip-client-origins" CC=N,CC=N,... NL) Only generated by bridge routers (see blocking.pdf), and only @@ -639,13 +639,13 @@ country (approximate, and rounded up to the nearest multiple of 8 in order to hamper traffic analysis). A country is included only if it has at least one address. The time in - "geoip-start" is the time at which we began collecting geoip + "geoip-start-time" is the time at which we began collecting geoip statistics. - "geoip-start" and "geoip-client-origins" have been replaced by + "geoip-start-time" and "geoip-client-origins" have been replaced by "bridge-stats-end" and "bridge-stats-ips" in 0.2.2.4-alpha. The reason is that the measurement interval with "geoip-stats" as - determined by subtracting "geoip-start" from "published" could + determined by subtracting "geoip-start-time" from "published" could have had a variable length, whereas the measurement interval in 0.2.2.4-alpha and later is set to be exactly 24 hours long. In order to clearly distinguish the new measurement intervals from

1 0

[tor/master] defensive programming to catch duplicate calls to connection_init_or_handshake_state
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit ce703bd53edec2ee123dd747d6cc975a259c68f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 20:19:25 2011 -0400 defensive programming to catch duplicate calls to connection_init_or_handshake_state --- src/or/connection_or.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7609138..76402a5 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1583,6 +1583,10 @@ int connection_init_or_handshake_state(or_connection_t *conn, int started_here) { or_handshake_state_t *s; + if (conn->handshake_state) { + log_warn(LD_BUG, "Duplicate call to connection_init_or_handshake_state!"); + return 0; + } s = conn->handshake_state = tor_malloc_zero(sizeof(or_handshake_state_t)); s->started_here = started_here ? 1 : 0; s->digest_sent_data = 1;

1 0

[tor/master] Merge branch 'prop187_squashed'
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit f54a10caa62db6653cd8f5a8c84de3a623428c6c Merge: fa83397 3826e05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:27:14 2012 -0500 Merge branch 'prop187_squashed' src/or/command.c | 75 +++++++++++++++++++++++++++++++++++++---------- src/or/connection_or.c | 4 ++ src/or/or.h | 1 + 3 files changed, 64 insertions(+), 16 deletions(-)

1 0

[tor/master] Implement proposal 187: reserve a cell type for client authorization
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 3826e058acfc1886fcd4be18644ea130d12ca9be Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 20:19:29 2011 -0400 Implement proposal 187: reserve a cell type for client authorization This needs a changes file and more testing. --- src/or/command.c | 75 ++++++++++++++++++++++++++++++++++++++++++----------- src/or/or.h | 1 + 2 files changed, 60 insertions(+), 16 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index 023f2be..6c1312b 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -54,6 +54,8 @@ uint64_t stats_n_certs_cells_processed = 0; uint64_t stats_n_auth_challenge_cells_processed = 0; /** How many CELL_AUTHENTICATE cells have we received, ever? */ uint64_t stats_n_authenticate_cells_processed = 0; +/** How many CELL_AUTHORIZE cells have we received, ever? */ +uint64_t stats_n_authorize_cells_processed = 0; /* These are the main functions for processing cells */ static void command_process_create_cell(cell_t *cell, or_connection_t *conn); @@ -69,6 +71,8 @@ static void command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn); static void command_process_authenticate_cell(var_cell_t *cell, or_connection_t *conn); +static int enter_v3_handshake_with_cell(var_cell_t *cell, + or_connection_t *conn); #ifdef KEEP_TIMING_STATS /** This is a wrapper function around the actual function that processes the @@ -203,6 +207,22 @@ command_process_cell(cell_t *cell, or_connection_t *conn) } } +/** Return true if command is a cell command that's allowed to start a + * V3 handshake. */ +static int +command_allowed_before_handshake(uint8_t command) +{ + switch (command) { + case CELL_PADDING: /*XXXX not implemented. Should remove, or implement? */ + case CELL_VERSIONS: + case CELL_VPADDING: + case CELL_AUTHORIZE: + return 1; + default: + return 0; + } +} + /** Process a cell that was just received on conn. Keep internal * statistics about how many of each cell we've processed so far * this second, and the total number of microseconds it took to @@ -250,13 +270,16 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) /* fall through */ case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: - if (cell->command != CELL_VERSIONS) { + if (! command_allowed_before_handshake(cell->command)) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Received a non-VERSIONS cell with command %d in state %s; " + "Received a cell with command %d in state %s; " "ignoring it.", (int)cell->command, conn_state_to_string(CONN_TYPE_OR,conn->_base.state)); return; + } else { + if (enter_v3_handshake_with_cell(cell, conn)<0) + return; } break; case OR_CONN_STATE_OR_HANDSHAKING_V3: @@ -305,6 +328,10 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) ++stats_n_authenticate_cells_processed; PROCESS_CELL(authenticate, cell, conn); break; + case CELL_AUTHORIZE: + ++stats_n_authorize_cells_processed; + /* Ignored so far. */ + break; default: log_fn(LOG_INFO, LD_PROTOCOL, "Variable-length cell of unknown type (%d) received.", @@ -592,6 +619,35 @@ command_process_destroy_cell(cell_t *cell, or_connection_t *conn) } } +/** Called when we as a server receive an appropriate cell while waiting + * either for a cell or a TLS handshake. Set the connection's state to + * "handshaking_v3', initializes the or_handshake_state field as needed, + * and add the cell to the hash of incoming cells.) + * + * Return 0 on success; return -1 and mark the connection on failure. + */ +static int +enter_v3_handshake_with_cell(var_cell_t *cell, or_connection_t *conn) +{ + const int started_here = connection_or_nonopen_was_started_here(conn); + + tor_assert(conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING || + conn->_base.state == OR_CONN_STATE_TLS_SERVER_RENEGOTIATING); + + if (started_here) { + log_fn(LOG_PROTOCOL_WARN, LD_OR, + "Received a cell while TLS-handshaking, not in " + "OR_HANDSHAKING_V3, on a connection we originated."); + } + conn->_base.state = OR_CONN_STATE_OR_HANDSHAKING_V3; + if (connection_init_or_handshake_state(conn, started_here) < 0) { + connection_mark_for_close(TO_CONN(conn)); + return -1; + } + or_handshake_state_record_var_cell(conn->handshake_state, cell, 1); + return 0; +} + /** Process a 'versions' cell. The current link protocol version must be 0 * to indicate that no version has yet been negotiated. We compare the * versions in the cell to the list of versions we support, pick the @@ -614,23 +670,10 @@ command_process_versions_cell(var_cell_t *cell, or_connection_t *conn) switch (conn->_base.state) { case OR_CONN_STATE_OR_HANDSHAKING_V2: + case OR_CONN_STATE_OR_HANDSHAKING_V3: break; case OR_CONN_STATE_TLS_HANDSHAKING: case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: - if (started_here) { - log_fn(LOG_PROTOCOL_WARN, LD_OR, - "Received a versions cell while TLS-handshaking not in " - "OR_HANDSHAKING_V3 on a connection we originated."); - } - conn->_base.state = OR_CONN_STATE_OR_HANDSHAKING_V3; - if (connection_init_or_handshake_state(conn, started_here) < 0) { - connection_mark_for_close(TO_CONN(conn)); - return; - } - or_handshake_state_record_var_cell(conn->handshake_state, cell, 1); - break; - case OR_CONN_STATE_OR_HANDSHAKING_V3: - break; default: log_fn(LOG_PROTOCOL_WARN, LD_OR, "VERSIONS cell while in unexpected state"); diff --git a/src/or/or.h b/src/or/or.h index 8fe3e0f..a7a517f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -833,6 +833,7 @@ typedef enum { #define CELL_CERTS 129 #define CELL_AUTH_CHALLENGE 130 #define CELL_AUTHENTICATE 131 +#define CELL_AUTHORIZE 132 /** How long to test reachability before complaining to the user. */ #define TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT (20*60)

1 0

[tor/master] Do not pretend to allow PADDING as the first cell of a v3 handshake
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit b8675e5fe35a737078b210d5c5c7440af3f2b145 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:34:28 2012 -0500 Do not pretend to allow PADDING as the first cell of a v3 handshake --- src/or/command.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index 6c1312b..a23e47f 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -213,7 +213,6 @@ static int command_allowed_before_handshake(uint8_t command) { switch (command) { - case CELL_PADDING: /*XXXX not implemented. Should remove, or implement? */ case CELL_VERSIONS: case CELL_VPADDING: case CELL_AUTHORIZE:

1 0

[torspec/master] proposal 190 got renamed.
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit a04a6f1412ca709d003e7acb07c13b9e91540e7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:33:31 2012 -0500 proposal 190 got renamed. --- proposals/190-password-bridge-authorization.txt | 101 -------------------- .../190-shared-secret-bridge-authorization.txt | 101 ++++++++++++++++++++ 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/proposals/190-password-bridge-authorization.txt b/proposals/190-password-bridge-authorization.txt deleted file mode 100644 index 95a0d19..0000000 --- a/proposals/190-password-bridge-authorization.txt +++ /dev/null @@ -1,101 +0,0 @@ -Filename: 190-shared-secret-bridge-authorization.txt -Title: Bridge Client Authorization Based on a Shared Secret -Author: George Kadianakis -Created: 04 Nov 2011 -Status: Open - -1. Overview - - Proposals 187 and 189 introduced AUTHORIZE and AUTHORIZED cells. - Their purpose is to make bridge relays scanning resistant against - censoring adversaries capable of probing hosts to observe whether - they speak the Tor protocol. - - This proposal specifies a bridge client authorization scheme based - on a shared secret between the bridge user and bridge operator. - -2. Motivation - - A bridge client authorization scheme should only allow clients who - show knowledge of a shared secret to talk Tor to the bridge. - -3. Shared-secret-based authorization - -3.1. Where do shared secrets come from? - - A shared secret is a piece of data known only to the bridge - operator and the bridge client. - - It's meant to be automatically generated by the bridge - implementation to avoid issues with insecure and weak passwords. - - Bridge implementations SHOULD create shared secrets by generating - random data using a strong RNG or PRNG. - -3.2. AUTHORIZE cell format - - In shared-secret-based authorization, the MethodFields field of the - AUTHORIZE cell becomes: - - 'shared_secret' [10 octets] - - where: - - 'shared_secret', is the shared secret between the bridge operator - and the bridge client. - -3.3. Cell parsing - - Bridge implementations MUST reject any AUTHORIZE cells whose - 'shared_secret' field does not match the shared secret negotiated - between the bridge operator and authorized bridge clients. - -4. Tor implementation - -4.1. Bridge side - - Tor bridge implementations MUST create the bridge shared secret by - generating 10 octets of random data using a strong RNG or PRNG. - - Tor bridge implementations MUST store the shared secret in - 'DataDirectory/keys/bridge_auth_ss_key' in hexademical encoding. - - Tor bridge implementations MUST support the boolean - 'BridgeRequireClientSharedSecretAuthorization' configuration file - option which enables bridge client authorization based on a shared - secret. - - If 'BridgeRequireClientSharedSecretAuthorization' is set, bridge - implementations MUST generate a new shared secret, if - 'DataDirectory/keys/bridge_auth_ss_key' does not already exist. - -4.2. Client side - - Tor client implementations must extend their Bridge line format to - support bridge shared secrets. The new format is: - Bridge <method> <address:port> [["keyid="]<id-fingerprint>] ["shared_secret="<shared_secret>] - - where <shared_secret> is the bridge shared secret in hexademical - encoding. - - Tor clients who use bridges with shared-secret-based client - authorization must specify the bridge's shared secret as in: - Bridge 12.34.56.78 shared_secret=934caff420aa7852b855 - -5. Discussion - -5.1. What should actually happen when a bridge rejects an AUTHORIZE - cell? - - When a bridge detects a badly formed or malicious AUTHORIZE cell, - it should assume that the other side is an adversary scanning for - bridges. The bridge should then act accordingly to avoid detection. - - This proposal does not try to specify how a bridge can avoid - detection by an adversary. - -6. Acknowledgements - - Thanks to Nick Mathewson and Robert Ransom for the help and - suggestions while writing this proposal. - diff --git a/proposals/190-shared-secret-bridge-authorization.txt b/proposals/190-shared-secret-bridge-authorization.txt new file mode 100644 index 0000000..95a0d19 --- /dev/null +++ b/proposals/190-shared-secret-bridge-authorization.txt @@ -0,0 +1,101 @@ +Filename: 190-shared-secret-bridge-authorization.txt +Title: Bridge Client Authorization Based on a Shared Secret +Author: George Kadianakis +Created: 04 Nov 2011 +Status: Open + +1. Overview + + Proposals 187 and 189 introduced AUTHORIZE and AUTHORIZED cells. + Their purpose is to make bridge relays scanning resistant against + censoring adversaries capable of probing hosts to observe whether + they speak the Tor protocol. + + This proposal specifies a bridge client authorization scheme based + on a shared secret between the bridge user and bridge operator. + +2. Motivation + + A bridge client authorization scheme should only allow clients who + show knowledge of a shared secret to talk Tor to the bridge. + +3. Shared-secret-based authorization + +3.1. Where do shared secrets come from? + + A shared secret is a piece of data known only to the bridge + operator and the bridge client. + + It's meant to be automatically generated by the bridge + implementation to avoid issues with insecure and weak passwords. + + Bridge implementations SHOULD create shared secrets by generating + random data using a strong RNG or PRNG. + +3.2. AUTHORIZE cell format + + In shared-secret-based authorization, the MethodFields field of the + AUTHORIZE cell becomes: + + 'shared_secret' [10 octets] + + where: + + 'shared_secret', is the shared secret between the bridge operator + and the bridge client. + +3.3. Cell parsing + + Bridge implementations MUST reject any AUTHORIZE cells whose + 'shared_secret' field does not match the shared secret negotiated + between the bridge operator and authorized bridge clients. + +4. Tor implementation + +4.1. Bridge side + + Tor bridge implementations MUST create the bridge shared secret by + generating 10 octets of random data using a strong RNG or PRNG. + + Tor bridge implementations MUST store the shared secret in + 'DataDirectory/keys/bridge_auth_ss_key' in hexademical encoding. + + Tor bridge implementations MUST support the boolean + 'BridgeRequireClientSharedSecretAuthorization' configuration file + option which enables bridge client authorization based on a shared + secret. + + If 'BridgeRequireClientSharedSecretAuthorization' is set, bridge + implementations MUST generate a new shared secret, if + 'DataDirectory/keys/bridge_auth_ss_key' does not already exist. + +4.2. Client side + + Tor client implementations must extend their Bridge line format to + support bridge shared secrets. The new format is: + Bridge <method> <address:port> [["keyid="]<id-fingerprint>] ["shared_secret="<shared_secret>] + + where <shared_secret> is the bridge shared secret in hexademical + encoding. + + Tor clients who use bridges with shared-secret-based client + authorization must specify the bridge's shared secret as in: + Bridge 12.34.56.78 shared_secret=934caff420aa7852b855 + +5. Discussion + +5.1. What should actually happen when a bridge rejects an AUTHORIZE + cell? + + When a bridge detects a badly formed or malicious AUTHORIZE cell, + it should assume that the other side is an adversary scanning for + bridges. The bridge should then act accordingly to avoid detection. + + This proposal does not try to specify how a bridge can avoid + detection by an adversary. + +6. Acknowledgements + + Thanks to Nick Mathewson and Robert Ransom for the help and + suggestions while writing this proposal. +

1 0