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

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 13 May '20

13 May '20

commit b8f0fdb94e33e287f169a3ba61c6c66fcb0a6dfb Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 01:46:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- es_AR/https-everywhere.dtd | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/es_AR/https-everywhere.dtd b/es_AR/https-everywhere.dtd index d091b0defc..d491ef6d2d 100644 --- a/es_AR/https-everywhere.dtd +++ b/es_AR/https-everywhere.dtd @@ -7,19 +7,19 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Donar a EFF"> <!ENTITY https-everywhere.menu.observatory "Preferencias del Observatorio SSL"> -<!ENTITY https-everywhere.menu.globalDisable "HTTPS en todas partes está apagado"> -<!ENTITY https-everywhere.menu.globalEnable "HTTPS en todas partes está activado"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "Cifrar todos los sitios elegibles está activado"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "Cifrar todos los sitios elegibles está desactivado"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "Las solicitudes no cifradas están actualmente bloqueadas"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "Las solicitudes no cifradas están permitidas actualmente"> -<!ENTITY https-everywhere.menu.seeMore "Ver más"> -<!ENTITY https-everywhere.menu.seeLess "Ver menos"> -<!ENTITY https-everywhere.menu.httpNoWhereMore "Este modo bloquea los contenidos y las solicitudes no encriptadas"> +<!ENTITY https-everywhere.menu.globalDisable ""> +<!ENTITY https-everywhere.menu.globalEnable ""> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn ""> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff ""> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked ""> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed ""> +<!ENTITY https-everywhere.menu.seeMore ""> +<!ENTITY https-everywhere.menu.seeLess ""> +<!ENTITY https-everywhere.menu.httpNoWhereMore ""> <!ENTITY https-everywhere.menu.showCounter "Mostrar contador"> <!ENTITY https-everywhere.menu.viewAllRules "Ver todas las Reglas"> -<!ENTITY https-everywhere.options.settings "Configuración"> +<!ENTITY https-everywhere.options.settings ""> <!ENTITY https-everywhere.options.generalSettings "Ajustes generales"> <!ENTITY https-everywhere.options.advancedSettings "Ajustes avanzados"> <!ENTITY https-everywhere.options.updateChannels "Actualizar canales"> @@ -29,6 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "Reglas de usuario de HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "Sitios con HTTPS Everywhere deshabilitado"> <!ENTITY https-everywhere.options.updateChannelsWarning "Advertencia: Agregar canales de actualización puede causar que alguien hostil tome control de tu navegador. ¡Solo editá ésta sección si sabés qué estás haciendo!"> +<!ENTITY https-everywhere.options.addDisabledSite ""> +<!ENTITY https-everywhere.options.enterDisabledSite ""> <!ENTITY https-everywhere.options.addUpdateChannel "Añadir canal de actualización"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Ingresar nombre del canal de actualización"> <!ENTITY https-everywhere.options.delete "Borrar"> @@ -36,7 +38,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "Versión almacenada de los conjuntos de reglas:"> <!ENTITY https-everywhere.options.updatesLastChecked "Ultima comprobación de actualizaciones:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "nunca"> -<!ENTITY https-everywhere.options.debuggingRulesets "Conjunto de reglas de depuración (avanzado)"> +<!ENTITY https-everywhere.options.debuggingRulesets ""> <!ENTITY https-everywhere.prefs.export_settings "Exportar Configuraciones"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer valores predeterminados"> @@ -45,10 +47,17 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere notó que estabas navegando hacia una página no-HTTPS, y trató en vez de enviarte hacia la versión HTTPS. La versión HTTPS no está disponible. Muy probablemente este sitio no soporta HTTPS, pero también es posible que un atacante esté bloqueando la versión HTTPS. Si deseás ver la versión no encriptada de ésta página, aún podés hacerlo deshabilitando la opción 'Encriptar Todos los Sitios Elegibles' (EASE) en tu extensión HTTPS Everywhere. Tené en cuenta que el deshabilitar ésta opción podría hacer a tu navegador vulnerable a ataques de degradación basados en red en los sitios web que visites."> <!ENTITY https-everywhere.cancel.he_blocking_network "ataques remotos de degradación de servicio"> <!ENTITY https-everywhere.cancel.open_page "Abrir página insegura"> +<!ENTITY https-everywhere.cancel.http_once ""> -<!ENTITY https-everywhere.chrome.settings_for_this_site_header "Ajustes para este sitio"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Cambiá tus preferencias para concecciones encriptadas"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "A medida que navegás por diferentes sitios, podés cambiar tus preferencias para cada "> +<!ENTITY https-everywhere.onboarding.intro ""> +<!ENTITY https-everywhere.onboarding.header ""> +<!ENTITY https-everywhere.onboarding.details_one ""> +<!ENTITY https-everywhere.onboarding.details_two ""> +<!ENTITY https-everywhere.onboarding.footer ""> + +<!ENTITY https-everywhere.chrome.settings_for_this_site_header ""> +<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader ""> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained ""> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables "> <!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conexiones encriptadas a estos sitios web:"> <!ENTITY https-everywhere.chrome.experimental_rules "Reglas experimentales">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 13 May '20

13 May '20

commit a4e5b7c6f81e7dc5abdf26601300a2a3cc638261 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 01:46:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- es_AR/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/https-everywhere.dtd b/es_AR/https-everywhere.dtd index 685cbb7acc..b61be4919f 100644 --- a/es_AR/https-everywhere.dtd +++ b/es_AR/https-everywhere.dtd @@ -51,9 +51,9 @@ <!ENTITY https-everywhere.onboarding.intro "¡Encriptar la Web! Usar seguridad HTTPS automáticamente en la mayoría de los sitios."> <!ENTITY https-everywhere.onboarding.header "¡HTTPS Everywhere ha sido actualizado!"> -<!ENTITY https-everywhere.onboarding.details_one "EASE Mode Optimized"> -<!ENTITY https-everywhere.onboarding.details_two "You can now whitelist sites to disable in HTTPS Everywhere"> -<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere is an EFF project"> +<!ENTITY https-everywhere.onboarding.details_one "Modo EASE "Encriptar Todos los Sitios Elegibles" optimizado"> +<!ENTITY https-everywhere.onboarding.details_two "Ahora puede incluir en la lista blanca sitios para deshabilitar en HTTPS Everywhere"> +<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere es un proyecto EFF"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "Ajustes para este sitio"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Cambiá tus preferencias para concecciones encriptadas">

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 13 May '20

13 May '20

commit 7bcfe9d3a25ac748410801318d6e71202ecf7e39 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 01:45:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+zh-CN.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 37ccf1ad45..fdcd31a7d3 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -7,8 +7,8 @@ # Emma Peel, 2020 # 忻然李 <2544304894(a)qq.com>, 2020 # ff98sha, 2020 -# Runzhe Liang <18051080098(a)163.com>, 2020 # Scott Rhodes <starring169(a)gmail.com>, 2020 +# Runzhe Liang <18051080098(a)163.com>, 2020 # msgid "" msgstr "" @@ -16,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Scott Rhodes <starring169(a)gmail.com>, 2020\n" +"Last-Translator: Runzhe Liang <18051080098(a)163.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -889,7 +889,7 @@ msgstr "" msgid "" "Tor bridges are nodes in the network that are not listed in the public Tor " "directory, which make it harder for ISPs and governments to block them." -msgstr "" +msgstr "Tor 网桥是网络中的节点，没有被列入公开的Tor 目录，这使得互联网服务提供商和政府更难屏蔽它们。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -3504,7 +3504,7 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "When addressing the user, use the 2nd person informal pronoun \"tú\"." -msgstr "" +msgstr "当提及用户时，请使用第二人称。" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) @@ -3607,7 +3607,7 @@ msgstr "" #: https//community.torproject.org/outreach/talk/ #: (content/outreach/talk/contents+en.lrpage.body) msgid "## Talk about Tor" -msgstr "" +msgstr "## 聊聊Tor" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.title) @@ -7026,7 +7026,7 @@ msgid "" "**No**. Tor's developers are available to answer technical questions, but " "they are not lawyers and cannot give legal advice. Nor do they have any " "ability to prevent illegal activity that may occur through Tor relays." -msgstr "" +msgstr "**不**。Tor的开发者可以回答技术问题，但他们并非律师，不能给出法律建议。他们也不能预防可能通过Tor 中继服务器发生的违法活动。" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) @@ -7121,7 +7121,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) msgid "### Should I run an exit relay from my home?" -msgstr "" +msgstr "### 我应该在家里运行出口节点吗？" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body)

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 13 May '20

13 May '20

commit 7185a658484b179c3e9ead1dbfa9dbb0151d3df1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 01:16:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- es_AR/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es_AR/https-everywhere.dtd b/es_AR/https-everywhere.dtd index dd332b43f5..685cbb7acc 100644 --- a/es_AR/https-everywhere.dtd +++ b/es_AR/https-everywhere.dtd @@ -29,8 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "Reglas de usuario de HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "Sitios con HTTPS Everywhere deshabilitado"> <!ENTITY https-everywhere.options.updateChannelsWarning "Advertencia: Agregar canales de actualización puede causar que alguien hostil tome control de tu navegador. ¡Solo editá ésta sección si sabés qué estás haciendo!"> -<!ENTITY https-everywhere.options.addDisabledSite "Add Disabled Site"> -<!ENTITY https-everywhere.options.enterDisabledSite "Enter disabled site"> +<!ENTITY https-everywhere.options.addDisabledSite "Agregar sitio deshabilitado"> +<!ENTITY https-everywhere.options.enterDisabledSite "Ingresar sitio deshabilitado"> <!ENTITY https-everywhere.options.addUpdateChannel "Añadir canal de actualización"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Ingresar nombre del canal de actualización"> <!ENTITY https-everywhere.options.delete "Borrar"> @@ -47,10 +47,10 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere notó que estabas navegando hacia una página no-HTTPS, y trató en vez de enviarte hacia la versión HTTPS. La versión HTTPS no está disponible. Muy probablemente este sitio no soporta HTTPS, pero también es posible que un atacante esté bloqueando la versión HTTPS. Si deseás ver la versión no encriptada de ésta página, aún podés hacerlo deshabilitando la opción 'Encriptar Todos los Sitios Elegibles' (EASE) en tu extensión HTTPS Everywhere. Tené en cuenta que el deshabilitar ésta opción podría hacer a tu navegador vulnerable a ataques de degradación basados en red en los sitios web que visites."> <!ENTITY https-everywhere.cancel.he_blocking_network "ataques remotos de degradación de servicio"> <!ENTITY https-everywhere.cancel.open_page "Abrir página insegura"> -<!ENTITY https-everywhere.cancel.http_once "Open insecure page for this session only"> +<!ENTITY https-everywhere.cancel.http_once "Abrir página insegura solo para esta sesión"> <!ENTITY https-everywhere.onboarding.intro "¡Encriptar la Web! Usar seguridad HTTPS automáticamente en la mayoría de los sitios."> -<!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere has been updated!"> +<!ENTITY https-everywhere.onboarding.header "¡HTTPS Everywhere ha sido actualizado!"> <!ENTITY https-everywhere.onboarding.details_one "EASE Mode Optimized"> <!ENTITY https-everywhere.onboarding.details_two "You can now whitelist sites to disable in HTTPS Everywhere"> <!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere is an EFF project">

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 13 May '20

13 May '20

commit ef6d31dceb04277f71c95ea3b92db26a346a75c4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 01:15:42 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 953ec68a89..9b6a9ab461 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -2629,7 +2629,7 @@ msgstr "内华达州" msgid "" "Contributions may be tax deductible pursuant to the provisions of sec. " "170(c) of the Internal Revenue Code of 1986, 26 U.S.C. ¤170(c)." -msgstr "" +msgstr "根据1986，26 U.S.C¤170(c)内部收入法规的sec. 170(c)条规定，捐助可以是税额抵扣的。" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:111 msgid "New Jersey" @@ -2670,7 +2670,7 @@ msgstr "北卡罗来纳州" msgid "" "Financial information about this organization and a copy of its license are " "available from the State Solicitation Licensing Branch at 1-919-814-5400." -msgstr "" +msgstr "该组织的财务信息和执照复印件可以拨打1-919-814-5400，从州执照请求分部获取。" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:129 msgid "The license is not an endorsement by the state." @@ -2685,7 +2685,7 @@ msgid "" "The official registration and financial information of The Tor Project, Inc." " may be obtained from the Pennsylvania Department of State by calling toll-" "free, within Pennsylvania, 1-800-732-0999." -msgstr "" +msgstr "Tor 项目, Inc的官方注册信息和财务信息可以在州内拨打免费热线：1-800-732-0999，来从宾夕法尼亚州国务院获取。" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:139 msgid "Virginia"

1 0

[community/master] Update docs to reflect switch to docker-compose.
by phw＠torproject.org 12 May '20

12 May '20

commit dd27ae88c83585f062c0975b978a59ba16fbae8b Author: Philipp Winter <phw(a)nymity.ch> Date: Tue May 12 12:39:30 2020 -0700 Update docs to reflect switch to docker-compose. --- .../technical-setup/bridge/docker/contents.lr | 40 +++++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 4f88a69..48208ca 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -17,36 +17,45 @@ docker pull phwinter/obfs4-bridge:latest ### 2. Deploy a container -We provide a Makefile that helps you deploy the container. -First, [download the Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs…, and then write your bridge configuration to a new file, bridge.sh. -Here's a template: +We provide a docker-compose.yml file that helps you deploy the container. +First, +[download docker-compose.yml](https://dip.torproject.org/torproject/anti-censorship/d…, +and then write your bridge configuration to a new file, `.env`, which is in the +same directory as `docker-compose.yml`. Here's a +template: ``` # Your bridge's Tor port. -export OR_PORT=X +OR_PORT=X # Your bridge's obfs4 port. -export PT_PORT=Y +PT_PORT=Y # Your email address. -export EMAIL=Z +EMAIL=Z ``` -Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that **both** ports are forwarded in your firewall), and `Z` with your email address, which allows us to get in touch with you if there are problems with your bridge. +Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that +**both** ports are forwarded in your firewall), and `Z` with your email address, +which allows us to get in touch with you if there are problems with your bridge. With your bridge configuration in place, you can now deploy the container: ``` -source bridge.sh && make deploy +docker-compose up -d obfs4-bridge ``` +This command will automatically load your `docker-compose.yml` file while +considering the environment variables in `.env`. + You should now see output similar to the following: ``` -201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108 -Make sure that port X and Y are forwarded in your firewall. +Starting docker-obfs4-bridge_obfs4-bridge_1 ... done ``` -That's it! Your container (identified by the first line of output) is now bootstrapping your new obfs4 bridge. +That's it! Your container is now bootstrapping your new obfs4 bridge. -If you want to run multiple bridges on your machine, you need to create more bridge configuration files with different sets of ports, and run `make deploy` again, like so: +If you want to run multiple bridges on your machine, you need to create more +bridge configuration files with different sets of ports, and run `make deploy` +again, like so: ``` source bridge-1.sh && make deploy @@ -56,13 +65,10 @@ source bridge-2.sh && make deploy ### 3. Upgrade your container -To upgrade to the latest version of our image, you need to stop your existing container, delete it, pull the latest image, and finally deploy it again: +Upgrading to the latest version of our image is as simple as running: ``` -docker stop CONTAINER_ID -docker rm CONTAINER_ID -docker pull phwinter/obfs4-bridge:latest -source bridge.sh && make deploy +docker-compose up -d obfs4-bridge ``` Note that your bridge's data directory (which includes its key material) is stored in a docker volume, so you won't lose your bridge's identity when upgrading to the latest docker image.

1 0

[metrics-lib/master] Include previously unknown error codes in Torperf results.
by karsten＠torproject.org 12 May '20

12 May '20

commit afc57a61209f806581c3c6ca472077fbcba835ec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 12 21:35:58 2020 +0200 Include previously unknown error codes in Torperf results. As discussed on #34031, we should avoid keeping a map of known failure types in the sources and simply put together the error code in the format we want. This patch implements that change. --- CHANGELOG.md | 4 ++++ .../onionperf/OnionPerfAnalysisConverter.java | 24 ++++++++-------------- .../onionperf/OnionPerfAnalysisConverterTest.java | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af5a7f0..5ed2425 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 2.??.? - 2020-??-?? + * Minor changes + - Include previously unknown error codes in Torperf results + converted from OnionPerf analysis files. + # Changes in version 2.12.2 - 2020-04-30 diff --git a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java index 18adf8c..8ca5efd 100644 --- a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java +++ b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java @@ -127,18 +127,6 @@ public class OnionPerfAnalysisConverter { private StringBuilder formatTorperfResults( ParsedOnionPerfAnalysis parsedOnionPerfAnalysis) { StringBuilder formattedTorperfResults = new StringBuilder(); - Map<String, String> errorCodes = new HashMap<>(); - errorCodes.put("AUTH", "TGEN/AUTH"); - errorCodes.put("READ", "TGEN/READ"); - errorCodes.put("STALLOUT", "TGEN/STALLOUT"); - errorCodes.put("TIMEOUT", "TGEN/TIMEOUT"); - errorCodes.put("PROXY", "TOR"); - errorCodes.put("PROXY_CANT_ATTACH", "TOR/CANT_ATTACH"); - errorCodes.put("PROXY_DESTROY", "TOR/DESTROY"); - errorCodes.put("PROXY_END_TIMEOUT", "TOR/END/TIMEOUT"); - errorCodes.put("PROXY_END_CONNECTREFUSED", "TOR/END/CONNECTREFUSED"); - errorCodes.put("PROXY_RESOLVEFAILED", "TOR/RESOLVEFAILED"); - errorCodes.put("PROXY_TIMEOUT", "TOR/TIMEOUT"); for (Map.Entry<String, ParsedOnionPerfAnalysis.MeasurementData> data : parsedOnionPerfAnalysis.data.entrySet()) { String nickname = data.getKey(); @@ -183,7 +171,12 @@ public class OnionPerfAnalysisConverter { List<String> errorCodeParts = null; if (transfer.isError) { errorCodeParts = new ArrayList<>(); - errorCodeParts.add(transfer.errorCode); + if ("PROXY".equals(transfer.errorCode)) { + errorCodeParts.add("TOR"); + } else { + errorCodeParts.add("TGEN"); + errorCodeParts.add(transfer.errorCode); + } } String sourcePort = endpointLocalParts[2]; if (streamsBySourcePort.containsKey(sourcePort)) { @@ -207,9 +200,8 @@ public class OnionPerfAnalysisConverter { } } if (null != errorCodeParts) { - String errorCode = String.join("_", errorCodeParts); - torperfResultsBuilder.addString("ERRORCODE", - errorCodes.getOrDefault(errorCode, errorCode)); + String errorCode = String.join("/", errorCodeParts); + torperfResultsBuilder.addString("ERRORCODE", errorCode); } formattedTorperfResults.append(torperfResultsBuilder.build()); } diff --git a/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java b/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java index c921a2d..7a1a3a0 100644 --- a/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java +++ b/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java @@ -70,7 +70,7 @@ public class OnionPerfAnalysisConverterTest { + "ENDPOINTLOCAL=localhost:127.0.0.1:40948 " + "ENDPOINTPROXY=localhost:127.0.0.1:35900 " + "ENDPOINTREMOTE=37.218.245.95:37.218.245.95:443 " - + "ERRORCODE=PROXY_END_MISC FILESIZE=51200 HOSTNAMELOCAL=op-nl2 " + + "ERRORCODE=TOR/END/MISC FILESIZE=51200 HOSTNAMELOCAL=op-nl2 " + "HOSTNAMEREMOTE=(null) LAUNCH=1587991454.80 NEGOTIATE=1587991580.81 " + "PATH=$12CF6DB4DAE106206D6C6B09988E865C0509843B," + "$1DC17C4A52A458B5C8B1E79157F8665696210E10,"

1 0

[tor/master] Fix crash when tor is compiled with NSS and seccomp sandbox is enabled
by nickm＠torproject.org 12 May '20

12 May '20

commit 2913dbd6d9c1ee53c5a7524dd6693f5a6c6f8293 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Wed May 6 22:00:50 2020 +0100 Fix crash when tor is compiled with NSS and seccomp sandbox is enabled Adds seccomp rules for socket and getpeername used by NSS --- changes/bug34130 | 4 ++++ src/lib/sandbox/sandbox.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/changes/bug34130 b/changes/bug34130 new file mode 100644 index 000000000..b1e5715fd --- /dev/null +++ b/changes/bug34130 @@ -0,0 +1,4 @@ + o Minor bugfixes (linux seccomp sandbox nss): + - Fix startup crash when tor is compiled with --enable-nss and + sandbox support is enabled. Fixes bug 34130; bugfix on + 0.3.5.1-alpha. Patch by Daniel Pinto. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 8f577b066..b701c0016 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -265,6 +265,11 @@ static int filter_nopar_gen[] = { SCMP_SYS(listen), SCMP_SYS(connect), SCMP_SYS(getsockname), +#ifdef ENABLE_NSS +#ifdef __NR_getpeername + SCMP_SYS(getpeername), +#endif +#endif SCMP_SYS(recvmsg), SCMP_SYS(recvfrom), SCMP_SYS(sendto), @@ -647,6 +652,15 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } } +#ifdef ENABLE_NSS + rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket), + SCMP_CMP(0, SCMP_CMP_EQ, PF_INET), + SCMP_CMP(1, SCMP_CMP_EQ, SOCK_STREAM), + SCMP_CMP(2, SCMP_CMP_EQ, IPPROTO_IP)); + if (rc) + return rc; +#endif + rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket), SCMP_CMP(0, SCMP_CMP_EQ, PF_UNIX), SCMP_CMP_MASKED(1, SOCK_CLOEXEC|SOCK_NONBLOCK, SOCK_STREAM),

1 0

[tor/master] Merge branch 'bug34130_035'
by nickm＠torproject.org 12 May '20

12 May '20

commit 1557e73c824cc4e934110c41ecc917e8a29ed296 Merge: 86b5bcd80 2913dbd6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 12 12:58:19 2020 -0400 Merge branch 'bug34130_035' changes/bug34130 | 4 ++++ src/lib/sandbox/sandbox.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+)

1 0

[tor/master] Add documentation about %include and seccomp sandbox limitations
by nickm＠torproject.org 12 May '20

12 May '20

commit cc169eb1204e1cf7d9fd45518edf86a1b397f6dc Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Wed May 6 01:42:24 2020 +0100 Add documentation about %include and seccomp sandbox limitations --- changes/doc34133 | 6 ++++++ doc/tor.1.txt | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/changes/doc34133 b/changes/doc34133 new file mode 100644 index 000000000..abe9db614 --- /dev/null +++ b/changes/doc34133 @@ -0,0 +1,6 @@ + o Documentation: + - Correctly document that we search for a system torrc file before + Document the limitations of using %include on config files with + seccomp sandbox enabled. No new files can be added to the + %included directories. Fixes documentation bug 34133; bugfix + on 0.3.1.1-alpha. Patch by Daniel Pinto. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index fbe2915cf..bc09d634b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -211,6 +211,8 @@ file will be parsed as if they were written where the %include option is. If the path is a folder, all files on that folder will be parsed following lexical order. Files starting with a dot are ignored. Files on subfolders are ignored. The %include option can be used recursively. +New configuration files or directories cannot be added to already running Tor +instance if **Sandbox** is enabled. By default, an option on the command line overrides an option found in the configuration file, and an option in a configuration file overrides one in @@ -855,6 +857,10 @@ forward slash (/) in the configuration file and on the command line. and **ORPort** are not allowed). Currently, if **Sandbox** is 1, **ControlPort** command "GETINFO address" will not work. + + + When using %include in the tor configuration files, reloading the tor + configuration is not supported after adding new configuration files or + directories. + + + (Default: 0) [[Schedulers]] **Schedulers** **KIST**|**KISTLite**|**Vanilla**::

1 0