December 2016 - tor-commits - lists.torproject.org

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Dec '16

26 Dec '16

commit a7b6e6cda9de9d19b47a7e9825f9e63896433aa3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 12:18:19 2016 +0000 Update translations for tor-browser-manual --- ca/ca.po | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 4501bf8..0f06cc4 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -427,10 +427,16 @@ msgid "" "“32-bit” or “64-bit” software: this depends on the model of the computer you" " are using." msgstr "" +"Obtenir Tor contestarà amb un correu electrònic amb enllaços per a la " +"descàrrega dle paquet de dades del navegador Tor, la signatura criptogràfica" +" (que es precisa per verificar al descàrrega), la empremta digital " +"utilitzada com a signatura, i la suma de verificació. Haurà d'escollir entre" +" la opció de \"32-bit\" o \"64-bit\" depenen del processador de càlcul del " +"ordinador." #: downloading.page:57 msgid "To use GetTor via Twitter:" -msgstr "" +msgstr "Per utilitzar Obtenir Tor mitjançant Twitter: " #: downloading.page:62 msgid "" @@ -438,38 +444,49 @@ msgid "" "Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"Per obtenir els enllaços per la descàrrega del navegador Tor en anglès per " +"OS X, enviï una piulada a @get_tor amb el següent text: \"osx en\" (no " +"precisa se seguidor del compte)." #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" msgstr "" +"Per utilitzar Obtenir Tor mitjançant Jabber/XMPP (Tor Messenger, Jitsi, " +"CoyIM):" #: downloading.page:75 msgid "" "To get links for downloading Tor Browser in Chinese for Linux, send a " "message to gettor(a)torproject.org with the words \"linux zh\" in it." msgstr "" +"Per obtenir enllaços per la descàrrega del navegado Tor en Xinès per Linux, " +"enviï un correu electrònic gettor(a)torproject.org amb les següents paraules " +"en el cos del missatge: linux zh\"." #: downloading.page:84 msgid "Satori" -msgstr "" +msgstr "Satori" #: downloading.page:85 msgid "" "Satori is an add-on for the Chrome or Chromium browsers that allows you to " "download several security and privacy programs from different sources." msgstr "" +"Satori és un complement pels navegadors Chrome o Chromium que permet la " +"descàrrega de diversos programes de seguretat i privacitat mitjançant " +"diferents fonts." #: downloading.page:90 msgid "To download Tor Browser using Satori:" -msgstr "" +msgstr "Per la descàrrega del navegador Tor mitjançant Satori:" #: downloading.page:95 msgid "Install Satori from the Chrome App Store." -msgstr "" +msgstr "Instal·lar Satori des de Chrome App Store." #: downloading.page:100 msgid "Select Satori from your browser’s Apps menu." -msgstr "" +msgstr "Seleccioni Satori del menú d'aplicacions del navegador." #: downloading.page:105 msgid "" @@ -479,12 +496,19 @@ msgid "" "after the name of the program — each one represents a different source from " "which to get the software. Your download will then begin." msgstr "" +"Quan Satori s'executi, seleccioni la llengua. Un menú de selecció dels " +"llenguatges descarregats s'obrirà. Cerqui la entrada pel navegador Tor sota " +"el nom del sistema operatiu. Seleccioni \"A\" o \"B\" després del nom o del " +"programa - cadascun representa diferents fonts d'on obtindre el programari, " +"posteriorment la descàrrega començarà. " #: downloading.page:115 msgid "" "Wait for your download to finish, then find the “Generate Hash” section in " "Satori’s menu and click “Select Files”." msgstr "" +"Esperi per la descàrrega completa, posteriorment cerqui \"Generar resum\" " +"del menú Satori i fer clic en \"Selecció d'arxiu\"." #: downloading.page:121 msgid "" @@ -499,11 +523,11 @@ msgstr "" #: first-time.page:7 msgid "Learn how to use Tor Browser for the first time" -msgstr "" +msgstr "Aprengui com utilitzar per primer cop el navegador Tor." #: first-time.page:10 msgid "Running Tor Browser for the first time" -msgstr "" +msgstr "Executant per primer cop el navegador Tor." #: first-time.page:12 msgid "" @@ -511,6 +535,9 @@ msgid "" "Settings window. This offers you the option to connect directly to the Tor " "network, or to configure Tor Browser for your connection." msgstr "" +"Quan s'executi per primer cop el navegador Tor, s'obriran els paràmetres de " +"xarxa Tor. Permetent la opció de connexió directa a la xarxa Tor, o " +"configurar el navegador Tor per les connexions." #: first-time.page:19 msgid "Connect" @@ -526,6 +553,8 @@ msgid "" "external ref='media/first-time/connect.png' " "md5='9d07068f751a3bfd274365a4ba8d90ca'" msgstr "" +"extern ref='media/first-time/connect.png' " +"md5='9d07068f751a3bfd274365a4ba8d90ca'" #: first-time.page:23 msgid "" @@ -547,6 +576,9 @@ msgid "" "select this option. Tor Browser will take you through a series of " "configuration options." msgstr "" +"Si coneix que les seves connexions pateixen censura, o utilitza un servidor " +"intermedi, seleccioni aquesta opció. El navegador Tor permetrà fer les " +"configuracions pertinents." #: first-time.page:44 msgid "" @@ -619,15 +651,15 @@ msgstr "" #: known-issues.page:26 msgid "Kaspersky Internet Security 2012" -msgstr "" +msgstr "Kaspersky Internet Security 2012" #: known-issues.page:29 msgid "Sophos Antivirus for Mac" -msgstr "" +msgstr "Sophos Antivirus per Mac" #: known-issues.page:32 msgid "Microsoft Security Essentials" -msgstr "" +msgstr "Microsoft Security Essentials" #: known-issues.page:37 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Dec '16

26 Dec '16

commit d8deceab7849382b96e8dc0bfb8e27ae2bc95a3e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 11:48:18 2016 +0000 Update translations for tor-browser-manual --- ca/ca.po | 53 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 206b825..4501bf8 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -251,10 +251,15 @@ msgid "" "page for more information on the types of transport that are currently " "available." msgstr "" +"L'accés a la xarxa Tor pot tot sovint ser bloquejat pel seu proveïdor " +"d'Internet o pel govern. El navegador Tor incorpora una serie de programari " +"per evitar-ho. Aquestes eines s'anomenen \"connectors de transport\". " +"Consulti <link xref=\"transports\">connectors de transport</link> per a més " +"informació del tipus de transport disponible." #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "" +msgstr "Utilització de connectors de transport" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -266,12 +271,16 @@ msgid "" "external ref='media/circumvention/configure.png' " "md5='519d888303eadfe4cb03f178aedd90f5'" msgstr "" +"extern ref='media/circumvention/configure.png' " +"md5='519d888303eadfe4cb03f178aedd90f5'" #: circumvention.page:28 msgid "" "To use pluggable transports, click \"Configure\" in the Tor Launcher window " "that appears when you first run Tor Browser." msgstr "" +"Per l'utilització de connectors de transport, faci clic a \"Paràmetres\" en " +"el iniciador de Tor que apareix qua s'utilitza per primer cop." #: circumvention.page:33 msgid "" @@ -279,12 +288,17 @@ msgid "" " clicking on the green onion near your address bar and selecting “Tor " "Network Settings”." msgstr "" +"També pot configurar els connectors de transport mentre el navegador Tor " +"està executant-se, amb el clic en la ceba verda aprop de la barra d'adreces " +"i seleccionar \"Paràmetres de xarxa Tor\"." #: circumvention.page:41 msgid "" "Select “yes” when asked if your Internet Service Provider blocks connections" " to the Tor network." msgstr "" +"Seleccioni \"Si\" quan sigui preguntat si el seu proveïdor d'Internet " +"bloqueja les connexions de la xarxa Tor." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -296,16 +310,20 @@ msgid "" "external ref='media/circumvention/bridges.png' " "md5='910cdd5e45860b81a1ad4739c589a195'" msgstr "" +"extern ref='media/circumvention/bridges.png' " +"md5='910cdd5e45860b81a1ad4739c589a195'" #: circumvention.page:51 msgid "" "Select “Connect with provided bridges”. Tor Browser currently has six " "pluggable transport options to choose from." msgstr "" +"Seleccioni \"Connectar amb ponts\". El navegador Tor actualment té sis " +"connectors de transport disponibles." #: circumvention.page:60 msgid "Which transport should I use?" -msgstr "" +msgstr "Quin tipus de transport vol utilitzar?" #: circumvention.page:61 msgid "" @@ -314,6 +332,10 @@ msgid "" "Transports</link> page), and their effectiveness depends on your individual " "circumstances." msgstr "" +"Cadascun dels transports llistat en el menú d'iniciador Tor treballa de " +"manera diferent (per més informació, consultar <link " +"xref=\"transports\">connectors de transport</link> pàgina) per saber la seva" +" efectivitat depenen de les circumstàncies individuals. " #: circumvention.page:67 msgid "" @@ -321,6 +343,9 @@ msgid "" " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" "azure, meek-amazon." msgstr "" +"Si intenta eludir connexions bloquejades per primer cop, hauria de provar " +"els diferents tipus de transport: obfs3, obfs4, ScrambleSuit, fte, meek-" +"azure, meek-amazon." #: circumvention.page:72 msgid "" @@ -329,10 +354,14 @@ msgid "" "xref=\"bridges\">Bridges</link> section to learn what bridges are and how to" " obtain them." msgstr "" +"Si priva totes aquestes opcions, i cap resulta amb una connexió vàlida, " +"haurà d'introduir una adreça de pont de forma manual. Llegeixi <link " +"xref=\"bridges\">Ponts</link> la secció d'aprenentatge sobre ponts per saber" +" com fer-ho." #: downloading.page:7 msgid "How to download Tor Browser" -msgstr "" +msgstr "Com descarregar el navegador Tor." #: downloading.page:10 msgid "Downloading" @@ -345,6 +374,10 @@ msgid "" "will be secured using <link xref=\"secure-connections\">HTTPS</link>, which " "makes it much harder for somebody to tamper with." msgstr "" +"La manera segura i simple de descarregar el navegador Tor és mitjançant la " +"pàgina oficial del projecte Tor en el web https://www.torproject.org. La " +"connexió s'estableix de forma segura mitjançat <link xref=\"secure-" +"connections\">HTTPS</link>, que permet evitar les falsificacions." #: downloading.page:19 msgid "" @@ -352,10 +385,13 @@ msgid "" "for example, it could be blocked on your network. If this happens, you can " "use one of the alternative download methods listed below." msgstr "" +"Com sigui, hi han diverses maneres d'evitar l'accés al web del Projecte Tor:" +" per exemple, el bloqueig en la xarxa d'accés. Si això succeïx, pot " +"utilitzar un dels llocs de descàrrega que es citen a continuació." #: downloading.page:27 msgid "GetTor" -msgstr "" +msgstr "Obtenir Tor" #: downloading.page:28 msgid "" @@ -363,10 +399,14 @@ msgid "" "the latest version of Tor Browser, hosted at a variety of locations, such as" " Dropbox, Google Drive and Github.." msgstr "" +"Obtenir Tor és un servei que automàticament envia un missatge amb els " +"enllaços de la última versió del navegador Tor, en allotjaments " +"diversificats en punts diferents, com per exemple Dropbox, Google Drive i " +"Github." #: downloading.page:34 msgid "To use GetTor via email:" -msgstr "" +msgstr "Per utilitzar Obtenir Tor per correu electrònic:" #: downloading.page:39 msgid "" @@ -374,6 +414,9 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"Enviï un correu electrònic a gettor(a)torproject.org, i en el cos del missatge" +" escrigui les paraules \"windows\", \"osx\" o \"linux\", (sense cometes) " +"depenen del tipus de sistema operatiu que tingui." #: downloading.page:46 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Dec '16

26 Dec '16

commit 0164bdd4b508bc0281e49578727949d3f6897c19 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 06:18:20 2016 +0000 Update translations for tor-browser-manual --- de/de.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/de/de.po b/de/de.po index 918bbda..29d745e 100644 --- a/de/de.po +++ b/de/de.po @@ -414,7 +414,7 @@ msgstr "" #: downloading.page:90 msgid "To download Tor Browser using Satori:" -msgstr "" +msgstr "So laden Sie den Tor-Browser mit Satori herunter:" #: downloading.page:95 msgid "Install Satori from the Chrome App Store." @@ -717,6 +717,8 @@ msgid "" "When you log in to a website over Tor, there are several points you should " "bear in mind:" msgstr "" +"Wenn Sie sich auf einer Webseite über Tor anmelden, sollten Sie einige " +"Punkte beachten:" #: managing-identities.page:79 msgid "" @@ -787,7 +789,7 @@ msgstr "" #: onionsites.page:6 msgid "Services that are only accessible using Tor" -msgstr "" +msgstr "Dienste, die nur über Tor zugänglich sind" #: onionsites.page:10 msgid "Onion Services"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Dec '16

26 Dec '16

commit 0e2e312a1c8fdebe566d8405d8b7153ae86ccb95 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 05:48:19 2016 +0000 Update translations for tor-browser-manual --- de/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/de.po b/de/de.po index 591ae24..918bbda 100644 --- a/de/de.po +++ b/de/de.po @@ -34,14 +34,14 @@ msgstr "" #: about-tor-browser.page:10 msgid "About Tor Browser" -msgstr "Über den Tor Browser" +msgstr "Über den Tor-Browser" #: about-tor-browser.page:12 msgid "" "Tor Browser uses the Tor network to protect your privacy and anonymity. " "Using the Tor network has two main properties:" msgstr "" -"Der Tor Browser benutzt das Tor Netzwerk um deine Privatsfähre und deine " +"Der Tor-Browser benutzt das Tor Netzwerk um deine Privatsfähre und deine " "Anonymität zu schützen. Das Tor Netzwerk zu benutzen hat zwei " "Haupteigenschaften:"

1 0

[sandboxed-tor-browser/master] Recreate the Caches directory if missing.
by yawning＠torproject.org 26 Dec '16

26 Dec '16

commit 244bdb6cb874c5f6df27b6c46ed0e45440a83713 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Dec 23 03:20:46 2016 +0000 Recreate the Caches directory if missing. Applying the non-incremental update seems to obliterate this, so ensure it is present. --- src/cmd/sandboxed-tor-browser/internal/sandbox/application.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index 122e714..a126e4f 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -97,7 +97,10 @@ func RunTorBrowser(cfg *config.Config, manif *config.Manifest, tor *tor.Tor) (cm realDesktopDir := filepath.Join(realBrowserHome, "Desktop") realDownloadsDir := filepath.Join(realBrowserHome, "Downloads") - // Ensure that the `Downloads` and `Desktop` mount points exist. + // Ensure that the `Caches`, `Downloads` and `Desktop` mount points exist. + if err = os.MkdirAll(realCachesDir, DirMode); err != nil { + return + } if err = os.MkdirAll(realDesktopDir, DirMode); err != nil { return }

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 25 Dec '16

25 Dec '16

commit ca2543f6fb0b3415362167bd50df1550a24f1daf Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 25 19:48:19 2016 +0000 Update translations for tor-browser-manual --- sv/sv.po | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 8cd7498..45157c4 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -39,6 +39,8 @@ msgid "" "Tor Browser uses the Tor network to protect your privacy and anonymity. " "Using the Tor network has two main properties:" msgstr "" +"Tor webbläsare använder Tor nätverket för att skydda ditt privatliv och din " +"anonymitet. Tor nätverk har två huvudsakliga egenskaper:" #: about-tor-browser.page:18 msgid "" @@ -186,7 +188,7 @@ msgstr "" #: circumvention.page:6 msgid "What to do if the Tor network is blocked" -msgstr "" +msgstr "Vad göra om Tor nätverk är blockerat" #: circumvention.page:10 msgid "Circumvention" @@ -640,7 +642,7 @@ msgstr "" #: managing-identities.page:55 msgid "Logging in over Tor" -msgstr "" +msgstr "Logga in på Tor" #: managing-identities.page:56 msgid "" @@ -910,7 +912,7 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" -msgstr "" +msgstr "Lär hur du skyddar din data med hjälp av Tor webbläsare och HTTPS" #: secure-connections.page:12 msgid "Secure Connections" @@ -991,7 +993,7 @@ msgstr "" #: secure-connections.page:115 msgid "Whether or not Tor is being used." -msgstr "" +msgstr "Om Tor används eller ej" #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" @@ -1033,7 +1035,7 @@ msgstr "" #: security-slider.page:32 msgid "Security Levels" -msgstr "" +msgstr "Säkerhetsnivåer" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1094,13 +1096,15 @@ msgstr "" #: security-slider.page:73 msgid "Low" -msgstr "" +msgstr "Låg" #: security-slider.page:74 msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"På den här säkerhetsnivån är webbläsarens alla funktioner aktiverade. Detta " +"är det mest användbara alternativet. " #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" @@ -1177,7 +1181,7 @@ msgstr "" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" -msgstr "" +msgstr "Vad du kan göra om Tor webbläsare inte fungerar" #: troubleshooting.page:12 msgid "" @@ -1188,13 +1192,15 @@ msgstr "" #: troubleshooting.page:21 msgid "Quick fixes" -msgstr "" +msgstr "Snabba åtgärder" #: troubleshooting.page:22 msgid "" "If Tor Browser doesn’t connect, there may be a simple solution. Try each of " "the following:" msgstr "" +"Om Tor webbläsare inte ansluter, kan det finnas en enkel lösning. Prova " +"följande alternativ:" #: troubleshooting.page:29 msgid "" @@ -1217,7 +1223,7 @@ msgstr "" #: troubleshooting.page:49 msgid "Temporarily disable your firewall." -msgstr "" +msgstr "Stäng av din brandvägg tillfälligt" #: troubleshooting.page:54 msgid "" @@ -1238,7 +1244,7 @@ msgstr "" #: troubleshooting.page:74 msgid "Known issues" -msgstr "" +msgstr "Kända problem" #: troubleshooting.page:75 msgid "" @@ -1250,11 +1256,11 @@ msgstr "" #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" -msgstr "" +msgstr "Hur du raderar Tor webbläsare från ditt system" #: uninstalling.page:10 msgid "Uninstalling" -msgstr "" +msgstr "Avinstallera" #: uninstalling.page:12 msgid "" @@ -1265,7 +1271,7 @@ msgstr "" #: uninstalling.page:18 msgid "Removing Tor Browser from your system is simple:" -msgstr "" +msgstr "Att radera Tor från ditt system är enkelt:" #: uninstalling.page:24 msgid "" @@ -1277,11 +1283,11 @@ msgstr "" #: uninstalling.page:32 msgid "Delete the Tor Browser folder." -msgstr "" +msgstr "Radera Tor mapp" #: uninstalling.page:35 msgid "Empty your Trash" -msgstr "" +msgstr "Töm din Skräpkorg" #: uninstalling.page:39 msgid "" @@ -1290,11 +1296,11 @@ msgstr "" #: updating.page:6 msgid "How to update Tor Browser" -msgstr "" +msgstr "Hur du uppdaterar Tor Webläsare" #: updating.page:10 msgid "Updating" -msgstr "" +msgstr "Uppdaterar" #: updating.page:12 msgid "" @@ -1313,7 +1319,7 @@ msgstr "" #: updating.page:26 msgid "Updating Tor Browser automatically" -msgstr "" +msgstr "Uppdatera Tor webbläsare automatiskt" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1348,6 +1354,8 @@ msgid "" "When Tor Browser has finished checking for updates, click on the “Update” " "button." msgstr "" +"När Tor webbläsare har granskat om tillgängliga uppdateringar finns, klicka " +"på knappen \"Uppdatera\"." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1368,7 +1376,7 @@ msgstr "" #: updating.page:58 msgid "Updating Tor Browser manually" -msgstr "" +msgstr "Uppdatera Tor webbläsare manuellt" #: updating.page:61 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 25 Dec '16

25 Dec '16

commit c3bd90546fd51e12b5a3dfb3e8385fcd7ceed1a0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 25 18:48:22 2016 +0000 Update translations for tor-browser-manual --- sv/sv.po | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 5bc3ceb..8cd7498 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -5,12 +5,13 @@ # Jonatan Nyberg <jonatan(a)autistici.org>, 2016 # Daniel Sjöberg <sjbrg(a)protonmail.com>, 2016 # Peter Michanek <peter(a)michanek.se>, 2016 +# Nikolai Stenfors <nikolai.stenfors(a)bahnhof.se>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Peter Michanek <peter(a)michanek.se>, 2016\n" +"Last-Translator: Nikolai Stenfors <nikolai.stenfors(a)bahnhof.se>, 2016\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -189,7 +190,7 @@ msgstr "" #: circumvention.page:10 msgid "Circumvention" -msgstr "" +msgstr "Kringå" #: circumvention.page:12 msgid "" @@ -281,7 +282,7 @@ msgstr "" #: downloading.page:7 msgid "How to download Tor Browser" -msgstr "" +msgstr "Hur du laddar ner Tor" #: downloading.page:10 msgid "Downloading" @@ -367,11 +368,11 @@ msgstr "" #: downloading.page:90 msgid "To download Tor Browser using Satori:" -msgstr "" +msgstr "Ladda ner Tor med Satori:" #: downloading.page:95 msgid "Install Satori from the Chrome App Store." -msgstr "" +msgstr "Installera Satori med Chrome App Store." #: downloading.page:100 msgid "Select Satori from your browser’s Apps menu." @@ -405,11 +406,11 @@ msgstr "" #: first-time.page:7 msgid "Learn how to use Tor Browser for the first time" -msgstr "" +msgstr "Lär dig använda Tor för första gången" #: first-time.page:10 msgid "Running Tor Browser for the first time" -msgstr "" +msgstr "Att använda Tor för första gången" #: first-time.page:12 msgid "" @@ -502,11 +503,11 @@ msgstr "Tor Browser bruksanvisning" #: known-issues.page:6 msgid "A list of known issues." -msgstr "" +msgstr "En lista över kända problem" #: known-issues.page:10 msgid "Known Issues" -msgstr "" +msgstr "Kända problem" #: known-issues.page:14 msgid "" @@ -525,7 +526,7 @@ msgstr "" #: known-issues.page:26 msgid "Kaspersky Internet Security 2012" -msgstr "" +msgstr "Kaspersky Internet Security 2012" #: known-issues.page:29 msgid "Sophos Antivirus for Mac" @@ -579,7 +580,7 @@ msgstr "" #: managing-identities.page:10 msgid "Managing identities" -msgstr "" +msgstr "Hantera identiteter" #: managing-identities.page:12 msgid "" @@ -733,7 +734,7 @@ msgstr "" #: onionsites.page:6 msgid "Services that are only accessible using Tor" -msgstr "" +msgstr "Tjänster som endast nås via Tor" #: onionsites.page:10 msgid "Onion Services" @@ -829,7 +830,7 @@ msgstr "" #: plugins.page:13 msgid "Flash Player" -msgstr "" +msgstr "Flash Player" #: plugins.page:14 msgid "" @@ -850,7 +851,7 @@ msgstr "" #: plugins.page:31 msgid "JavaScript" -msgstr "" +msgstr "JavaScript" #: plugins.page:32 msgid "" @@ -890,7 +891,7 @@ msgstr "" #: plugins.page:58 msgid "Browser Add-ons" -msgstr "" +msgstr "Tillägg till webläsaren" #: plugins.page:59 msgid "" @@ -913,7 +914,7 @@ msgstr "" #: secure-connections.page:12 msgid "Secure Connections" -msgstr "" +msgstr "Säkra anslutningar" #: secure-connections.page:14 msgid "" @@ -968,7 +969,7 @@ msgstr "" #: secure-connections.page:62 msgid "Potentially visible data" -msgstr "" +msgstr "Potentiellt synliga data" #: secure-connections.page:70 msgid "The site being visited." @@ -976,11 +977,11 @@ msgstr "" #: secure-connections.page:81 msgid "Username and password used for authentication." -msgstr "" +msgstr "Användarnamn och lösenord som används för autentisering" #: secure-connections.page:92 msgid "Data being transmitted." -msgstr "" +msgstr "Data överförs" #: secure-connections.page:103 msgid ""

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 25 Dec '16

25 Dec '16

commit 7414f2e009bc0123beb40813c332695a048d0ddd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 25 18:48:10 2016 +0000 Update translations for tails-greeter-2 --- sv/sv.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index e7f55dd..806276a 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-03 13:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>, 2016\n" +"Last-Translator: Nikolai Stenfors <nikolai.stenfors(a)bahnhof.se>, 2016\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,6 +28,8 @@ msgid "" "tasks. Otherwise, the administration password is disabled for better " "security." msgstr "" +"Ange ett administratörslösenord ifall du behöver utföra administrativa uppgifter.\n" +"I annat fall kommer administratörsåtkomst inaktiveras." #: ../data/greeter.ui.h:3 msgid "Enter an administration password" @@ -156,7 +158,7 @@ msgstr "Spara ytterligare inställningar" #: ../data/greeter.ui.h:35 msgid "Add an additional setting" -msgstr "" +msgstr "Lägg till ytterligare inställningar" #: ../data/greeter.ui.h:36 msgid "Network Configuration" @@ -171,7 +173,7 @@ msgstr "" #: ../data/greeter.ui.h:38 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Anslut direkt till Tor-nätverket (förvald)." #: ../data/greeter.ui.h:39 msgid "Configure a Tor bridge, firewall, or proxy settings" @@ -197,11 +199,11 @@ msgstr "På (standard)" #: ../data/greeter.ui.h:44 msgid "Network Connection" -msgstr "" +msgstr "Nätverksanslutning" #: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914 msgid "Direct (default)" -msgstr "" +msgstr "Direkt (standard)" #: ../tailsgreeter/gui.py:456 msgid "Shutdown" @@ -225,7 +227,7 @@ msgstr "Tillbaka" #: ../tailsgreeter/gui.py:652 msgid "Unlocking…" -msgstr "" +msgstr "Låser upp..." #: ../tailsgreeter/gui.py:680 msgid ""

1 0

[stem/master] Descriptor protocol support
by atagar＠torproject.org 25 Dec '16

25 Dec '16

commit 7486132886310873632ffa40a38d883bdc2b5ac7 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 23 10:21:05 2016 -0800 Descriptor protocol support Adding support for the new protocol descriptor fields... https://gitweb.torproject.org/torspec.git/commit/?id=eb4fb3c5 --- docs/change_log.rst | 4 ++ stem/descriptor/__init__.py | 75 +++++++++++++++++++++++ stem/descriptor/microdescriptor.py | 9 +++ stem/descriptor/networkstatus.py | 30 +++++++++ stem/descriptor/router_status_entry.py | 9 +++ stem/descriptor/server_descriptor.py | 9 +++ test/settings.cfg | 1 + test/unit/descriptor/microdescriptor.py | 10 +++ test/unit/descriptor/networkstatus/document_v3.py | 22 +++++++ test/unit/descriptor/protocol.py | 46 ++++++++++++++ test/unit/descriptor/router_status_entry.py | 5 ++ test/unit/descriptor/server_descriptor.py | 9 +++ 12 files changed, 229 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index d6ae108..713ef51 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -43,6 +43,10 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. + * **Descriptors** + + * Support for protocol descriptor fields (:spec:`eb4fb3c5`) + .. _version_1.5: Version 1.5 (November 20th, 2016) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index fc44843..208741a 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -38,6 +38,7 @@ Package for parsing and processing descriptor data. import base64 import codecs +import collections import copy import hashlib import os @@ -86,6 +87,72 @@ DocumentHandler = stem.util.enum.UppercaseEnum( ) +class ProtocolSupport(object): + """ + Protocols supported by a relay. + + .. versionadded:: 1.6.0 + """ + + def __init__(self, keyword, value): + # parses 'protocol' entries like: Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 + + self._entries = OrderedDict() + + for entry in value.split(): + if '=' not in entry: + raise ValueError("Protocol entires are expected to be a series of 'key=value' pairs but was: %s %s" % (keyword, value)) + + k, v = entry.split('=', 1) + + if '-' in v: + min_value, max_value = v.split('-', 1) + else: + min_value = max_value = v + + if not min_value.isdigit() or not max_value.isdigit(): + raise ValueError('Protocol values should be a number or number range, but was: %s %s' % (keyword, value)) + + self._entries[k] = Protocol(k, int(min_value), int(max_value)) + + def is_supported(self, protocol, version = None): + """ + Checks if the given protocol is supported. + + :param str protocol: protocol to check support of (DirCache, HSDir, etc) + :param int version: protocol version to check support of + + :returns: **True** if the protocol is supported, **False** otherwise + """ + + supported = self._entries.get(protocol) + + if not supported: + return False + elif version and version < supported.min_version: + return False + elif version and version > supported.max_version: + return False + else: + return True + + def __iter__(self): + for protocol in self._entries.values(): + yield protocol + + +class Protocol(collections.namedtuple('Protocol', ['name', 'min_version', 'max_version'])): + """ + Individual protocol range supported by a relay. + + .. versionadded:: 1.6.0 + + :var str name: protocol name (ex. DirCache, HSDir, etc) + :var int min_version: minimum protocol supported + :var int max_version: maximum protocol supported + """ + + def parse_file(descriptor_file, descriptor_type = None, validate = False, document_handler = DocumentHandler.ENTRIES, normalize_newlines = None, **kwargs): """ Simple function to read the descriptor contents from a file, providing an @@ -389,6 +456,14 @@ def _parse_forty_character_hex(keyword, attribute): return _parse +def _parse_protocol_line(keyword, attribute): + def _parse(descriptor, entries): + value = _value(keyword, entries) + setattr(descriptor, attribute, ProtocolSupport(keyword, value)) + + return _parse + + def _parse_key_block(keyword, attribute, expected_block_type, value_attribute = None): def _parse(descriptor, entries): value, block_type, block_contents = entries[keyword][0] diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index d8f8cd0..e1bab9c 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -74,6 +74,7 @@ from stem.descriptor import ( _read_until_keywords, _values, _parse_simple_line, + _parse_protocol_line, _parse_key_block, ) @@ -98,6 +99,7 @@ SINGLE_FIELDS = ( 'family', 'p', 'p6', + 'pr', ) @@ -187,6 +189,7 @@ _parse_onion_key_line = _parse_key_block('onion-key', 'onion_key', 'RSA PUBLIC K _parse_ntor_onion_key_line = _parse_simple_line('ntor-onion-key', 'ntor_onion_key') _parse_family_line = _parse_simple_line('family', 'family', func = lambda v: v.split(' ')) _parse_p6_line = _parse_simple_line('p6', 'exit_policy_v6', func = lambda v: stem.exit_policy.MicroExitPolicy(v)) +_parse_pr_line = _parse_protocol_line('pr', 'protocols') class Microdescriptor(Descriptor): @@ -208,6 +211,7 @@ class Microdescriptor(Descriptor): :var hash identifiers: mapping of key types (like rsa1024 or ed25519) to their base64 encoded identity, this is only used for collision prevention (:trac:`11743`) + :var stem.descriptor.ProtocolSupport protocols: supported protocols :var str identifier: base64 encoded identity digest (**deprecated**, use identifiers instead) @@ -222,6 +226,9 @@ class Microdescriptor(Descriptor): .. versionchanged:: 1.5.0 Added the identifiers attribute, and deprecated identifier and identifier_type since the field can now appear multiple times. + + .. versionchanged:: 1.6.0 + Added the protocols attribute. """ ATTRIBUTES = { @@ -234,6 +241,7 @@ class Microdescriptor(Descriptor): 'identifier_type': (None, _parse_id_line), # deprecated in favor of identifiers 'identifier': (None, _parse_id_line), # deprecated in favor of identifiers 'identifiers': ({}, _parse_id_line), + 'protocols': (None, _parse_pr_line), 'digest': (None, _parse_digest), } @@ -244,6 +252,7 @@ class Microdescriptor(Descriptor): 'family': _parse_family_line, 'p': _parse_p_line, 'p6': _parse_p6_line, + 'pr': _parse_pr_line, 'id': _parse_id_line, } diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 7456b37..75ec459 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -73,6 +73,7 @@ from stem.descriptor import ( _parse_if_present, _parse_timestamp_line, _parse_forty_character_hex, + _parse_protocol_line, _parse_key_block, ) @@ -123,6 +124,10 @@ HEADER_STATUS_DOCUMENT_FIELDS = ( ('shared-rand-commit', True, False, False), ('shared-rand-previous-value', True, True, False), ('shared-rand-current-value', True, True, False), + ('recommended-client-protocols', True, True, False), + ('recommended-relay-protocols', True, True, False), + ('required-client-protocols', True, True, False), + ('required-relay-protocols', True, True, False), ('params', True, True, False), ) @@ -756,6 +761,10 @@ _parse_header_server_versions_line = _parse_versions_line('server-versions', 'se _parse_header_known_flags_line = _parse_simple_line('known-flags', 'known_flags', func = lambda v: [entry for entry in v.split(' ') if entry]) _parse_footer_bandwidth_weights_line = _parse_simple_line('bandwidth-weights', 'bandwidth_weights', func = lambda v: _parse_int_mappings('bandwidth-weights', v, True)) _parse_shared_rand_participate_line = _parse_if_present('shared-rand-participate', 'is_shared_randomness_participate') +_parse_recommended_client_protocols_line = _parse_protocol_line('recommended-client-protocols', 'recommended_client_protocols') +_parse_recommended_relay_protocols_line = _parse_protocol_line('recommended-relay-protocols', 'recommended_relay_protocols') +_parse_required_client_protocols_line = _parse_protocol_line('required-client-protocols', 'required_client_protocols') +_parse_required_relay_protocols_line = _parse_protocol_line('required-relay-protocols', 'required_relay_protocols') class NetworkStatusDocumentV3(NetworkStatusDocument): @@ -812,6 +821,15 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :var str shared_randomness_current_value: base64 encoded current shared random value + :var stem.descriptor.ProtocolSupport recommended_client_protocols: recommended + protocols for clients + :var stem.descriptor.ProtocolSupport recommended_relay_protocols: recommended + protocols for relays + :var stem.descriptor.ProtocolSupport required_client_protocols: required + protocols for clients + :var stem.descriptor.ProtocolSupport required_relay_protocols: required + protocols for relays + **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined @@ -824,6 +842,10 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): shared_randomness_previous_value, shared_randomness_current_reveal_count, and shared_randomness_current_value attributes. + + .. versionchanged:: 1.6.0 + Added the recommended_client_protocols, recommended_relay_protocols, + required_client_protocols, and required_relay_protocols. """ ATTRIBUTES = { @@ -851,6 +873,10 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'shared_randomness_previous_value': (None, _parse_shared_rand_previous_value), 'shared_randomness_current_reveal_count': (None, _parse_shared_rand_current_value), 'shared_randomness_current_value': (None, _parse_shared_rand_current_value), + 'recommended_client_protocols': (None, _parse_recommended_client_protocols_line), + 'recommended_relay_protocols': (None, _parse_recommended_relay_protocols_line), + 'required_client_protocols': (None, _parse_required_client_protocols_line), + 'required_relay_protocols': (None, _parse_required_relay_protocols_line), 'params': ({}, _parse_header_parameters_line), 'signatures': ([], _parse_footer_directory_signature_line), @@ -876,6 +902,10 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'shared-rand-commit': _parsed_shared_rand_commit, 'shared-rand-previous-value': _parse_shared_rand_previous_value, 'shared-rand-current-value': _parse_shared_rand_current_value, + 'recommended-client-protocols': _parse_recommended_client_protocols_line, + 'recommended-relay-protocols': _parse_recommended_relay_protocols_line, + 'required-client-protocols': _parse_required_client_protocols_line, + 'required-relay-protocols': _parse_required_relay_protocols_line, 'params': _parse_header_parameters_line, } diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index bf146a9..abdefa2 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -32,9 +32,12 @@ from stem.descriptor import ( _value, _values, _get_descriptor_components, + _parse_protocol_line, _read_until_keywords, ) +_parse_pr_line = _parse_protocol_line('pr', 'protocols') + def _parse_file(document_file, validate, entry_class, entry_keyword = 'r', start_position = None, end_position = None, section_end_keywords = (), extra_args = ()): """ @@ -560,6 +563,7 @@ class RouterStatusEntryV3(RouterStatusEntry): information that isn't yet recognized :var stem.exit_policy.MicroExitPolicy exit_policy: router's exit policy + :var stem.descriptor.ProtocolSupport protocols: supported protocols :var list microdescriptor_hashes: **\*** tuples of two values, the list of consensus methods for generating a set of digests and the 'algorithm => @@ -570,6 +574,9 @@ class RouterStatusEntryV3(RouterStatusEntry): .. versionchanged:: 1.5.0 Added the identifier and identifier_type attributes. + + .. versionchanged:: 1.6.0 + Added the protocols attribute. """ ATTRIBUTES = dict(RouterStatusEntry.ATTRIBUTES, **{ @@ -584,6 +591,7 @@ class RouterStatusEntryV3(RouterStatusEntry): 'unrecognized_bandwidth_entries': ([], _parse_w_line), 'exit_policy': (None, _parse_p_line), + 'pr': (None, _parse_pr_line), 'microdescriptor_hashes': ([], _parse_m_line), }) @@ -591,6 +599,7 @@ class RouterStatusEntryV3(RouterStatusEntry): 'a': _parse_a_line, 'w': _parse_w_line, 'p': _parse_p_line, + 'pr': _parse_pr_line, 'id': _parse_id_line, 'm': _parse_m_line, }) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 9f7d8d1..ffd0183 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -58,6 +58,7 @@ from stem.descriptor import ( _parse_bytes_line, _parse_timestamp_line, _parse_forty_character_hex, + _parse_protocol_line, _parse_key_block, ) @@ -96,6 +97,7 @@ SINGLE_FIELDS = ( 'protocols', 'allow-single-hop-exits', 'tunnelled-dir-server', + 'proto', 'onion-key-crosscert', 'ntor-onion-key', 'ntor-onion-key-crosscert', @@ -394,6 +396,7 @@ _parse_write_history_line = functools.partial(_parse_history_line, 'write-histor _parse_ipv6_policy_line = _parse_simple_line('ipv6-policy', 'exit_policy_v6', func = lambda v: stem.exit_policy.MicroExitPolicy(v)) _parse_allow_single_hop_exits_line = _parse_if_present('allow-single-hop-exits', 'allow_single_hop_exits') _parse_tunneled_dir_server_line = _parse_if_present('tunnelled-dir-server', 'allow_tunneled_dir_requests') +_parse_proto_line = _parse_protocol_line('proto', 'protocols') _parse_caches_extra_info_line = _parse_if_present('caches-extra-info', 'extra_info_cache') _parse_family_line = _parse_simple_line('family', 'family', func = lambda v: set(v.split(' '))) _parse_eventdns_line = _parse_simple_line('eventdns', 'eventdns', func = lambda v: v == '1') @@ -447,6 +450,7 @@ class ServerDescriptor(Descriptor): :var list or_addresses: **\*** alternative for our address/or_port attributes, each entry is a tuple of the form (address (**str**), port (**int**), is_ipv6 (**bool**)) + :var stem.descriptor.ProtocolSupport protocols: supported protocols **Deprecated**, moved to extra-info descriptor... @@ -463,6 +467,9 @@ class ServerDescriptor(Descriptor): .. versionchanged:: 1.5.0 Added the allow_tunneled_dir_requests attribute. + + .. versionchanged:: 1.6.0 + Added the protocols attribute. """ ATTRIBUTES = { @@ -493,6 +500,7 @@ class ServerDescriptor(Descriptor): 'hibernating': (False, _parse_hibernating_line), 'allow_single_hop_exits': (False, _parse_allow_single_hop_exits_line), 'allow_tunneled_dir_requests': (False, _parse_tunneled_dir_server_line), + 'protocols': ({}, _parse_proto_line), 'extra_info_cache': (False, _parse_caches_extra_info_line), 'extra_info_digest': (None, _parse_extrainfo_digest_line), 'hidden_service_dir': (None, _parse_hidden_service_dir_line), @@ -528,6 +536,7 @@ class ServerDescriptor(Descriptor): 'ipv6-policy': _parse_ipv6_policy_line, 'allow-single-hop-exits': _parse_allow_single_hop_exits_line, 'tunnelled-dir-server': _parse_tunneled_dir_server_line, + 'proto': _parse_proto_line, 'caches-extra-info': _parse_caches_extra_info_line, 'family': _parse_family_line, 'eventdns': _parse_eventdns_line, diff --git a/test/settings.cfg b/test/settings.cfg index 4913202..627c270 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -179,6 +179,7 @@ test.unit_tests |test.unit.descriptor.export.TestExport |test.unit.descriptor.reader.TestDescriptorReader |test.unit.descriptor.remote.TestDescriptorDownloader +|test.unit.descriptor.protocol.TestProtocol |test.unit.descriptor.server_descriptor.TestServerDescriptor |test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor |test.unit.descriptor.microdescriptor.TestMicrodescriptor diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index 10ccd15..9d4d4fc 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -98,6 +98,7 @@ class TestMicrodescriptor(unittest.TestCase): self.assertEqual({}, desc.identifiers) self.assertEqual(None, desc.identifier_type) self.assertEqual(None, desc.identifier) + self.assertEqual(None, desc.protocols) self.assertEqual([], desc.get_unrecognized_lines()) def test_unrecognized_line(self): @@ -165,6 +166,15 @@ class TestMicrodescriptor(unittest.TestCase): desc = get_microdescriptor({'p': 'accept 80,110,143,443'}) self.assertEqual(stem.exit_policy.MicroExitPolicy('accept 80,110,143,443'), desc.exit_policy) + def test_protocols(self): + """ + Basic check for 'pr' lines. + """ + + desc = get_microdescriptor({'pr': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) + self.assertEqual(10, len(list(desc.protocols))) + self.assertTrue(desc.protocols.is_supported('Desc')) + def test_identifier(self): """ Basic check for 'id' lines. diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index aae12a6..09faf43 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -343,6 +343,10 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(None, document.shared_randomness_previous_value) self.assertEqual(None, document.shared_randomness_current_reveal_count) self.assertEqual(None, document.shared_randomness_current_value) + self.assertEqual(None, document.recommended_client_protocols) + self.assertEqual(None, document.recommended_relay_protocols) + self.assertEqual(None, document.required_client_protocols) + self.assertEqual(None, document.required_relay_protocols) self.assertEqual(DEFAULT_PARAMS, document.params) self.assertEqual((), document.directory_authorities) self.assertEqual({}, document.bandwidth_weights) @@ -926,6 +930,24 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(None, document.shared_randomness_current_reveal_count) self.assertEqual(None, document.shared_randomness_current_value) + def test_parameters(self): + """ + Parses the parameters attributes. + """ + + document = get_network_status_document_v3(OrderedDict([ + ('vote-status', 'vote'), + ('recommended-client-protocols', 'HSDir=1 HSIntro=3'), + ('recommended-relay-protocols', 'Cons=1 Desc=1'), + ('required-client-protocols', 'HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1'), + ('required-relay-protocols', 'DirCache=1'), + ])) + + self.assertEqual(2, len(list(document.recommended_client_protocols))) + self.assertEqual(2, len(list(document.recommended_relay_protocols))) + self.assertEqual(4, len(list(document.required_client_protocols))) + self.assertEqual(1, len(list(document.required_relay_protocols))) + def test_params(self): """ General testing for the 'params' line, exercising the happy cases. diff --git a/test/unit/descriptor/protocol.py b/test/unit/descriptor/protocol.py new file mode 100644 index 0000000..a47d7c6 --- /dev/null +++ b/test/unit/descriptor/protocol.py @@ -0,0 +1,46 @@ +""" +Unit tessts for the stem.descriptor.ProtocolSupport class. +""" + +import unittest + +from stem.descriptor import Protocol, ProtocolSupport + + +class TestProtocol(unittest.TestCase): + def test_parsing(self): + expected = [ + Protocol(name = 'Desc', min_version = 1, max_version = 1), + Protocol(name = 'Link', min_version = 1, max_version = 4), + Protocol(name = 'Microdesc', min_version = 1, max_version = 1), + Protocol(name = 'Relay', min_version = 1, max_version = 2), + ] + + self.assertEqual(expected, list(ProtocolSupport('pr', 'Desc=1 Link=1-4 Microdesc=1 Relay=1-2'))) + + def test_parse_with_no_mapping(self): + try: + ProtocolSupport('pr', 'Desc Link=1-4') + self.fail('Did not raise expected exception') + except ValueError as exc: + self.assertEqual("Protocol entires are expected to be a series of 'key=value' pairs but was: pr Desc Link=1-4", str(exc)) + + def test_parse_with_non_int_version(self): + try: + ProtocolSupport('pr', 'Desc=hi Link=1-4') + self.fail('Did not raise expected exception') + except ValueError as exc: + self.assertEqual('Protocol values should be a number or number range, but was: pr Desc=hi Link=1-4', str(exc)) + + def test_is_supported(self): + protocol = ProtocolSupport('pr', 'Desc=1 Link=2-4 Microdesc=1 Relay=1-2') + self.assertFalse(protocol.is_supported('NoSuchProtocol')) + self.assertFalse(protocol.is_supported('Desc', 2)) + self.assertTrue(protocol.is_supported('Desc')) + self.assertTrue(protocol.is_supported('Desc', 1)) + + self.assertFalse(protocol.is_supported('Link', 1)) + self.assertTrue(protocol.is_supported('Link', 2)) + self.assertTrue(protocol.is_supported('Link', 3)) + self.assertTrue(protocol.is_supported('Link', 4)) + self.assertFalse(protocol.is_supported('Link', 5)) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 25ba99d..b8597be 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -482,6 +482,11 @@ class TestRouterStatusEntry(unittest.TestCase): content = get_router_status_entry_v3({'s': s_line}, content = True) self._expect_invalid_attr(content, 'flags', expected) + def test_protocols(self): + desc = get_router_status_entry_v3({'pr': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) + self.assertEqual(10, len(list(desc.protocols))) + self.assertTrue(desc.protocols.is_supported('Desc')) + def test_versions(self): """ Handles a variety of version inputs. diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 834d1ea..d84ad48 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -657,6 +657,15 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= desc = get_relay_server_descriptor({'ipv6-policy': 'accept 22-23,53,80,110'}) self.assertEqual(expected, desc.exit_policy_v6) + def test_protocols(self): + """ + Checks a 'proto' line. + """ + + desc = get_relay_server_descriptor({'proto': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) + self.assertEqual(10, len(list(desc.protocols))) + self.assertTrue(desc.protocols.is_supported('Desc')) + def test_ntor_onion_key(self): """ Checks a 'ntor-onion-key' line.

1 0

[stem/master] Only show newly added descriptor lines once
by atagar＠torproject.org 25 Dec '16

25 Dec '16

commit be11d89bf20d8c46bbc463b78fbca217bb8d4d42 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 24 12:16:21 2016 -0800 Only show newly added descriptor lines once Microdescriptors added a new field and our tests are notifying us about it. This is all well and good, but since it notifies for *every* line it drowns out the rest of our test output. We only need one example of the line so suppressing the rest. --- test/integ/descriptor/networkstatus.py | 4 ++-- test/util.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index e02f178..f4de8f5 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -46,7 +46,7 @@ class TestNetworkStatus(unittest.TestCase): reported_flags.append(flag) for line in router.get_unrecognized_lines(): - register_new_capability('Consensus Line', line) + register_new_capability('Consensus Line', line, suppression_token = line.split()[0]) # Sanity test that there's at least a hundred relays. If that's not the # case then this probably isn't a real, complete tor consensus. @@ -80,6 +80,6 @@ class TestNetworkStatus(unittest.TestCase): reported_flags.append(flag) for line in router.get_unrecognized_lines(): - register_new_capability('Microdescriptor Consensus Line', line) + register_new_capability('Microdescriptor Consensus Line', line, suppression_token = line.split()[0]) self.assertTrue(count > 100) diff --git a/test/util.py b/test/util.py index 88abce6..a3348be 100644 --- a/test/util.py +++ b/test/util.py @@ -83,6 +83,7 @@ STEM_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) # Store new capabilities (events, descriptor entries, etc.) NEW_CAPABILITIES = [] +NEW_CAPABILITIES_SUPPRESSION_TOKENS = set() # File extensions of contents that should be ignored. @@ -292,15 +293,21 @@ def check_for_unused_tests(paths): raise ValueError('Test modules are missing from our test/settings.cfg:\n%s' % '\n'.join(unused_tests)) -def register_new_capability(capability_type, msg): +def register_new_capability(capability_type, msg, suppression_token = None): """ Register new capability found during the tests. :param str capability_type: type of capability this is :param str msg: description of what we found + :param str suppression_token: skip registration if this token's already been + provided """ - NEW_CAPABILITIES.append((capability_type, msg)) + if suppression_token not in NEW_CAPABILITIES_SUPPRESSION_TOKENS: + NEW_CAPABILITIES.append((capability_type, msg)) + + if suppression_token: + NEW_CAPABILITIES_SUPPRESSION_TOKENS.add(suppression_token) def _is_test_data(path):

1 0