April 2021 - tor-commits - lists.torproject.org

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 14 Apr '21

14 Apr '21

commit cab8fa31218559791ab64cd02d9d10a1a4d00eb7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 14 15:45:14 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 2413ec184c..feebe1e1bb 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -11399,7 +11399,7 @@ msgstr "" "ვინაიდან არაგამსვლელი კვა… [View More]

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 14 Apr '21

14 Apr '21

commit 191ccda0a6e882fa62b02ba0537227e2f48adb00 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 14 15:15:22 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 86dbde7a0d..2413ec184c 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -2590,8 +2590,8 @@ msgid "" "take pictures or send your ´… [View More]

1 0

[tor/master] Start a changes file for 0.4.6.2-alpha
by nickm＠torproject.org 14 Apr '21

14 Apr '21

commit 33ca927a8e5d764fa54ddbf2d0d27af419dcb69a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 14 10:58:15 2021 -0400 Start a changes file for 0.4.6.2-alpha --- ChangeLog | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ changes/bug40141 | 4 --- changes/bug40318 | 4 --- changes/bug40354 | 4 --- changes/geoip-2021-04-13 | 3 --- changes/ticket-40331 | 3 --- changes/ticket40228 | 4 --- changes/ticket40265 … [View More] | 3 --- changes/ticket40271 | 5 ---- changes/ticket40322 | 3 --- changes/ticket40323 | 2 -- changes/ticket40324 | 3 --- changes/ticket40345 | 5 ---- changes/ticket40346 | 4 --- changes/ticket40360 | 5 ---- changes/ticket40364 | 3 --- 16 files changed, 70 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac5aa1e34c..0f8d338b68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,73 @@ +Changes in version 0.4.6.2-alpha - 2021-04-15 + BLURB HERE + + o Minor features (client): + - Clients now check whether their streams are attempting to re-enter + the Tor network (i.e. to send Tor traffic over Tor), and they + close them preemptively if they think exit relays will refuse + them. See ticket 2667 for details. Close ticket 40271. + + o Minor features (command line): + - Add long format name --torrc-file for command line option -f. + Closes ticket 40324. Patch by Daniel Pinto. + + o Minor features (dormant mode): + - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained + control over whether the client ever becomes dormant from + inactivity. Most people won't need this. Closes ticket 40228. + + o Minor features (fallback directory): + - Renegerate the list to a new set of 200 relays acting as fallback + directories. Closes ticket 40265. + + o Minor features (geoip data): + - Update the geoip files to match the IPFire Location Database, as + retrieved on 2021/04/13. + + o Minor features (logging): + - Edit heartbeat log messages so that more of them begin with the + string "Heartbeat: ". Closes ticket 40322; patch + from 'cypherpunks'. + + o Minor bugfixes (bridge, pluggable transport): + - Fix a regression that prevented to configure a Bridge line without + a fingerprint (which is a normal use case). Fixes bug 40360; + bugfix on 0.4.5.4-rc. + + o Minor bugfixes (channel, DoS): + - Fix a possible non fatal assertion BUG() due to a too early free + of a string when noting down the client connection for the DoS + defenses subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc + + o Minor bugfixes (compilation): + - Fix a compilation warning about unused functions when building + with a libc that lacks the GLOB_ALTDIRFUNC constant. Fixes bug + 40354; bugfix on 0.4.5.1-alpha. Patch by Daniel Pinto. + + o Minor bugfixes (configuration): + - Fix globbing directories on all platforms when using %include + options in configuration files. This patch also fixes compilation + on musl libc based systems. Fixes bug 40141; bugfix + on 0.4.5.1-alpha. + + o Minor bugfixes (relay): + - Move the "overload-general" line from extrainfo to the server + descriptor. Fixes bug 40364; bugfix on 0.4.6.1-alpha. + + o Minor bugfixes (testing, BSD): + - Fix glob processing errors when globs expand to invalid paths on + BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by + Daniel Pinto. + + o Documentation (manual): + - Move the ServerTransport* options to the SERVER OPTIONS` section. + Closes issue 40331. + - The HiddenServiceStatistics option also applies to bridges so + properly indicate that in the tor.1 man page. Closes ticket 40346. + - Move the description of "BridgeRecordUsageByCountry" to the + section "STATISTICS OPTIONS". Closes ticket 40323. + + Changes in version 0.4.6.1-alpha - 2021-03-18 Tor 0.4.6.1-alpha is the first alpha release in the 0.4.6.x series. It improves client circuit performance, adds missing features, and diff --git a/changes/bug40141 b/changes/bug40141 deleted file mode 100644 index cf2641cfde..0000000000 --- a/changes/bug40141 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (configuration): - - Fix globbing directories on all platforms when using %include options in - configuration files. This patch also fixes compilation on musl libc based - systems. Fixes bug 40141; bugfix on 0.4.5.1-alpha. diff --git a/changes/bug40318 b/changes/bug40318 deleted file mode 100644 index cc02f08ca0..0000000000 --- a/changes/bug40318 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (configuration tests bsd): - - Fix glob processing errors when globs expand to invalid paths on - BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by - Daniel Pinto. diff --git a/changes/bug40354 b/changes/bug40354 deleted file mode 100644 index da7c63d3af..0000000000 --- a/changes/bug40354 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): - - Fix a compilation warning about unused functions when building with - a libc that lacks the GLOB_ALTDIRFUNC constant. Fixes bug 40354; - bugfix on 0.4.5.1-alpha. Patch by Daniel Pinto. diff --git a/changes/geoip-2021-04-13 b/changes/geoip-2021-04-13 deleted file mode 100644 index db21a1c037..0000000000 --- a/changes/geoip-2021-04-13 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (geoip data): - - Update the geoip files to match the IPFire Location Database, - as retrieved on 2021/04/13. diff --git a/changes/ticket-40331 b/changes/ticket-40331 deleted file mode 100644 index c99d704c33..0000000000 --- a/changes/ticket-40331 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation (doc/man/tor.1.txt) : - - Move the ServerTransport* options options to the SERVER OPTIONS` section . - Closes issue 40331. diff --git a/changes/ticket40228 b/changes/ticket40228 deleted file mode 100644 index 297204decd..0000000000 --- a/changes/ticket40228 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (dormant mode): - - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained - control over whether the client ever becomes dormant from inactivity. - Most people won't need this. Closes ticket 40228. diff --git a/changes/ticket40265 b/changes/ticket40265 deleted file mode 100644 index 2a346d64c3..0000000000 --- a/changes/ticket40265 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor feature (fallback directory): - - Renegerate the list to a new set of 200 relays acting as fallback - directories. Closes ticket 40265. diff --git a/changes/ticket40271 b/changes/ticket40271 deleted file mode 100644 index a977be75e1..0000000000 --- a/changes/ticket40271 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (client): - - Clients now check whether their streams are attempting to re-enter - the Tor network (i.e. to send Tor traffic over Tor), and they close - them preemptively if they think exit relays will refuse them. See - ticket 2667 for details. Close ticket 40271. diff --git a/changes/ticket40322 b/changes/ticket40322 deleted file mode 100644 index 18a65b3323..0000000000 --- a/changes/ticket40322 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (logging): - - Edit heartbeat log messages so that more of them begin with the string - "Heartbeat: ". Closes ticket 40322; patch from 'cypherpunks'. diff --git a/changes/ticket40323 b/changes/ticket40323 deleted file mode 100644 index 83223b2f15..0000000000 --- a/changes/ticket40323 +++ /dev/null @@ -1,2 +0,0 @@ - o Documentation (manual): - - Move the description of "BridgeRecordUsageByCountry" to the section "STATISTICS OPTIONS". Closes ticket 40323. diff --git a/changes/ticket40324 b/changes/ticket40324 deleted file mode 100644 index 21c05c6e53..0000000000 --- a/changes/ticket40324 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (cmdline): - - Add long format name --torrc-file for command line option -f. Closes - ticket 40324. Patch by Daniel Pinto. diff --git a/changes/ticket40345 b/changes/ticket40345 deleted file mode 100644 index 246e4a86af..0000000000 --- a/changes/ticket40345 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (channel, DoS): - - Fix a possible non fatal assertion BUG() due to a too early free of a - string when noting down the client connection for the DoS defenses - subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc - diff --git a/changes/ticket40346 b/changes/ticket40346 deleted file mode 100644 index c76e6d6aec..0000000000 --- a/changes/ticket40346 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation (man, onion service): - - The HiddenServiceStatistics option also applies to bridges so properly - indicate that in the tor.1 man page. Closes ticket 40346. - diff --git a/changes/ticket40360 b/changes/ticket40360 deleted file mode 100644 index 4a1b2c3446..0000000000 --- a/changes/ticket40360 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (bridge, pluggable transport): - - Fix a regression that prevented to configure a Bridge line without a - fingerprint (which is a normal use case). Fixes bug 40360; bugfix on - 0.4.5.4-rc. - diff --git a/changes/ticket40364 b/changes/ticket40364 deleted file mode 100644 index 261521a736..0000000000 --- a/changes/ticket40364 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (relay): - - Move the "overload-general" line from extrainfo to the server descriptor. - Fixes bug 40364; bugfix on 0.4.6.1-alpha. [View Less]

1 0

[tor/master] Bump version to 0.4.6.2-alpha.
by nickm＠torproject.org 14 Apr '21

14 Apr '21

commit 96d4466488be8da3efb270f9735736789b793e0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 14 10:55:48 2021 -0400 Bump version to 0.4.6.2-alpha. --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9649951503..bd7de5dfc9 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ … [View More]

1 0

[torspec/master] Clarify part of proposal 325
by nickm＠torproject.org 14 Apr '21

14 Apr '21

commit 7424472d21725077f83aa9ff19e64ae530798d27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 14 10:43:20 2021 -0400 Clarify part of proposal 325 We indicated that "0" meant "no more messages" but we didn't say what happened if there was no space to put such a 0. --- proposals/325-packed-relay-cells.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proposals/325-packed-relay-cells.md b/proposals/325-packed-relay-cells.md index … [View More]

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 14 Apr '21

14 Apr '21

commit ed11a86bf747485e1a4549e83eeb6df300ec9e82 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 14 14:45:21 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 32 +++++++++++++++++--------------- contents+ka.po | 10 +++++----- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/contents+es.po b/contents+es.po index a3700908e3..8968c29762 100644 --- a/contents+es.po +++ b/contents+es.… [View More]po @@ -1479,9 +1479,10 @@ msgid "" "templates/blob/master/generic.template)." msgstr "" "* plantillas de respuesta a abusos de Coldhak, una organización en Canadá " -"que mantiene varios repetidores: [What happened when we got subpoenaed over " -"our Tor exit node](https://boingboing.net/2015/08/04/what-happened-when-the-" -"fbi-sub.html), [Generic Abuse Template](https://github.com/coldhakca/abuse-" +"que mantiene varios repetidores: [DMCA " +"Template](https://github.com/coldhakca/abuse-" +"templates/blob/master/dmca.template), [Generic Abuse " +"Template](https://github.com/coldhakca/abuse-" "templates/blob/master/generic.template)." #: https//community.torproject.org/relay/community-resources/ @@ -1533,9 +1534,9 @@ msgid "" "of people (3-5 suggested to start) interested in helping with the various " "activities required for running relays." msgstr "" -"Para iniciar un socio Torservers, lo mas importantes es tener un grupo de " -"personas (se sugieren 3-5 para empezar) interesadas en ayudar con las " -"diversas actividades que se requieren para ejecutar retransmisiones." +"Para iniciar un grupo socio de Torservers, lo mas importante es tener un " +"grupo de personas (se sugieren 3-5 para empezar) interesadas en ayudar con " +"las diversas actividades requeridas para mantener repetidores." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1544,7 +1545,7 @@ msgid "" "should commit to running relays for the long term." msgstr "" "Debería haber mutua confianza entre las personas del grupo y los miembros " -"deben comprometerse a ejecutar retransmisiones por mucho tiempo." +"deben comprometerse a mantener repetidores por mucho tiempo." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1563,8 +1564,8 @@ msgid "" "Once you have a trusted group of people, depending on your region, it is " "often advised to create some type of non-profit corporation." msgstr "" -"Una vez que tiene un grupo de gente de confianza, dependiendo de su región, " -"a menudo se recomienda crear algún tipo de corporación sin ánimo de lucro." +"Una vez que tengas un grupo de gente de confianza, dependiendo de tu región," +" a menudo se recomienda crear algún tipo de corporación sin ánimo de lucro." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1581,14 +1582,14 @@ msgid "" "In many countries operating as a corporation instead of as an individual can" " also get you certain legal protections." msgstr "" -"En muchos países trabajando como empresas en lugar de como individuos puede " -"obtener ciertas protecciones legales." +"En muchos países trabajar como empresas en lugar de individualmente se " +"pueden obtener ciertas protecciones legales." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "The next steps are figuring out hardware, transit, and server hosting." msgstr "" -"Los siguientes para son descubrir hardware, tránsito y alojamiento de " +"Los siguientes pasos son descubrir hardware, tránsito y alojamiento de " "servidor." #: https//community.torproject.org/relay/community-resources/ @@ -1597,7 +1598,7 @@ msgid "" "Depending on your location and connections within the technical community of" " the area, the last one may be the hardest step." msgstr "" -"Dependiendo de su localización y conexiones con la comunidad técnica del " +"Dependiendo de tu localización y conexiones con la comunidad técnica del " "área, el último puede ser el paso más duro." #: https//community.torproject.org/relay/community-resources/ @@ -1607,7 +1608,7 @@ msgid "" "supporting your group with some bandwidth or rackspace." msgstr "" "Los pequeños Proveedores Locales de Internet (ISP) tienen con frecuencia " -"ancho de banda extra y pueden estar interesados en apoyar a su grupo con " +"ancho de banda extra y pueden estar interesados en apoyar a tu grupo con " "algo de ancho de banda o espacio en rack." #: https//community.torproject.org/relay/community-resources/ @@ -1615,7 +1616,8 @@ msgstr "" msgid "" "It is extremely important to maintain good relationships with these ISPs." msgstr "" -"Es extremadamente importante mantener buenas relaciones con esos ISPs." +"Es extremadamente importante mantener buenas relaciones con estos " +"proveedores de Internet." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) diff --git a/contents+ka.po b/contents+ka.po index 97a53bb2bd..86dbde7a0d 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -199,7 +199,7 @@ msgid "" "Our user research is founded on the premises of consent, respect, and " "empathy." msgstr "" -"ჩვენი კვლევა ეფუძნება წინაპირობებს თანხმობის, პატივისცემის და თანაგრძნობის." +"ჩვენი კვლევა ეფუძნება წინაპირობებს თანხმობის, პატივისცემისა და თანაგრძნობის." #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.body) @@ -208,7 +208,7 @@ msgid "" "helping us with user research." msgstr "" "შეგიძლიათ უბიძგოთ თქვენს ერთობასაც, ჩვენი ხერხებით სწავლების შედეგად, " -"სამომხმარებლო კვლევაში დასახმარებისთვის." +"სამომხმარებლო კვლევაში დახმარებისთვის." #: https//community.torproject.org/gsoc/ #: (content/gsoc/contents+en.lrpage.title) @@ -2228,7 +2228,7 @@ msgid "" "Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script…" "/discovery-bridges.md)" msgstr "" -"* [აღმოჩენა: ხიდების " +"* [მინება: ხიდების " "მიღება](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts…" "/discovery-bridges.md)" @@ -2344,7 +2344,7 @@ msgid "" msgstr "" "მოსმენის უნარი ქმნის კავშირებს. Tor-ში გვსურს ხალხმა აშენოს ხიდები და არა " "კედლები – და ჩვენ მიგვაჩნია რომ ეს მნიშვნელოვანია არა მხოლოდ ჩვენი " -"მომსახურებებისთვის, არამედ ჩვენი საზოგადოებებისთვისაც. იხილეთ რამდეენიმე " +"მომსახურებებისთვის, არამედ ჩვენი საზოგადოებებისთვისაც. იხილეთ რამდენიმე " "რჩევა, სმენის კულტურისა და კვლევის მეთოდების გასაუმჯობესებლად." #: https//community.torproject.org/user-research/guidelines/ @@ -2468,7 +2468,7 @@ msgid "" msgstr "" "უნდა მიჰყვეთ დღის წესრიგსა და გეგმას, გასაუბრებისას (თუ იქნება) გადამზადების" " ბოლოს. **დაბეჯითებით გირჩევთ გაიაროთ სავარჯიშო პროგრამა მწვრთნელთან " -"ერთად**. ამასთან, ვისურვებით თქვენ ორმა შეაჯეროთ უკუკავშირის შედეგები — " +"ერთად**. ამასთან, ვისურვებდით თქვენ ორმა შეაჯეროთ უკუკავშირის შედეგები — " "თქვენი და თქვენი საზოგადოების." #: https//community.torproject.org/user-research/guidelines/ [View Less]

1 0

[tor/master] geoip script: add options to output AS numbers.
by nickm＠torproject.org 14 Apr '21

14 Apr '21

commit e71154428eed922e538e6e61830dd1affe7eb188 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 14 10:28:44 2021 -0400 geoip script: add options to output AS numbers. The --include-asn option includes AS numbers in the geoip mapping. The --output-asn option makes the program generate a number-to-name mapping file. Additionally, the script now outputs ?? CC entries for networks that are listed but which have no country known. --- … [View More]scripts/maint/geoip/geoip-db-tool/src/db.rs | 38 +++++---- scripts/maint/geoip/geoip-db-tool/src/main.rs | 106 ++++++++++++++++++++++---- 2 files changed, 115 insertions(+), 29 deletions(-) diff --git a/scripts/maint/geoip/geoip-db-tool/src/db.rs b/scripts/maint/geoip/geoip-db-tool/src/db.rs index eaadd4c612..316182d823 100644 --- a/scripts/maint/geoip/geoip-db-tool/src/db.rs +++ b/scripts/maint/geoip/geoip-db-tool/src/db.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use std::convert::TryInto; use std::iter::Peekable; -use super::NetBlock; +use super::{AsBlock, NetBlock}; pub struct BlockReader where @@ -12,9 +12,10 @@ where iter: Peekable, } -enum AnyBlock { - NotNet, +pub enum AnyBlock { NetBlock(NetBlock), + AsBlock(AsBlock), + OtherBlock, } impl BlockReader @@ -74,17 +75,31 @@ where return None; } + if let Some(name) = kv.remove("name") { + // This is an AS block. + let asn = kv.get("aut-num").unwrap(); // XXXX handle error better + assert!(asn.starts_with("AS")); + let asn = asn[2..].parse().unwrap(); + return Some(Ok(AnyBlock::AsBlock(AsBlock { name, asn }))); + } + let net = if let Some(net) = kv.get("net") { net.parse().unwrap() //XXXX handle the error better. } else { - return Some(Ok(AnyBlock::NotNet)); + return Some(Ok(AnyBlock::OtherBlock)); + }; + + let asn = if let Some(asn) = kv.get("aut-num") { + asn.parse().ok() + } else { + None }; let cc = if let Some(country) = kv.get("country") { assert!(country.as_bytes().len() == 2); country.as_bytes()[0..2].try_into().unwrap() } else { - return Some(Ok(AnyBlock::NotNet)); + *b"??" }; fn is_true(v: Option<&String>) -> bool { @@ -100,6 +115,7 @@ where Some(Ok(AnyBlock::NetBlock(NetBlock { net, + asn, cc, is_anon_proxy, is_anycast, @@ -112,15 +128,11 @@ impl Iterator for BlockReader where I: Iterator<Item = std::io::Result<String>>, { - type Item = NetBlock; + type Item = AnyBlock; fn next(&mut self) -> Option<Self::Item> { - loop { - match self.get_block() { - None => return None, - Some(Err(_)) => return None, - Some(Ok(AnyBlock::NotNet)) => continue, - Some(Ok(AnyBlock::NetBlock(n))) => return Some(n), - } + match self.get_block() { + Some(Ok(b)) => Some(b), + _ => None, } } } diff --git a/scripts/maint/geoip/geoip-db-tool/src/main.rs b/scripts/maint/geoip/geoip-db-tool/src/main.rs index 38d70f7e1b..9a22598a35 100644 --- a/scripts/maint/geoip/geoip-db-tool/src/main.rs +++ b/scripts/maint/geoip/geoip-db-tool/src/main.rs @@ -9,7 +9,8 @@ use rangemap::RangeInclusiveMap; use std::fs::File; use std::io::{BufRead, BufReader, BufWriter, Write}; use std::net::{IpAddr, Ipv6Addr}; -use std::path::{Path, PathBuf}; +use std::num::NonZeroU32; +use std::path::PathBuf; fn default_ipv4_path() -> PathBuf { "./geoip".into() @@ -32,6 +33,14 @@ struct Args { /// where to find the dump file #[argh(option, short = 'i')] input: PathBuf, + + /// whether to include AS information in our output + #[argh(switch)] + include_asn: bool, + + /// where to store the AS map. + #[argh(option)] + output_asn: Option<PathBuf>, } /// Represents a network block from running `location dump`. @@ -39,11 +48,19 @@ struct Args { pub struct NetBlock { pub net: IpNetwork, pub cc: [u8; 2], + pub asn: Option<NonZeroU32>, pub is_anon_proxy: bool, pub is_anycast: bool, pub is_satellite: bool, } +/// Represents an AS definition from running `location dump`. +#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)] +pub struct AsBlock { + pub asn: NonZeroU32, + pub name: String, +} + impl PartialEq for NetBlock { fn eq(&self, other: &Self) -> bool { self.net == other.net @@ -69,6 +86,40 @@ impl PartialOrd for NetBlock { impl Eq for NetBlock {} +#[derive(Copy, Clone, Eq, PartialEq, Debug)] +struct NetDefn { + cc: [u8; 2], + asn: Option<NonZeroU32>, +} + +impl NetBlock { + fn into_defn(self, include_asn: bool) -> NetDefn { + if include_asn { + NetDefn { + cc: self.cc, + asn: self.asn, + } + } else { + NetDefn { + cc: self.cc, + asn: None, + } + } + } +} + +impl NetDefn { + fn cc(&self) -> &str { + std::str::from_utf8(&self.cc).unwrap() + } + fn asn(&self) -> u32 { + match self.asn { + Some(v) => v.into(), + None => 0, + } + } +} + const PROLOGUE: &str = "\ # This file has been converted from the IPFire Location database # using Tor's geoip-db-tool. For more information on the data, see @@ -82,16 +133,26 @@ const PROLOGUE: &str = "\ /// /// This code tries to be "efficient enough"; most of the logic is handled by /// using the rangemap crate. -fn convert(input: &Path, output_v4: &Path, output_v6: &Path) -> std::io::Result<()> { +fn convert(args: Args) -> std::io::Result<()> { + let input = args.input.as_path(); + let output_v4 = args.output_ipv4.as_path(); + let output_v6 = args.output_ipv6.as_path(); + let include_asn = args.include_asn; + let f = File::open(input)?; let f = BufReader::new(f); let mut blocks = Vec::new(); + let mut networks = Vec::new(); let mut reader = db::BlockReader::new(f.lines()); let hdr = reader.extract_header(); // Read blocks, and then sort them by specificity and address. for nb in reader { - blocks.push(nb); + match nb { + db::AnyBlock::AsBlock(a) => networks.push(a), + db::AnyBlock::NetBlock(n) => blocks.push(n), + _ => {} + } } blocks.sort(); @@ -104,8 +165,8 @@ fn convert(input: &Path, output_v4: &Path, output_v6: &Path) -> std::io::Result< // // We use u32 and u128 as the index types for these RangeInclusiveMaps, // so that we don't need to implement a step function for IpAddr. - let mut v4map: RangeInclusiveMap<u32, [u8; 2], _> = RangeInclusiveMap::new(); - let mut v6map: RangeInclusiveMap<u128, [u8; 2], _> = RangeInclusiveMap::new(); + let mut v4map: RangeInclusiveMap<u32, NetDefn, _> = RangeInclusiveMap::new(); + let mut v6map: RangeInclusiveMap<u128, NetDefn, _> = RangeInclusiveMap::new(); let mut n = 0usize; let num_blocks = blocks.len(); @@ -118,10 +179,10 @@ fn convert(input: &Path, output_v4: &Path, output_v6: &Path) -> std::io::Result< let end = nb.net.broadcast(); match (start, end) { (IpAddr::V4(a), IpAddr::V4(b)) => { - v4map.insert(a.into()..=b.into(), nb.cc); + v4map.insert(a.into()..=b.into(), nb.into_defn(include_asn)); } (IpAddr::V6(a), IpAddr::V6(b)) => { - v6map.insert(a.into()..=b.into(), nb.cc); + v6map.insert(a.into()..=b.into(), nb.into_defn(include_asn)); } (_, _) => panic!("network started and ended in different families!?"), } @@ -133,33 +194,46 @@ fn convert(input: &Path, output_v4: &Path, output_v6: &Path) -> std::io::Result< v4.write_all(PROLOGUE.as_bytes())?; v4.write_all(hdr.as_bytes())?; - for (r, cc) in v4map.iter() { + for (r, defn) in v4map.iter() { let a: u32 = *r.start(); let b: u32 = *r.end(); - writeln!(&mut v4, "{},{},{}", a, b, std::str::from_utf8(cc).unwrap())?; + if include_asn { + writeln!(&mut v4, "{},{},{},{}", a, b, defn.cc(), defn.asn())?; + } else { + writeln!(&mut v4, "{},{},{}", a, b, defn.cc())?; + } } v6.write_all(PROLOGUE.as_bytes())?; v6.write_all(hdr.as_bytes())?; - for (r, cc) in v6map.iter() { + for (r, defn) in v6map.iter() { let a: Ipv6Addr = (*r.start()).into(); let b: Ipv6Addr = (*r.end()).into(); - writeln!(&mut v6, "{},{},{}", a, b, std::str::from_utf8(cc).unwrap())?; + if include_asn { + writeln!(&mut v6, "{},{},{},{}", a, b, defn.cc(), defn.asn())?; + } else { + writeln!(&mut v6, "{},{},{}", a, b, defn.cc())?; + } } // The documentation says you should always flush a BufWriter. v4.flush()?; v6.flush()?; + if let Some(output_asn) = args.output_asn { + networks.sort(); + let mut asn = BufWriter::new(File::create(output_asn)?); + for net in networks { + writeln!(&mut asn, "{},{}", net.asn, net.name)?; + } + asn.flush()?; + } + Ok(()) } fn main() -> std::io::Result<()> { let args: Args = argh::from_env(); - convert( - args.input.as_path(), - args.output_ipv4.as_path(), - args.output_ipv6.as_path(), - ) + convert(args) } [View Less]

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 14 Apr '21

14 Apr '21

commit c5c34e445ab7c88227c77f79f9e384caaf3e41f0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 14 14:15:17 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 6 +++--- contents+ka.po | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/contents+es.po b/contents+es.po index 97e6b54388..a3700908e3 100644 --- a/contents+es.po +++ b/contents+es.po @@ -… [View More]1467,7 +1467,7 @@ msgstr "" "* Una carta que Boing Boing usó para responder a un requerimiento judicial " "de los EE.UU. sobre su repetidor de salida: [What happened when we got " "subpoenaed over our Tor exit node](https://boingboing.net/2015/08/04/what-" -"happened-when-the-fbi-sub.html)" +"happened-when-the-fbi-sub.html) (en inglés)" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1553,8 +1553,8 @@ msgid "" "relays, one place to meet people is [your local " "hackerspace](https://wiki.hackerspaces.org/Hackerspaces)." msgstr "" -"Si usted no sabe de nadie en su red social interesado en ejecutar " -"retransmisiones, un sitio donde encontrar gente es [su hackerspace " +"Si no conoces a nadie interesado en mantener repetidores, un sitio donde " +"encontrar gente es [tu hackerspace " "local](https://wiki.hackerspaces.org/Hackerspaces)." #: https//community.torproject.org/relay/community-resources/ diff --git a/contents+ka.po b/contents+ka.po index dd4c88c7aa..97a53bb2bd 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -298,9 +298,9 @@ msgid "" " Community Team](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" "community-team) for more help." msgstr "" -"თუ ეს თქვენს ერთობასაც ეხება ან არ ხართ დარწმუნებული, გთხოვთ [დაუკავშირდეთ " -"ერთობის ჩვენს გუნდს](https://lists.torproject.org/cgi-bin/mailman/listinfo" -"/tor-community-team) დამატებითი მხარდაჭერის მისაღებად." +"თუ ეს თქვენს საზოგადოებასაც ეხება ან არ ხართ დარწმუნებული, გთხოვთ " +"[დაუკავშირდეთ ერთობის ჩვენს გუნდს](https://lists.torproject.org/cgi-" +"bin/mailman/listinfo/tor-community-team) დამატებითი მხარდაჭერის მისაღებად." #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.title) (dynamic) @@ -6264,7 +6264,7 @@ msgid "" "Our documentation is very important for users around the world to be able to" " use Tor and Tor Browser:" msgstr "" -"ჩვენს მასალები მეტად ეხმარება მომხმარებლებს მთელი მსოფლიოდან, Tor-ისა და " +"ჩვენი მასალები მეტად ეხმარება მომხმარებლებს მთელი მსოფლიოდან, Tor-ისა და " "Tor-ბრაუზერის გამოყენებაში." #: https//community.torproject.org/localization/current-status/ @@ -6273,8 +6273,8 @@ msgid "" "This includes the Tor Browser User Manual, the Support portal, the Tor " "Project website and the Community portal." msgstr "" -"ესენი მოიცავს Tor-ბრაუზერის სახელმძღვანელოს, მხარდაჭერის გვერდს, Tor-" -"პროექტის ვებსაიტსა და ერთობის გვერდებს." +"მათში იგულისხმება Tor-ბრაუზერის სახელმძღვანელო, მხარდაჭერის გვერდი, Tor-" +"პროექტისა და ერთობის საიტები." #: https//community.torproject.org/localization/translation-guide/ #: (content/localization/translation-guide/contents+en.lrpage.title) (dynamic) @@ -6745,8 +6745,8 @@ msgid "" "Support portal:" msgstr "" "მიუხედავად იმისა, რომ თქვენი წვლილი ნებისმიერ პროექტში ღირებულია, მეტად " -"გადამწყვეტია Tor-ბრაუზერი, Tor-ბრაუზერის სახელმძღვანელო და ჩვენი მხარდაჭერის" -" საიტი:" +"გადამწყვეტია ითარგმნოს Tor-ბრაუზერი, Tor-ბრაუზერის სახელმძღვანელო და ჩვენი " +"მხარდაჭერის საიტი:" #: https//community.torproject.org/localization/pick-a-project/ #: (content/localization/pick-a-project/contents+en.lrpage.body) @@ -20392,7 +20392,7 @@ msgstr "გვერდის შექმნაში წვლილის შ #: (dynamic) msgid "Back to previous page:" -msgstr "დაბრუნება წინა გვერდზე:" +msgstr "დაბრუნება წინა გვერდზე: " #: (dynamic) msgid "Edit this page" @@ -20455,7 +20455,7 @@ msgstr "" #: (dynamic) msgid "Tracking and surveillance are widespread." -msgstr "მეთვალყურეობა და ზედამხედველობა ფართოდაა გავრცელებული." +msgstr "თვალთვალი და მეთვალყურეობა ფართოდაა გავრცელებული." #: (dynamic) msgid "" @@ -20480,8 +20480,8 @@ msgstr "" #: (dynamic) msgid "People shouldn't be exploited for using the internet." msgstr "" -"დაუშვებელია იმ ხალხის საკუთარი მიზნით გამოყენება, რომლთაც უბრალოდ ინტერნეტით" -" სარგებლობა სურთ." +"ინტერნეტით სარგებლობის მსურველთა საკუთარი მიზნებისთვის გამოყენება, " +"დაუშვებელია." #: (dynamic) msgid "" @@ -20495,7 +20495,7 @@ msgid "" "Tor software is developed by the Tor Project, a 501(c)(3) nonprofit " "organization." msgstr "" -"Tor-პროგრამას ქმნის Tor-პროექტი, 501(c)(3) გადასახადებისგან თავისუფალი " +"Tor-პროგრამის შემქმნელია Tor-პროექტი, 501(c)(3) გადასახადებისგან თავისუფალი " "არამომგებიანი დაწესებულება." #: (dynamic) [View Less]

1 0

[tor/maint-0.3.5] fallbackdir: Remove two unspec lines
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit 131e2d99a45bd86b8379664cccb59bfc66f80c96 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:04 2021 -0400 fallbackdir: Remove two unspec lines Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index c8b133da1b..4f43a4ba6e 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/… [View More]

1 0

[tor/maint-0.4.5] fallbackdir: Remove two unspec lines
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit 131e2d99a45bd86b8379664cccb59bfc66f80c96 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:04 2021 -0400 fallbackdir: Remove two unspec lines Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index c8b133da1b..4f43a4ba6e 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/… [View More]

1 0