July 2018 - tor-commits - lists.torproject.org

[meek/master] Slightly refactor the logic around TOR_BROWSER_MEEK_PROFILE.
by dcf＠torproject.org 17 Jul '18

17 Jul '18

commit 0e65717438a60d088aa395a9de5f063d0814e0bf Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 16 21:52:23 2018 -0700 Slightly refactor the logic around TOR_BROWSER_MEEK_PROFILE. --- meek-client-torbrowser/meek-client-torbrowser.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index abf119b..7520a0b 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -206,15 +206,15 @@ func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { return } var profilePath = os.Getenv("TOR_BROWSER_MEEK_PROFILE") - if profilePath == "" { - var torDataDir = os.Getenv("TOR_BROWSER_TOR_DATA_DIR") - if torDataDir != "" && torDataDirFirefoxProfilePath != "" { - profilePath = filepath.Join(torDataDir, torDataDirFirefoxProfilePath) - } else { - profilePath, err = filepath.Abs(firefoxProfilePath) - if err != nil { - return - } + var torDataDir = os.Getenv("TOR_BROWSER_TOR_DATA_DIR") + if profilePath != "" { + // Take directly from TOR_BROWSER_MEEK_PROFILE. + } else if torDataDir != "" && torDataDirFirefoxProfilePath != "" { + profilePath = filepath.Join(torDataDir, torDataDirFirefoxProfilePath) + } else { + profilePath, err = filepath.Abs(firefoxProfilePath) + if err != nil { + return } } err = prepareBrowserProfile(profilePath)

1 0

[meek/master] Comment for TOR_BROWSER_MEEK_PROFILE.
by dcf＠torproject.org 17 Jul '18

17 Jul '18

commit 488084d89003c524c84e05a2c89917351899b602 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 16 21:54:38 2018 -0700 Comment for TOR_BROWSER_MEEK_PROFILE. --- meek-client-torbrowser/meek-client-torbrowser.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 7520a0b..b02f1fc 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -198,6 +198,10 @@ func isBrowserProfileUpToDate(templatePath string, profilePath string) bool { } // Run firefox and return its exec.Cmd and stdout pipe. +// +// If the environment variable TOR_BROWSER_MEEK_PROFILE is set, that is used as +// the path to the Firefox profile to use. Otherwise, the profile is chosen in a +// platform-specific way (see linux.go, mac.go, windows.go). func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { // Mac OS X needs absolute paths for firefox and for the profile. var absFirefoxPath string

1 0

[meek/master] Bug 25405: cannot use Moat if a meek bridge is configured
by dcf＠torproject.org 17 Jul '18

17 Jul '18

commit 6a70f67dd895d1b9124a08dac06e0cba1b7a30bb Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 6 15:43:40 2018 -0500 Bug 25405: cannot use Moat if a meek bridge is configured Add support for a TOR_BROWSER_MEEK_PROFILE environment variable which, if present, contains the path to the HTTP helper browser profile. --- meek-client-torbrowser/meek-client-torbrowser.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 0064b4b..abf119b 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -205,14 +205,16 @@ func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { if err != nil { return } - var profilePath string - var torDataDir = os.Getenv("TOR_BROWSER_TOR_DATA_DIR") - if torDataDir != "" && torDataDirFirefoxProfilePath != "" { - profilePath = filepath.Join(torDataDir, torDataDirFirefoxProfilePath) - } else { - profilePath, err = filepath.Abs(firefoxProfilePath) - if err != nil { - return + var profilePath = os.Getenv("TOR_BROWSER_MEEK_PROFILE") + if profilePath == "" { + var torDataDir = os.Getenv("TOR_BROWSER_TOR_DATA_DIR") + if torDataDir != "" && torDataDirFirefoxProfilePath != "" { + profilePath = filepath.Join(torDataDir, torDataDirFirefoxProfilePath) + } else { + profilePath, err = filepath.Abs(firefoxProfilePath) + if err != nil { + return + } } } err = prepareBrowserProfile(profilePath)

1 0

[torspec/master] one more typo
by arma＠torproject.org 17 Jul '18

17 Jul '18

commit d31c33c95f146ecf616447495c48eb89a9fa9c63 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 16 23:42:35 2018 -0400 one more typo --- proposals/293-know-when-to-publish.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/293-know-when-to-publish.txt b/proposals/293-know-when-to-publish.txt index ebc94e3..f2d96e0 100644 --- a/proposals/293-know-when-to-publish.txt +++ b/proposals/293-know-when-to-publish.txt @@ -49,7 +49,7 @@ Target: 0.3.5 4. Implications for proposal 275 - Once most relays are running verions that support the features + Once most relays are running versions that support the features above, and once authorities are generating consensuses with the StaleDesc flag, there will no longer be a need to keep the published time in consensus documents accurate -- we can start

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit a46db3166716d2de6c3561896632187e0f383322 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:23:14 2018 +0000 Update translations for support-tbb --- pt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt.json b/pt.json index 2cfd9ed7b..1020e63db 100644 --- a/pt.json +++ b/pt.json @@ -2,7 +2,7 @@ "tbb-1": { "id": "#tbb-1", "control": "tbb-1", - "title": "What are the most common issues with the latest stable version of Tor Browser?", + "title": "Quais são os problemas mais comuns com a última versão estável do browser Tor?", "description": "<p class=\"mb-3\">Whenever we release a new stable version of Tor Browser, we write a blog post that details its new features and known issues. If you started having issues with your Tor Browser after an update, check out <mark><a href=\"https://blog.torproject.org\">https://blog.torproject.org</a></mark> for the most recent stable Tor Browser post to see if your issue is listed.</p>" }, "tbb-2": {

1 0

[translation/support-connecting_completed] Update translations for support-connecting_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 4ea204986bae3cf67663b28b018ce76103aa0ad0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:22:34 2018 +0000 Update translations for support-connecting_completed --- sq.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sq.json b/sq.json index 0298c7174..82404bfd9 100644 --- a/sq.json +++ b/sq.json @@ -3,13 +3,13 @@ "id": "#po lidhet-1", "control": "po lidhet-1", "title": "Tor browser nuk po lidhet,por nuk duket sikur një problem me censurë", - "description": "<p class=\"mb-3\">një nga problemet më të zakonshme që shkaktojnë gabime lidhjeje në Tor Browser është një orë e gabuar e sistemit.Ju lutemi sigurohuni që ora juaj e sistemit dhe zona e kohës janë të vendosura me saktësi.Nëse kjo nuk jua ndreq problemin,shikoni faqen e Troubleshooting në<mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\"> manualin e Tor Browser</a></mark>.</p>" + "description": "<p class=\"mb-3\">një nga problemet më të zakonshme që shkaktojnë gabime lidhjeje në Tor Browser është një orë e gabuar e sistemit.Ju lutemi sigurohuni që ora juaj e sistemit dhe zona e kohës janë të vendosura me saktësi.Nëse kjo nuk jua rregullon problemin,shikoni faqen e Troubleshooting në<mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\"> manualin e Tor Browser</a></mark>.</p>" }, "connecting-2": { "id": "#po lidhet-2", "control": "po lidhet-2", "title": "Unë po kam probleme me lidhje në Tor.dhe unë nuk mund të kuptoj qka është gabim.", - "description": "<p class=\"mb-3\">Nëse ju po keni probleme me lidhje,ju lutemi sgjidhni opcionin \"Kopjo Tor log në clipboard.\"Pastaj ngjitni Tor log-in në një file teksti ose ndonjë dokument tjetër.Ju duhet të shihni një nga këto log-at e gabimeve të zakonshme(shiko për linjat e mëposhtme në log-in tuaj Tor):</p><h5>log-i i gabimit të zakonshëm #1: Proxy connection failure</h5><pre><code> 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx. xx:xxxxx (\"general SOCKS server failure\")</code></pre><p class=\"mb-3\">\nNëse shihni linja si këto në Tor log-in tu" + "description": "Nëse ju po keni probleme me lidhje,ju lutemi sgjidhni opcionin \"Kopjo Tor log në clipboard.\"Pastaj ngjitni Tor log-in në një file teksti ose ndonjë dokument tjetër.Ju duhet të shihni një nga këto log-at e gabimeve të zakonshme(shiko për linjat e mëposhtme në log-in tuaj Tor):log-u i gabimit të zakonshëm #1: Proxy connection failure 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\" )\nNëse shihni linja si këto në Tor log-un tuaj,kjo do të thotë se lidhja juaj me një SOCKS proxy po dështon.Nëse një SOCKS proxy është e nevojshme për organizimin e rjetit tuaj,atëherë ju lutemi sigurohuni që keni shënuar detalet e proxy-yt saktësisht.Nëse një SOCKS proxy nuk është e nevojshme,ose nuk jeni të sigurt,ju lutemi provoni të lidheni në rjetin Tor pa një SOCKS proxy.Log-u i një gabimit të zakonshëm #2:Can’t reach guard relays 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit. \n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop \n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit.Nëse shihni linja si këto në log-un tuaj Tor,Do të thotë se Tor-i i juaj dështoi të lidhet në nyjen e parë në qarkun Tor.Kjo mund të thotë se ju jeni në një rjet të censuruar.ju lutemi provoni lidhjen me ura,dhe kjo duhet ta regullojë problemin.Gabimi i zakonshëm #3:Failed to complete TLS handshake 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. (DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) \n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \n 13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) with SSL state SSLv2/v3 read server hello A in HANDSHAKE \n 13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with SSL state (No SSL object)Nëse shihni linja si këto në logun tuaj Tor,Domethënë se Tor-i dështoi të përfundoj një TLS Dorë-shtrëngim me autoritetet e directorit.Përdorimi i urave do ta rregulloj këtë.Log-u i gabimit të zakonshëm #4:Clock skew 19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead. \n Tor requires an accurate clock to work: please check your time, timezone, and date settings.Nëse shihni linja si këto në log-un tuaj Tor,dotëthotë se ora e sistemit tuaj është gabim.Ju lutemi sigurohuni se ora juaj është vendosur saktësisht,duke përfshirë zonën kohore të saktë.Pastaj refilloni Tor-in." }, "connecting-3": { "id": "#po lidhet-3",

1 0

[translation/support-connecting] Update translations for support-connecting
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 7882649e531f77b6802e3332282d72ea541fad83 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:22:24 2018 +0000 Update translations for support-connecting --- sq.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sq.json b/sq.json index 0298c7174..82404bfd9 100644 --- a/sq.json +++ b/sq.json @@ -3,13 +3,13 @@ "id": "#po lidhet-1", "control": "po lidhet-1", "title": "Tor browser nuk po lidhet,por nuk duket sikur një problem me censurë", - "description": "<p class=\"mb-3\">një nga problemet më të zakonshme që shkaktojnë gabime lidhjeje në Tor Browser është një orë e gabuar e sistemit.Ju lutemi sigurohuni që ora juaj e sistemit dhe zona e kohës janë të vendosura me saktësi.Nëse kjo nuk jua ndreq problemin,shikoni faqen e Troubleshooting në<mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\"> manualin e Tor Browser</a></mark>.</p>" + "description": "<p class=\"mb-3\">një nga problemet më të zakonshme që shkaktojnë gabime lidhjeje në Tor Browser është një orë e gabuar e sistemit.Ju lutemi sigurohuni që ora juaj e sistemit dhe zona e kohës janë të vendosura me saktësi.Nëse kjo nuk jua rregullon problemin,shikoni faqen e Troubleshooting në<mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\"> manualin e Tor Browser</a></mark>.</p>" }, "connecting-2": { "id": "#po lidhet-2", "control": "po lidhet-2", "title": "Unë po kam probleme me lidhje në Tor.dhe unë nuk mund të kuptoj qka është gabim.", - "description": "<p class=\"mb-3\">Nëse ju po keni probleme me lidhje,ju lutemi sgjidhni opcionin \"Kopjo Tor log në clipboard.\"Pastaj ngjitni Tor log-in në një file teksti ose ndonjë dokument tjetër.Ju duhet të shihni një nga këto log-at e gabimeve të zakonshme(shiko për linjat e mëposhtme në log-in tuaj Tor):</p><h5>log-i i gabimit të zakonshëm #1: Proxy connection failure</h5><pre><code> 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx. xx:xxxxx (\"general SOCKS server failure\")</code></pre><p class=\"mb-3\">\nNëse shihni linja si këto në Tor log-in tu" + "description": "Nëse ju po keni probleme me lidhje,ju lutemi sgjidhni opcionin \"Kopjo Tor log në clipboard.\"Pastaj ngjitni Tor log-in në një file teksti ose ndonjë dokument tjetër.Ju duhet të shihni një nga këto log-at e gabimeve të zakonshme(shiko për linjat e mëposhtme në log-in tuaj Tor):log-u i gabimit të zakonshëm #1: Proxy connection failure 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\" )\nNëse shihni linja si këto në Tor log-un tuaj,kjo do të thotë se lidhja juaj me një SOCKS proxy po dështon.Nëse një SOCKS proxy është e nevojshme për organizimin e rjetit tuaj,atëherë ju lutemi sigurohuni që keni shënuar detalet e proxy-yt saktësisht.Nëse një SOCKS proxy nuk është e nevojshme,ose nuk jeni të sigurt,ju lutemi provoni të lidheni në rjetin Tor pa një SOCKS proxy.Log-u i një gabimit të zakonshëm #2:Can’t reach guard relays 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit. \n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop \n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit.Nëse shihni linja si këto në log-un tuaj Tor,Do të thotë se Tor-i i juaj dështoi të lidhet në nyjen e parë në qarkun Tor.Kjo mund të thotë se ju jeni në një rjet të censuruar.ju lutemi provoni lidhjen me ura,dhe kjo duhet ta regullojë problemin.Gabimi i zakonshëm #3:Failed to complete TLS handshake 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. (DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) \n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \n 13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) with SSL state SSLv2/v3 read server hello A in HANDSHAKE \n 13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with SSL state (No SSL object)Nëse shihni linja si këto në logun tuaj Tor,Domethënë se Tor-i dështoi të përfundoj një TLS Dorë-shtrëngim me autoritetet e directorit.Përdorimi i urave do ta rregulloj këtë.Log-u i gabimit të zakonshëm #4:Clock skew 19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead. \n Tor requires an accurate clock to work: please check your time, timezone, and date settings.Nëse shihni linja si këto në log-un tuaj Tor,dotëthotë se ora e sistemit tuaj është gabim.Ju lutemi sigurohuni se ora juaj është vendosur saktësisht,duke përfshirë zonën kohore të saktë.Pastaj refilloni Tor-in." }, "connecting-3": { "id": "#po lidhet-3",

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit f76011294c60d6bad219c68de1098e0a1d2a87ac Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:18:59 2018 +0000 Update translations for tails-openpgp-applet_completed --- pt_BR/openpgp-applet.pot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR/openpgp-applet.pot b/pt_BR/openpgp-applet.pot index 43227c4b2..9c5a29f94 100644 --- a/pt_BR/openpgp-applet.pot +++ b/pt_BR/openpgp-applet.pot @@ -6,13 +6,14 @@ # Communia <ameaneantie(a)riseup.net>, 2015-2017 # anominino anomino <anominino(a)riseup.net>, 2018 # Danton Medrado, 2015 +# jhqpinto <jhqpinto(a)vivaldi.net>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-04-12 19:13+0000\n" -"Last-Translator: Gustavo Vasconcelos <vasconcelos(a)gmail.com>\n" +"PO-Revision-Date: 2018-07-16 00:13+0000\n" +"Last-Translator: jhqpinto <jhqpinto(a)vivaldi.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,7 +71,7 @@ msgstr "Confiança Marginal" #: bin/openpgp-applet:345 msgid "Full Trust" -msgstr "Confiança Completa" +msgstr "Confiança Total" #: bin/openpgp-applet:347 msgid "Ultimate Trust" @@ -114,7 +115,7 @@ msgstr "Ocultar contatos destinatários" msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "Ocultar as IDs de usuário de todos os destinatários de uma mensagem criptografada. Ou qualquer pessoa que veja a mensagem criptografadapode ver quem são os destinatários." +msgstr "Ocultar as IDs de usuário de todos os destinatários de uma mensagem criptografada. Em caso contrário, qualquer pessoa que veja a mensagem criptografada pode saber quem são os destinatários." #: bin/openpgp-applet:545 msgid "Sign message as:"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 0cc746376847f79c02fc05e8361187ed7b48c438 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:18:53 2018 +0000 Update translations for tails-openpgp-applet --- pt_BR/openpgp-applet.pot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR/openpgp-applet.pot b/pt_BR/openpgp-applet.pot index 43227c4b2..9c5a29f94 100644 --- a/pt_BR/openpgp-applet.pot +++ b/pt_BR/openpgp-applet.pot @@ -6,13 +6,14 @@ # Communia <ameaneantie(a)riseup.net>, 2015-2017 # anominino anomino <anominino(a)riseup.net>, 2018 # Danton Medrado, 2015 +# jhqpinto <jhqpinto(a)vivaldi.net>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-04-12 19:13+0000\n" -"Last-Translator: Gustavo Vasconcelos <vasconcelos(a)gmail.com>\n" +"PO-Revision-Date: 2018-07-16 00:13+0000\n" +"Last-Translator: jhqpinto <jhqpinto(a)vivaldi.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,7 +71,7 @@ msgstr "Confiança Marginal" #: bin/openpgp-applet:345 msgid "Full Trust" -msgstr "Confiança Completa" +msgstr "Confiança Total" #: bin/openpgp-applet:347 msgid "Ultimate Trust" @@ -114,7 +115,7 @@ msgstr "Ocultar contatos destinatários" msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "Ocultar as IDs de usuário de todos os destinatários de uma mensagem criptografada. Ou qualquer pessoa que veja a mensagem criptografadapode ver quem são os destinatários." +msgstr "Ocultar as IDs de usuário de todos os destinatários de uma mensagem criptografada. Em caso contrário, qualquer pessoa que veja a mensagem criptografada pode saber quem são os destinatários." #: bin/openpgp-applet:545 msgid "Sign message as:"

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 08a3986746bcb1333c0dbf7830c9c07d661ec18f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:18:32 2018 +0000 Update translations for tor_animation_completed --- pt_BR.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.srt b/pt_BR.srt index 79fdb6228..2ae2eaedb 100644 --- a/pt_BR.srt +++ b/pt_BR.srt @@ -124,7 +124,7 @@ se o censor sabe o que você faz 27 00:01:36,540 --> 00:01:39,440 -As publicidades não vão te seguir +As publicidades não vão aparecer por toda a parte durante meses, 28

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 62d3be5a159c43d4712a73761e543a8484861110 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:18:27 2018 +0000 Update translations for tor_animation --- pt_BR.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.srt b/pt_BR.srt index 79fdb6228..2ae2eaedb 100644 --- a/pt_BR.srt +++ b/pt_BR.srt @@ -124,7 +124,7 @@ se o censor sabe o que você faz 27 00:01:36,540 --> 00:01:39,440 -As publicidades não vão te seguir +As publicidades não vão aparecer por toda a parte durante meses, 28

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit b0962a800384c4b4f288179aa4c2bfb54b70b789 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:17:59 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- nl/torbutton.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index ce0e13a4e..27e0003d7 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klik-bij-afspelen."> -<!ENTITY torbutton.circuit_display.title "Tor-circuit voor deze website"> +<!ENTITY torbutton.circuit_display.title "Torcircuit"> +<!ENTITY torbutton.circuit_display.new_circuit "Nieuw circuit voor deze website">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit c6d4eeef8b8ea09ab58ee0831a314adb2dfecf75 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:17:54 2018 +0000 Update translations for torbutton-torbuttondtd --- cs/torbutton.dtd | 4 ++-- nl/torbutton.dtd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd index 3c312e7ac..0f71d2127 100644 --- a/cs/torbutton.dtd +++ b/cs/torbutton.dtd @@ -4,11 +4,11 @@ <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.preferences "Bezpečnostní nastavení…"> <!ENTITY torbutton.context_menu.preferences.key "B"> -<!ENTITY torbutton.context_menu.networksettings "Nastavení sítě Tor ..."> +<!ENTITY torbutton.context_menu.networksettings "Nastavení sítě Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Hledat aktualizace pro Tor Browser"> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Ochrany proti cookies."> +<!ENTITY torbutton.context_menu.cookieProtections "Ochrany proti cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klikněte pro inicializaci Torbutton"> <!ENTITY torbutton.prefs.security_settings "Nastavení zabezpečení prohlížeče Tor"> diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index 7b7e6dbbc..27e0003d7 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -47,5 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klik-bij-afspelen."> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.title "Torcircuit"> +<!ENTITY torbutton.circuit_display.new_circuit "Nieuw circuit voor deze website">

1 0

[translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 35a206b80639f4943f38794f4e367ea91a6982ce Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:17:47 2018 +0000 Update translations for torbutton-torbuttonproperties_completed --- es/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/torbutton.properties b/es/torbutton.properties index f95c93355..9335f4df2 100644 --- a/es/torbutton.properties +++ b/es/torbutton.properties @@ -54,5 +54,5 @@ profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permi profileMigrationFailed=Ha ocurrido un error en la migración de tu perfil %S. \nSe usarán los nuevos ajustes. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión encriptada (Servicio Onion, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Conexión encpritada (Servicio Onion) +pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio Onion, %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=Conexión cifrada (Servicio Onion)

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit bc8df516c0f902ad189fa72b826b46be35a3c44d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:17:42 2018 +0000 Update translations for torbutton-torbuttonproperties --- es/torbutton.properties | 4 ++-- pt_BR/torbutton.properties | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/es/torbutton.properties b/es/torbutton.properties index f95c93355..9335f4df2 100644 --- a/es/torbutton.properties +++ b/es/torbutton.properties @@ -54,5 +54,5 @@ profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permi profileMigrationFailed=Ha ocurrido un error en la migración de tu perfil %S. \nSe usarán los nuevos ajustes. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión encriptada (Servicio Onion, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Conexión encpritada (Servicio Onion) +pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio Onion, %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=Conexión cifrada (Servicio Onion) diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties index 33e1d0345..09ea7581c 100644 --- a/pt_BR/torbutton.properties +++ b/pt_BR/torbutton.properties @@ -31,10 +31,10 @@ torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua priv torbutton.popup.never_ask_again = Não me pergunte novamente torbutton.popup.confirm_newnym = O navegador Tor fechará todas as janelas e abas. Todas as sessões de websites serão perdidas.\n\nVocê deseja reiniciar o navegador Tor agora para reiniciar a sua identidade?\n\n -torbutton.slider_notification = O menu cebola verde agora dispõe de uma opcão que lhe permite ajustar o seu nivel de seguranca. Dê uma conferida! +torbutton.slider_notification = O menu cebola verde agora dispõe de uma opção que lhe permite ajustar o seu nivel de seguranca. Dê uma conferida! torbutton.slider_notification_button = Abra as definições de segurança. -torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir aos websites determinar o tamanho do seu monitor, que pode ser usado para rastreá-lo. Nós recomendamos que você deixe a janela do Navegador Tor no seu tamanho original. +torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir que websites determinem o tamanho do monitor, o que pode ser usado para rastreá-lo. Recomenda-se deixar a janela do Navegador Tor no seu tamanho original. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este website (%S) tentou extrair dados de imagem CANVAS HTML5, que podem ser usados para identificar o seu computador.\n\nVocê deseja que o Navegador Tor permita que este website extraia dados de imagem CANVAS HTML5? @@ -48,10 +48,10 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Problema com o Perfil %S -profileReadOnly=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S em um outro local antes de tentar utilizá-lo. -profileReadOnlyMac=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S no seu Desktop ou em uma pasta de Aplicações antes de tentar utilizá-lo.\n +profileReadOnly=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Copie %S em um outro local antes de tentar usá-lo. +profileReadOnlyMac=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Copie %S no seu Desktop ou em uma pasta de Aplicações antes de tentar usá-lo.\n profileAccessDenied=%S não possui permissão para acessar o perfil. Por favor, ajuste as suas permissões de arquivo de sistema e tente novamente. -profileMigrationFailed=Migração de seu perfil %S existente falhou.\nNovas configurações serão utilizadas. +profileMigrationFailed=Migração de seu perfil %S existente falhou.\nNovas configurações serão usadas. # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Conexão criptografada (Serviço Onion, %1$S, %2$S bit keys, %3$S)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 2bbef418871cff0f8e4d98aaa08947a4ca5bd17b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:16:03 2018 +0000 Update translations for liveusb-creator --- sq/sq.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sq/sq.po b/sq/sq.po index d1c742ff9..90d741c80 100644 --- a/sq/sq.po +++ b/sq/sq.po @@ -5,13 +5,14 @@ # Translators: # Bujar Tafili, 2015-2016 # Genti Ereqi, 2014 +# THick Atmosphere <co404(a)protonmail.ch>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2017-11-11 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-07-14 13:49+0000\n" +"Last-Translator: THick Atmosphere <co404(a)protonmail.ch>\n" "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -210,7 +211,7 @@ msgstr "Duke e formatuar %(device)s si FAT32" #: ../tails_installer/creator.py:1249 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "Nuk u gjet syslinux' gptmbr.bin" #: ../tails_installer/creator.py:1262 #, python-format @@ -273,7 +274,7 @@ msgstr "S'mund të gjendet" msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "" +msgstr "Sigurohuni ta ekstraktoni të gjithë tails-installer skedarin zip para se ta ekzekutoni këtë program." #: ../tails_installer/gui.py:69 #, python-format

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 61f06cfb7e1352784c604c99e148c3c0fcc80953 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:15:57 2018 +0000 Update translations for https_everywhere_completed --- es/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 5419af75a..2281ff701 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportar configuración"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer configuraciones predeterminadas"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "Esto restablecerá cada conjunto de reglas a su estado predeterminado. ¿Continuar?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Esto reseteará cada conjunto de reglas a su estado predeterminado. ¿Continuar? "> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Fuerzan conexiones cifradas a estos sitios web:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 7e0fbb08d3c1aea18f4989cdda6a55ed7fe414a7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:15:48 2018 +0000 Update translations for https_everywhere --- es/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 5419af75a..2281ff701 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportar configuración"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer configuraciones predeterminadas"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "Esto restablecerá cada conjunto de reglas a su estado predeterminado. ¿Continuar?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Esto reseteará cada conjunto de reglas a su estado predeterminado. ¿Continuar? "> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Fuerzan conexiones cifradas a estos sitios web:">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit be10022711b7ef9942349a7116ec1d37388b59b1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:15:39 2018 +0000 Update translations for whisperback_completed --- ru/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 180869138..39f23d49c 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-06-27 14:09+0000\n" -"Last-Translator: Timofey Lisunov <solokot(a)gmail.com>\n" +"PO-Revision-Date: 2018-07-15 14:56+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 9ba6472eff3d0a17b3b59de68e35badb616f1407 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:15:33 2018 +0000 Update translations for whisperback --- ru/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 180869138..39f23d49c 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-06-27 14:09+0000\n" -"Last-Translator: Timofey Lisunov <solokot(a)gmail.com>\n" +"PO-Revision-Date: 2018-07-15 14:56+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit dcd97f7098d8200516dbc106467646086857598e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:15:18 2018 +0000 Update translations for bridgedb_completed --- pt_BR/LC_MESSAGES/bridgedb.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 4aa4a8c87..0c9738bc1 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -12,6 +12,7 @@ # Augustine <evandro(a)geocities.com>, 2013 # Humberto Sartini, 2014 # Isabel Ferreira, 2014 +# jhqpinto <jhqpinto(a)vivaldi.net>, 2018 # João Paulo S.S <contato1908(a)gmail.com>, 2015 # Kaio Soares Rauta <kaio_soares_rauta(a)yahoo.com.br>, 2015 # Luciana Dark Blue <lucianadarkblue(a)gmail.com>, 2015 @@ -22,8 +23,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-04-23 15:59+0000\n" -"Last-Translator: Cláudio Carvalho <znnb(a)mail.com>\n" +"PO-Revision-Date: 2018-07-15 20:03+0000\n" +"Last-Translator: jhqpinto <jhqpinto(a)vivaldi.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,7 +74,7 @@ msgstr "Mostrar Código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Código QR para suas pontes de conexão" +msgstr "Código QR para as suas pontes de conexão" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -86,13 +87,13 @@ msgstr "Ai, caramba!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Parece que houve um erro ao obter seu Código QR." +msgstr "Parece que houve um erro ao obter o seu Código QR." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "O Código QR contém suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." +msgstr "O Código QR contém as suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -237,7 +238,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportadores Plugáveis%s,\nque podem ajudar a ocultar suas conexões com a rede Tor, tornando mais difícil,\npara alguém que estiver observando seu tráfego de Internet, saber ao certo se você está usando Tor.\n" +msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportadores Plugáveis%s,\nque podem ajudar a ocultar as suas conexões com a rede Tor, tornando mais difícil,\npara quem estiver observando o seu tráfego na Internet, saber ao certo se você está usando Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -300,11 +301,11 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Tente incluir o máximo de informações possível sobre seu caso, junto com a lista de \npontes e Transportadores Plugáveis que você tentou utilizar, a versão do seu Navegador Tor,\ne qualquer mensagem que o Tor tenha te dado, etc" +msgstr "Tente incluir o máximo de informações possíveis sobre o seu caso, junto com a lista de \npontes e Transportadores Plugáveis que você tentou utilizar, a versão do seu Navegador Tor\ne toda mensagem que o Tor tenha dado, etc." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Aqui estão suas pontes de conexão:" +msgstr "Aqui estão as suas pontes de conexão:" #: bridgedb/strings.py:129 msgid "Get Bridges!" @@ -365,7 +366,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e cole as pontes de conexão na caixa de entrada de texto. Finalmente, clique em 'Conectar', e deve estar tudo pronto! Se encontrar problemas, tente clicar no botão de 'Ajuda' do assistente de 'Configurações da Rede Tor' para mais suporte." +msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar as suas novas pontes, copie e cole as pontes de conexão na caixa de entrada de texto. Em seguida, clique em 'Conectar' e tudo deverá estar pronto! Caso haja problemas, clique no botão 'Ajuda' do assistente de 'Configurações da Rede Tor' para mais suporte." #: bridgedb/strings.py:167 msgid "Displays this message."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 17 Jul '18

17 Jul '18

commit 8be0ed43d4ae8d331b3aa972aaa2dac59fb368b6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 17 03:15:06 2018 +0000 Update translations for bridgedb --- pt_BR/LC_MESSAGES/bridgedb.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 4aa4a8c87..0c9738bc1 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -12,6 +12,7 @@ # Augustine <evandro(a)geocities.com>, 2013 # Humberto Sartini, 2014 # Isabel Ferreira, 2014 +# jhqpinto <jhqpinto(a)vivaldi.net>, 2018 # João Paulo S.S <contato1908(a)gmail.com>, 2015 # Kaio Soares Rauta <kaio_soares_rauta(a)yahoo.com.br>, 2015 # Luciana Dark Blue <lucianadarkblue(a)gmail.com>, 2015 @@ -22,8 +23,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-04-23 15:59+0000\n" -"Last-Translator: Cláudio Carvalho <znnb(a)mail.com>\n" +"PO-Revision-Date: 2018-07-15 20:03+0000\n" +"Last-Translator: jhqpinto <jhqpinto(a)vivaldi.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,7 +74,7 @@ msgstr "Mostrar Código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Código QR para suas pontes de conexão" +msgstr "Código QR para as suas pontes de conexão" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -86,13 +87,13 @@ msgstr "Ai, caramba!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Parece que houve um erro ao obter seu Código QR." +msgstr "Parece que houve um erro ao obter o seu Código QR." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "O Código QR contém suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." +msgstr "O Código QR contém as suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -237,7 +238,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportadores Plugáveis%s,\nque podem ajudar a ocultar suas conexões com a rede Tor, tornando mais difícil,\npara alguém que estiver observando seu tráfego de Internet, saber ao certo se você está usando Tor.\n" +msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportadores Plugáveis%s,\nque podem ajudar a ocultar as suas conexões com a rede Tor, tornando mais difícil,\npara quem estiver observando o seu tráfego na Internet, saber ao certo se você está usando Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -300,11 +301,11 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Tente incluir o máximo de informações possível sobre seu caso, junto com a lista de \npontes e Transportadores Plugáveis que você tentou utilizar, a versão do seu Navegador Tor,\ne qualquer mensagem que o Tor tenha te dado, etc" +msgstr "Tente incluir o máximo de informações possíveis sobre o seu caso, junto com a lista de \npontes e Transportadores Plugáveis que você tentou utilizar, a versão do seu Navegador Tor\ne toda mensagem que o Tor tenha dado, etc." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Aqui estão suas pontes de conexão:" +msgstr "Aqui estão as suas pontes de conexão:" #: bridgedb/strings.py:129 msgid "Get Bridges!" @@ -365,7 +366,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e cole as pontes de conexão na caixa de entrada de texto. Finalmente, clique em 'Conectar', e deve estar tudo pronto! Se encontrar problemas, tente clicar no botão de 'Ajuda' do assistente de 'Configurações da Rede Tor' para mais suporte." +msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar as suas novas pontes, copie e cole as pontes de conexão na caixa de entrada de texto. Em seguida, clique em 'Conectar' e tudo deverá estar pronto! Caso haja problemas, clique no botão 'Ajuda' do assistente de 'Configurações da Rede Tor' para mais suporte." #: bridgedb/strings.py:167 msgid "Displays this message."

1 0

[webwml/master] Add Kushal to the people page
by atagar＠torproject.org 16 Jul '18

16 Jul '18

commit 1a6297bd9f698366679deaaa8b4ee4ff3ce1a0b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 16 14:46:10 2018 -0700 Add Kushal to the people page --- about/en/corepeople.wml | 97 ++++++++++++++++++++++++------------------ images/people/kushal.png | Bin 0 -> 30343 bytes images/people/orig/kushal.jpg | Bin 0 -> 20760 bytes 3 files changed, 55 insertions(+), 42 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 67c8d359..88d57876 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -466,14 +466,25 @@ </td> <td> + <a id="kushal"></a> + <div class="photo"><img src="$(IMGROOT)/people/kushal.png" alt="kushal" /></div> + <div class="icon"><a href="https://twitter.com/kushaldas"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> + <div class="icon"><a href="https://keybase.io/kushaldas/pgp_keys.asc"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> + <div class="name"><a href="#kushal">Kushal Das</a></div> + <div class="field"><b>IRC:</b> kushal</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> + <div class="description"><a href="https://securedrop.org">SecureDrop</a> developer at the <a href="https://freedom.press">Freedom of Press Foundation</a>. Member of the community team, privacy advocate focusing on new users.</div> + </td> + </tr> + + <tr> + <td> <a id="leif"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#leif">Leif Ryge</a></div> <div class="description">Works on security analysis, designer of "bananaphone" transport.</div> </td> - </tr> - <tr> <td> <a id="ln5"></a> <div class="photo"><img src="$(IMGROOT)/people/ln5.png" alt="ln5" /></div> @@ -482,7 +493,9 @@ <div class="field"><b>IRC:</b> ln5</div> <div class="description">Swedish advocate and Tor Board member. He works on implementing IPv6 in Tor, build automation, and runs a directory authority.</a></div> </td> + </tr> + <tr> <td> <a id="agrabeli"></a> <div class="photo"><img src="$(IMGROOT)/people/agrabeli.png" alt="agrabeli" /></div> @@ -493,9 +506,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div> </td> - </tr> - <tr> <td> <a id="mcs"></a> <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div> @@ -505,7 +516,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Developer on the Tor Browser team.</div> </td> + </tr> + <tr> <td> <a id="matt"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -513,9 +526,7 @@ <div class="name"><a href="#matt">Matt Blaze</a></div> <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div> </td> - </tr> - <tr> <td> <a id="pastly"></a> <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div> @@ -524,7 +535,9 @@ <div class="field"><b>IRC:</b> pastly</div> <div class="description">Matt <a href="http://mattttttssi4lhud.onion/">implemented</a> the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. He helps safely measure Tor and says helpful things on IRC.</div> </td> + </tr> + <tr> <td> <a id="sysrqb"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -534,9 +547,7 @@ <div class="field"><b>IRC:</b> sysrqb</div> <div class="description">Worked on tor, torsocks, and many other projects. Helped maintain and develop BridgeDB.</div> </td> - </tr> - <tr> <td> <a id="meejah"></a> <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div> @@ -546,7 +557,9 @@ <div class="field"><b>IRC:</b> meejah</div> <div class="description"><a href="https://meejah.ca">Author</a> of <a href="https://github.com/meejah/txtorcon">txtorcon</a>, <a href="https://github.com/meejah/carml">carml</a> and other Tor Python tools including some for bad-relay hunting.</div> </td> + </tr> + <tr> <td> <a id="micahflee"></a> <div class="photo"><img src="$(IMGROOT)/people/micahflee.png" alt="micahflee" /></div> @@ -555,9 +568,7 @@ <div class="name"><a href="#micahflee">Micah Lee</a></div> <div class="description">Developer of <a href="https://github.com/micahflee/onionshare">OnionShare</a> and <a href="https://github.com/micahflee/torbrowser-launcher">Tor Browser Launcher</a> journalist and security engineer at <a href="https://theintercept.com/staff/micah-lee/">The Intercept</a> and advocate for <a href="https://freedom.press/">freedom of the press</a>.</div> </td> - </tr> - <tr> <td> <a id="mtigas"></a> <div class="photo"><img src="$(IMGROOT)/people/mtigas.png" alt="mtigas" /></div> @@ -567,7 +578,9 @@ <div class="field"><b>IRC:</b> mtigas</div> <div class="description">Works on <a href="https://mike.tig.as/onionbrowser/">Onion Browser</a>, iOS, and hacker-journalist at <a href="https://www.propublica.org/">ProPublica</a> running their <a href="https://www.propub3r6espa33w.onion/">onion service</a>.</div> </td> + </tr> + <tr> <td> <a id="moritz"></a> <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div> @@ -576,9 +589,7 @@ <div class="name"><a href="#moritz">Moritz Bartl</a></div> <div class="description">Co-founder of <a href="https://www.torservers.net/">torservers.net</a>, a network of non-profit organizations that run Tor exit relays.</div> </td> - </tr> - <tr> <td> <a id="n8fr8"></a> <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div> @@ -587,7 +598,9 @@ <div class="field"><b>IRC:</b> n8fr8</div> <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div> </td> + </tr> + <tr> <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> @@ -596,9 +609,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> - </tr> - <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -609,7 +620,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> + </tr> + <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -619,9 +632,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -631,7 +642,9 @@ <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> + </tr> + <tr> <td> <a id="pari"></a> <div class="photo"><img src="$(IMGROOT)/people/pari.png" alt="pari" /></div> @@ -641,9 +654,7 @@ <div class="field"><b>IRC:</b> pari</div> <div class="description">Works with UX and Community teams, and on Tor India initiatives. Started as an Outreachy intern.</div> </td> - </tr> - <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -651,7 +662,9 @@ <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> + </tr> + <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -660,16 +673,16 @@ <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> - </tr> - <tr> <td> <a id="peter"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#peter">Peter Palfrader</a></div> <div class="description">Manages the Debian packages, runs one of the directory authorities, and generally helps out a lot.</div> </td> + </tr> + <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -679,9 +692,7 @@ <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> - </tr> - <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -689,7 +700,9 @@ <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> + </tr> + <tr> <td> <a id="ramy"></a> <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div> @@ -698,9 +711,7 @@ <div class="name"><a href="#ramy">Ramy Raoof</a></div> <div class="description">Tor Board member, technologist, and privacy and security researcher.</div> </td> - </tr> - <tr> <td> <a id="pospeselr"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -710,7 +721,9 @@ <div class="field"><b>IRC:</b> pospeselr</div> <div class="description">Tor Browser developer.</div> </td> + </tr> + <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -720,9 +733,7 @@ <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> - </tr> - <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -732,7 +743,9 @@ <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> + </tr> + <tr> <td> <a id="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> @@ -741,9 +754,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> - </tr> - <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -751,7 +762,9 @@ <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> + </tr> + <tr> <td> <a id="sisbell"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -761,9 +774,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser for Android.</div> </td> - </tr> - <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -774,7 +785,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> + </tr> + <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -784,9 +797,7 @@ <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> - </tr> - <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -796,7 +807,9 @@ <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> + </tr> + <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -807,9 +820,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Directs communications.</div> </td> - </tr> - <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -819,7 +830,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href=""http://murdoch.is/"">Principal Research Fellow</a> at University College London. He is the original creator of the <a href=""https://www.torproject.org/projects/torbrowser.html.en"">Tor Browser</a>.</div> </td> + </tr> + <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -828,9 +841,7 @@ <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Member of the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> - </tr> - <tr> <td> <a id="haxxpop"></a> <div class="photo"><img src="$(IMGROOT)/people/haxxpop.png" alt="haxxpop" /></div> @@ -840,7 +851,9 @@ <div class="field"><b>IRC:</b> haxxpop</div> <div class="description">Contributes to core Tor and especially onion services.</div> </td> + </tr> + <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -851,9 +864,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> - </tr> - <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -863,7 +874,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics.</div> </td> + </tr> + <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -874,9 +887,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -886,7 +897,9 @@ <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> + </tr> + <tr> <td> <a id="egypcio"></a> <div class="photo"><img src="$(IMGROOT)/people/egypcio.png" alt="egypcio" /></div> @@ -896,9 +909,7 @@ <div class="field"><b>IRC:</b> egypcio</div> <div class="description">TorBSD Diversity Project (TDP); IPv6 Enthusiast, BSD Systems Evangelist, and Bridges/Relays Operator.</div> </td> - </tr> - <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -909,7 +920,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> + </tr> + <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/kushal.png b/images/people/kushal.png new file mode 100644 index 00000000..271856d3 Binary files /dev/null and b/images/people/kushal.png differ diff --git a/images/people/orig/kushal.jpg b/images/people/orig/kushal.jpg new file mode 100644 index 00000000..ea1e0fc7 Binary files /dev/null and b/images/people/orig/kushal.jpg differ

1 0

[stem/master] Descriptor _mappings_for() helper
by atagar＠torproject.org 16 Jul '18

16 Jul '18

commit 64a77db052c1157c9c13c1f764c8e04e8711ba08 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 10 17:38:48 2018 -0700 Descriptor _mappings_for() helper We parse quite a number of 'key=value' descriptor fields. Clear spot where we can deduplicate things a bit. --- stem/descriptor/__init__.py | 47 ++++++++--- stem/descriptor/extrainfo_descriptor.py | 124 ++++++++++-------------------- stem/descriptor/networkstatus.py | 101 +++++++++--------------- test/unit/descriptor/server_descriptor.py | 2 +- 4 files changed, 117 insertions(+), 157 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 6a54ef29..05255648 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -512,21 +512,17 @@ def _parse_protocol_line(keyword, attribute): value = _value(keyword, entries) protocols = 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) + for k, v in _mappings_for(keyword, value): versions = [] if not v: continue - for subentry in v.split(','): - if '-' in subentry: - min_value, max_value = subentry.split('-', 1) + for entry in v.split(','): + if '-' in entry: + min_value, max_value = entry.split('-', 1) else: - min_value = max_value = subentry + min_value = max_value = entry 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)) @@ -555,6 +551,39 @@ def _parse_key_block(keyword, attribute, expected_block_type, value_attribute = return _parse +def _mappings_for(keyword, value, require_value = False, divider = ' '): + """ + Parses an attribute as a series of 'key=value' mappings. Unlike _parse_* + functions this is a helper, returning the attribute value rather than setting + a descriptor field. This way parsers can perform additional validations. + + :param str keyword: descriptor field being parsed + :param str value: 'attribute => values' mappings to parse + :param str divider: separator between the key/value mappings + :param bool require_value: validates that values are not empty + + :returns: **generator** with the key/value of the map attribute + + :raises: **ValueError** if descriptor content is invalid + """ + + if value is None: + return # no descripoter value to process + elif value == '': + return # descriptor field was present, but blank + + for entry in value.split(divider): + if '=' not in entry: + raise ValueError("'%s' should be a series of 'key=value' pairs but was: %s" % (keyword, value)) + + k, v = entry.split('=', 1) + + if require_value and not v: + raise ValueError("'%s' line's %s mapping had a blank value: %s" % (keyword, k, value)) + + yield k, v + + def _copy(default): if default is None or isinstance(default, (bool, stem.exit_policy.ExitPolicy)): return default # immutable diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index a43b637a..1813a06e 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -88,6 +88,7 @@ from stem.descriptor import ( _parse_timestamp_line, _parse_forty_character_hex, _parse_key_block, + _mappings_for, _append_router_signature, _random_nickname, _random_fingerprint, @@ -321,22 +322,14 @@ def _parse_padding_counts_line(descriptor, entries): value = _value('padding-counts', entries) timestamp, interval, remainder = _parse_timestamp_and_interval('padding-counts', value) - entries = {} + counts = {} - for entry in remainder.split(' '): - if '=' not in entry: - raise ValueError('Entries in padding-counts line should be key=value mappings: padding-counts %s' % value) - - k, v = entry.split('=', 1) - - if not v: - raise ValueError('Entry in padding-counts line had a blank value: padding-counts %s' % value) - - entries[k] = int(v) if v.isdigit() else v + for k, v in _mappings_for('padding-counts', remainder, require_value = True): + counts[k] = int(v) if v.isdigit() else v setattr(descriptor, 'padding_counts_end', timestamp) setattr(descriptor, 'padding_counts_interval', interval) - setattr(descriptor, 'padding_counts', entries) + setattr(descriptor, 'padding_counts', counts) def _parse_dirreq_line(keyword, recognized_counts_attr, unrecognized_counts_attr, descriptor, entries): @@ -349,22 +342,15 @@ def _parse_dirreq_line(keyword, recognized_counts_attr, unrecognized_counts_attr key_set = DirResponse if is_response_stats else DirStat key_type = 'STATUS' if is_response_stats else 'STAT' - error_msg = '%s lines should contain %s=COUNT mappings: %s %s' % (keyword, key_type, keyword, value) - if value: - for entry in value.split(','): - if '=' not in entry: - raise ValueError(error_msg) - - status, count = entry.split('=', 1) + for status, count in _mappings_for(keyword, value, divider = ','): + if not count.isdigit(): + raise ValueError('%s lines should contain %s=COUNT mappings: %s %s' % (keyword, key_type, keyword, value)) - if count.isdigit(): - if status in key_set: - recognized_counts[status] = int(count) - else: - unrecognized_counts[status] = int(count) - else: - raise ValueError(error_msg) + if status in key_set: + recognized_counts[status] = int(count) + else: + unrecognized_counts[status] = int(count) setattr(descriptor, recognized_counts_attr, recognized_counts) setattr(descriptor, unrecognized_counts_attr, unrecognized_counts) @@ -453,22 +439,13 @@ def _parse_port_count_line(keyword, attribute, descriptor, entries): # "<keyword>" port=N,port=N,... value, port_mappings = _value(keyword, entries), {} - error_msg = 'Entries in %s line should only be PORT=N entries: %s %s' % (keyword, keyword, value) - - if value: - for entry in value.split(','): - if '=' not in entry: - raise ValueError(error_msg) - port, stat = entry.split('=', 1) + for port, stat in _mappings_for(keyword, value, divider = ','): + if (port != 'other' and not stem.util.connection.is_valid_port(port)) or not stat.isdigit(): + raise ValueError('Entries in %s line should only be PORT=N entries: %s %s' % (keyword, keyword, value)) - if (port == 'other' or stem.util.connection.is_valid_port(port)) and stat.isdigit(): - if port != 'other': - port = int(port) - - port_mappings[port] = int(stat) - else: - raise ValueError(error_msg) + port = int(port) if port.isdigit() else port + port_mappings[port] = int(stat) setattr(descriptor, attribute, port_mappings) @@ -483,19 +460,12 @@ def _parse_geoip_to_count_line(keyword, attribute, descriptor, entries): # ??,"Unknown" value, locale_usage = _value(keyword, entries), {} - error_msg = 'Entries in %s line should only be CC=N entries: %s %s' % (keyword, keyword, value) - - if value: - for entry in value.split(','): - if '=' not in entry: - raise ValueError(error_msg) - locale, count = entry.split('=', 1) + for locale, count in _mappings_for(keyword, value, divider = ','): + if not _locale_re.match(locale) or not count.isdigit(): + raise ValueError('Entries in %s line should only be CC=N entries: %s %s' % (keyword, keyword, value)) - if _locale_re.match(locale) and count.isdigit(): - locale_usage[locale] = int(count) - else: - raise ValueError(error_msg) + locale_usage[locale] = int(count) setattr(descriptor, attribute, locale_usage) @@ -503,17 +473,11 @@ def _parse_geoip_to_count_line(keyword, attribute, descriptor, entries): def _parse_bridge_ip_versions_line(descriptor, entries): value, ip_versions = _value('bridge-ip-versions', entries), {} - if value: - for entry in value.split(','): - if '=' not in entry: - raise stem.ProtocolError("The bridge-ip-versions should be a comma separated listing of '<protocol>=<count>' mappings: bridge-ip-versions %s" % value) - - protocol, count = entry.split('=', 1) - - if not count.isdigit(): - raise stem.ProtocolError('IP protocol count was non-numeric (%s): bridge-ip-versions %s' % (count, value)) + for protocol, count in _mappings_for('bridge-ip-versions', value, divider = ','): + if not count.isdigit(): + raise stem.ProtocolError('IP protocol count was non-numeric (%s): bridge-ip-versions %s' % (count, value)) - ip_versions[protocol] = int(count) + ip_versions[protocol] = int(count) descriptor.ip_versions = ip_versions @@ -521,17 +485,11 @@ def _parse_bridge_ip_versions_line(descriptor, entries): def _parse_bridge_ip_transports_line(descriptor, entries): value, ip_transports = _value('bridge-ip-transports', entries), {} - if value: - for entry in value.split(','): - if '=' not in entry: - raise stem.ProtocolError("The bridge-ip-transports should be a comma separated listing of '<protocol>=<count>' mappings: bridge-ip-transports %s" % value) - - protocol, count = entry.split('=', 1) - - if not count.isdigit(): - raise stem.ProtocolError('Transport count was non-numeric (%s): bridge-ip-transports %s' % (count, value)) + for protocol, count in _mappings_for('bridge-ip-transports', value, divider = ','): + if not count.isdigit(): + raise stem.ProtocolError('Transport count was non-numeric (%s): bridge-ip-transports %s' % (count, value)) - ip_transports[protocol] = int(count) + ip_transports[protocol] = int(count) descriptor.ip_transports = ip_transports @@ -541,22 +499,22 @@ def _parse_hs_stats(keyword, stat_attribute, extra_attribute, descriptor, entrie value, stat, extra = _value(keyword, entries), None, {} - if value is not None: - value_comp = value.split() - - if not value_comp: - raise ValueError("'%s' line was blank" % keyword) + if value is None: + pass # not in the descriptor + elif value == '': + raise ValueError("'%s' line was blank" % keyword) + else: + if ' ' in value: + stat_value, remainder = value.split(' ', 1) + else: + stat_value, remainder = value, None try: - stat = int(value_comp[0]) + stat = int(stat_value) except ValueError: - raise ValueError("'%s' stat was non-numeric (%s): %s %s" % (keyword, value_comp[0], keyword, value)) - - for entry in value_comp[1:]: - if '=' not in entry: - raise ValueError('Entries after the stat in %s lines should only be key=val entries: %s %s' % (keyword, keyword, value)) + raise ValueError("'%s' stat was non-numeric (%s): %s %s" % (keyword, stat_value, keyword, value)) - key, val = entry.split('=', 1) + for key, val in _mappings_for(keyword, remainder): extra[key] = val setattr(descriptor, stat_attribute, stat) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index eac556a6..f9245b43 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -76,6 +76,7 @@ from stem.descriptor import ( _parse_forty_character_hex, _parse_protocol_line, _parse_key_block, + _mappings_for, _random_nickname, _random_fingerprint, _random_ipv4_address, @@ -642,26 +643,20 @@ def _parse_header_flag_thresholds_line(descriptor, entries): value, thresholds = _value('flag-thresholds', entries).strip(), {} - if value: - for entry in value.split(' '): - if '=' not in entry: - raise ValueError("Network status document's 'flag-thresholds' line is expected to be space separated key=value mappings, got: flag-thresholds %s" % value) - - entry_key, entry_value = entry.split('=', 1) - - try: - if entry_value.endswith('%'): - # opting for string manipulation rather than just - # 'float(entry_value) / 100' because floating point arithmetic - # will lose precision - - thresholds[entry_key] = float('0.' + entry_value[:-1].replace('.', '', 1)) - elif '.' in entry_value: - thresholds[entry_key] = float(entry_value) - else: - thresholds[entry_key] = int(entry_value) - except ValueError: - raise ValueError("Network status document's 'flag-thresholds' line is expected to have float values, got: flag-thresholds %s" % value) + for key, val in _mappings_for('flag-thresholds', value): + try: + if val.endswith('%'): + # opting for string manipulation rather than just + # 'float(entry_value) / 100' because floating point arithmetic + # will lose precision + + thresholds[key] = float('0.' + val[:-1].replace('.', '', 1)) + elif '.' in val: + thresholds[key] = float(val) + else: + thresholds[key] = int(val) + except ValueError: + raise ValueError("Network status document's 'flag-thresholds' line is expected to have float values, got: flag-thresholds %s" % value) descriptor.flag_thresholds = thresholds @@ -716,7 +711,7 @@ def _parse_package_line(descriptor, entries): package_versions = [] for value, _, _ in entries['package']: - value_comp = value.split() + value_comp = value.split(' ', 3) if len(value_comp) < 3: raise ValueError("'package' must at least have a 'PackageName Version URL': %s" % value) @@ -724,12 +719,9 @@ def _parse_package_line(descriptor, entries): name, version, url = value_comp[:3] digests = {} - for digest_entry in value_comp[3:]: - if '=' not in digest_entry: - raise ValueError("'package' digest entries should be 'key=value' pairs: %s" % value) - - key, value = digest_entry.split('=', 1) - digests[key] = value + if len(value_comp) == 4: + for key, val in _mappings_for('package', value_comp[3]): + digests[key] = val package_versions.append(PackageVersion(name, version, url, digests)) @@ -793,18 +785,8 @@ def _parse_bandwidth_file_headers(descriptor, entries): value = _value('bandwidth-file-headers', entries) results = {} - for entry in value.split(' '): - if not entry: - continue - elif '=' not in entry: - raise ValueError("'bandwidth-file-headers' lines must be a series of 'key=value' pairs: %s" % value) - - k, v = entry.split('=', 1) - - if not v: - raise ValueError("'bandwidth-file-headers' mappings should all have values: %s" % value) - - results[k] = v + for key, val in _mappings_for('bandwidth-file-headers', value, require_value = True): + results[key] = val descriptor.bandwidth_file_headers = results @@ -1310,35 +1292,26 @@ def _parse_int_mappings(keyword, value, validate): # - keys are sorted in lexical order results, seen_keys = {}, [] - for entry in value.split(' '): - try: - if '=' not in entry: - raise ValueError("must only have 'key=value' entries") + error_template = "Unable to parse network status document's '%s' line (%%s): %s'" % (keyword, value) - entry_key, entry_value = entry.split('=', 1) + for key, val in _mappings_for(keyword, value): + if validate: + # parameters should be in ascending order by their key + for prior_key in seen_keys: + if prior_key > key: + raise ValueError(error_template % 'parameters must be sorted by their key') - try: - # the int() function accepts things like '+123', but we don't want to - if entry_value.startswith('+'): - raise ValueError() + try: + # the int() function accepts things like '+123', but we don't want to - entry_value = int(entry_value) - except ValueError: - raise ValueError("'%s' is a non-numeric value" % entry_value) - - if validate: - # parameters should be in ascending order by their key - for prior_key in seen_keys: - if prior_key > entry_key: - raise ValueError('parameters must be sorted by their key') - - results[entry_key] = entry_value - seen_keys.append(entry_key) - except ValueError as exc: - if not validate: - continue + if val.startswith('+'): + raise ValueError() + + results[key] = int(val) + except ValueError: + raise ValueError(error_template % ("'%s' is a non-numeric value" % val)) - raise ValueError("Unable to parse network status document's '%s' line (%s): %s'" % (keyword, exc, value)) + seen_keys.append(key) return results diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index ff1035c4..7a68613d 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -796,7 +796,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Checks a 'proto' line when it's not key=value pairs. """ - exc_msg = "Protocol entires are expected to be a series of 'key=value' pairs but was: proto Desc Link=1-4" + exc_msg = "'proto' should be a series of 'key=value' pairs but was: Desc Link=1-4" self.assertRaisesRegexp(ValueError, exc_msg, RelayDescriptor.create, {'proto': 'Desc Link=1-4'}) def test_parse_with_non_int_version(self):

1 0

[stem/master] Remove pip flag '--allow-all-external' from tox config
by atagar＠torproject.org 16 Jul '18

16 Jul '18

commit 8eed973786a81b103f03398d92af51aafb69807c Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Apr 16 01:26:59 2018 +0000 Remove pip flag '--allow-all-external' from tox config This flag, denoted as deprecated in pip 9, was causing pip 10 to error, preventing tox from being used for new virtualenvs. Fixes #26811 https://trac.torproject.org/projects/tor/ticket/26811 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0691e517..ac7af489 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ skipsdist = True [testenv] commands = - pip install --allow-all-external -e . + pip install -e . python run_tests.py {posargs:-a} rm -rf stem.egg-info deps =

1 0

[metrics-web/master] Update news.json to version 279 of doc/MetricsTimeline.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 7bf3f0c517922a9e51d4be375f0f4f93c6980291 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 21:07:46 2018 +0200 Update news.json to version 279 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 198197a..e8c5c30 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3092,6 +3092,9 @@ "short_description" : "Venezuela's largest ISP, CANTV, blocks direct access to Tor and the IP addresses of default bridges", "description" : "Venezuela's largest ISP, CANTV, blocks direct access to Tor and the IP addresses of default bridges. meek and non-default bridges are reported to work.", "links" : [ { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26807" + }, { "label" : "mailing list post", "target" : "https://lists.torproject.org/pipermail/tor-project/2018-June/001842.html" }, {

1 0

[tor/master] Lower log level of "Scheduler of type KIST has been enabled" to INFO
by dgoulet＠torproject.org 16 Jul '18

16 Jul '18

commit d20feddfcc022710a42066afbdeb7f4b8cb45f6d Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Jul 9 10:45:24 2018 -0400 Lower log level of "Scheduler of type KIST has been enabled" to INFO --- changes/ticket26703 | 3 +++ src/core/or/scheduler.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket26703 b/changes/ticket26703 new file mode 100644 index 000000000..764b98b82 --- /dev/null +++ b/changes/ticket26703 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Low log level of "Scheduler type KIST has been enabled" to INFO. + Ticket 26703 diff --git a/src/core/or/scheduler.c b/src/core/or/scheduler.c index e19059f0c..dd028fc78 100644 --- a/src/core/or/scheduler.c +++ b/src/core/or/scheduler.c @@ -351,8 +351,8 @@ set_scheduler(void) /* Finally we notice log if we switched schedulers. We use the type in case * two schedulers share a scheduler object. */ if (old_scheduler_type != the_scheduler->type) { - log_notice(LD_CONFIG, "Scheduler type %s has been enabled.", - get_scheduler_type_string(the_scheduler->type)); + log_info(LD_CONFIG, "Scheduler type %s has been enabled.", + get_scheduler_type_string(the_scheduler->type)); } }

1 0

[tor/master] Merge remote-tracking branch 'pastly/issue26703'
by dgoulet＠torproject.org 16 Jul '18

16 Jul '18

commit 5aaea38d889ae558ea0e9b01b4c5b58f3935b542 Merge: 8505522e5 d20feddfc Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 16 14:44:45 2018 -0400 Merge remote-tracking branch 'pastly/issue26703' changes/ticket26703 | 3 +++ src/core/or/scheduler.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[torspec/master] three tiny fixes to prop#293
by arma＠torproject.org 16 Jul '18

16 Jul '18

commit 6f0112693edd4cb2fb70eb3e36af4942b6381b6a Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 16 13:39:52 2018 -0400 three tiny fixes to prop#293 --- proposals/293-know-when-to-publish.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/proposals/293-know-when-to-publish.txt b/proposals/293-know-when-to-publish.txt index 4a46730..ebc94e3 100644 --- a/proposals/293-know-when-to-publish.txt +++ b/proposals/293-know-when-to-publish.txt @@ -23,10 +23,10 @@ Target: 0.3.5 2. Mechanism One: The StaleDesc flag - Authorities should begin voting aon a new StaleDesc flag. + Authorities should begin voting on a new StaleDesc flag. When authorities vote, if the most recent published_on date for - a descriptor has over DESC_IS_STALE_INTERVAL in the past, the + a descriptor is over DESC_IS_STALE_INTERVAL in the past, the authorities should vote to give the StaleDesc flag to that relay. If any relay sees that it has the StaleDesc flag, it should upload @@ -55,4 +55,3 @@ Target: 0.3.5 published time in consensus documents accurate -- we can start setting it to some time in the distant future, per proposal 275. -

1 0

[metrics-web/master] Update Onionoo page to protocol version 6.1.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 93ced2f6234e1140f7a6199981d4a4a032eea9a2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 15:21:53 2018 +0200 Update Onionoo page to protocol version 6.1. See: #18342, #6946, and #26665. --- src/main/resources/web/jsps/onionoo.jsp | 84 +++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 10 deletions(-) diff --git a/src/main/resources/web/jsps/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp index b58b6d9..8221026 100644 --- a/src/main/resources/web/jsps/onionoo.jsp +++ b/src/main/resources/web/jsps/onionoo.jsp @@ -307,6 +307,15 @@ Added "version_status" field to details documents on April 6, 2018. Included all exit addresses in "exit_addresses", regardless of whether they are used as onion-routing addresses or not on April 17, 2018. <a href="#versions_6_0" class="anchor">#</a></li> +<li><a id="versions_6_1"></a><strong>6.1</strong> +Added a new "os" parameter to filter relays and bridges by operating +system, extended the "as" and "country" parameters by a special +country code and AS number to return relays that were not found in the +GeoIP database, and deprecated the "host_name" field in details +documents in favor of the new "verified_host_names" and +"unverified_host_names" fields for more accurate DNS results on July +16, 2018. +<a href="#versions_6_1" class="anchor">#</a></li> </ul> @@ -480,24 +489,30 @@ whether they have been running in the past week. <li> <a id="parameters_country"></a> -<b>country</b> +<b>country <span class="label label-primary">updated</span></b> <a href="#parameters_country" class="anchor">#</a> <p> -Return only relays which are located in the -given country as identified by a two-letter country code. -Filtering by country code is case-insensitive. +Return only relays which are located in the given country as identified by a +two-letter country code. Filtering by country code is case-insensitive. The +special country code <tt>xz</tt> can be used for relays that were not found in +the GeoIP database. +<span class="blue">Updated to recognize special country code +<tt>xz</tt> on July +16, 2018.</span> </p> </li> <li> <a id="parameters_as"></a> -<b>as</b> +<b>as <span class="label label-primary">updated</span></b> <a href="#parameters_as" class="anchor">#</a> <p> -Return only relays which are located in the -given autonomous system (AS) as identified by the AS number (with or -without preceding "AS" part). -Filtering by AS number is case-insensitive. +Return only relays which are located in the given autonomous system (AS) as +identified by the AS number (with or without preceding "AS" part). Filtering +by AS number is case-insensitive. The special AS number <tt>0</tt> can be used +for relays that were not found in the GeoIP database. +<span class="blue">Updated to recognize special AS number <tt>0</tt> +on July 16, 2018.</span> </p> </li> @@ -591,6 +606,17 @@ Searches are case-insensitive. </li> <li> +<a id="parameters_os"></a> +<b>os <span class="label label-primary">new</span></b> +<a href="#parameters_os" class="anchor">#</a> +<p> +Return only relays or bridges running on an operating system that starts with +the parameter value. Searches are case-insensitive. +<span class="blue">Added on July 16, 2018.</span> +</p> +</li> + +<li> <a id="parameters_host_name"></a> <b>host_name</b> <a href="#parameters_host_name" class="anchor">#</a> @@ -1289,7 +1315,7 @@ change in the future. <li> <a id="details_relay_host_name"></a> -<b>host_name</b> +<b>host_name</b> <span class="label label-warning">deprecated</span> <code class="typeof">string</code> <span class="required-false">optional</span> <a href="#details_relay_host_name" class="anchor">#</a> @@ -1300,6 +1326,44 @@ This field is updated at most once in 12 hours, unless the relay IP address changes. Omitted if the relay IP address was not looked up, if no lookup request was successful yet, or if no A record was found matching the PTR record. +<span class="red">Deprecated on July 16, 2018.</span> +</p> +</li> + +<li> +<a id="details_relay_verified_host_names"></a> +<b>verified_host_names</b> <span class="label label-primary">new</span></b> +<code class="typeof">array of strings</code> +<span class="required-false">optional</span> +<a href="#details_relay_verified_host_names" class="anchor">#</a> +<p> +Host names as found in a reverse DNS lookup of the +relay's primary IP address for which a matching +A record was also found. +This field is updated at most once in 12 hours, unless the relay IP +address changes. +Omitted if the relay IP address was not looked up, if no lookup request +was successful yet, or if no A records were found matching the PTR records +(i.e. it was not possible to verify the value of any of the PTR records). +<span class="blue">Added on July 16, 2018.</span> +</p> +</li> + +<li> +<a id="details_relay_unverified_host_names"></a> +<b>unverified_host_names</b> <span class="label label-primary">new</span></b> +<code class="typeof">array of strings</code> +<span class="required-false">optional</span> +<a href="#details_relay_unverified_host_names" class="anchor">#</a> +<p> +Host names as found in a reverse DNS lookup of the +relay's primary IP address that for which a matching A record was not found. +This field is updated at most once in 12 hours, unless the relay IP +address changes. +Omitted if the relay IP address was not looked up, if no lookup request +was successful yet, or if A records were found matching all PTR records +(i.e. it was possible to verify the value of each of the PTR records). +<span class="blue">Added on July 16, 2018.</span> </p> </li>

1 0

[onionoo/master] Bump version to 6.1-1.15.0-dev.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 335a9ea2ec1449a1f9caa2c07ddab8cbe1a5a53a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 16:15:59 2018 +0200 Bump version to 6.1-1.15.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 1f3fa1d..1bc5734 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="6.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.15.0"/> + value="${onionoo.protocol.version}-1.15.0-dev"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Bump version to 6.0-1.14.0-dev.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 13d53601b1ab2a769f888f00548ab6b692aa9d10 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 30 15:58:13 2018 +0200 Bump version to 6.0-1.14.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 596fb84..e1fb1ab 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="6.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.14.0"/> + value="${onionoo.protocol.version}-1.14.0-dev"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Removes unnecessary cast
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 5c8f0d533ff94b6a6098bf2acaf2dbd0560353bc Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Jul 4 16:09:30 2018 +0100 Removes unnecessary cast --- .../java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index b34d2ef..da55475 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -628,7 +628,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, boolean isExit = nodeStatus.getRelayFlags().contains("Exit") && !nodeStatus.getRelayFlags().contains("BadExit"); boolean isGuard = nodeStatus.getRelayFlags().contains("Guard"); - double consensusWeight = (double) nodeStatus.getConsensusWeight(); + double consensusWeight = nodeStatus.getConsensusWeight(); consensusWeights.put(fingerprint, consensusWeight); totalConsensusWeight += consensusWeight; if (consensusContainsBandwidthWeights) {

1 0

[onionoo/release] Adds a DomainNameSystem utility class
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 5ba56c857b5bb519af3dca3afc06a06cce45a23c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Jul 4 16:37:57 2018 +0100 Adds a DomainNameSystem utility class This class uses JNDI to look up resource record values from the Domain Name System using the system configured resolver. See: #18342 --- .../torproject/onionoo/util/DomainNameSystem.java | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/src/main/java/org/torproject/onionoo/util/DomainNameSystem.java b/src/main/java/org/torproject/onionoo/util/DomainNameSystem.java new file mode 100644 index 0000000..b085963 --- /dev/null +++ b/src/main/java/org/torproject/onionoo/util/DomainNameSystem.java @@ -0,0 +1,66 @@ +/* Copyright 2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.onionoo.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Hashtable; +import java.util.Set; +import java.util.TreeSet; + +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; + +public class DomainNameSystem { + + private DirContext dnsContext; + private Logger log; + + /** Creates a new instance. */ + public DomainNameSystem() { + log = LoggerFactory.getLogger(DomainNameSystem.class); + Hashtable<String, String> envProps = new Hashtable<>(); + envProps.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.dns.DnsContextFactory"); + try { + dnsContext = new InitialDirContext(envProps); + } catch (NamingException e) { + log.error( + "Unable to create directory context. " + + "Host name lookup will be disabled!"); + } + } + + /** + * Returns all the values of DNS resource records found for a given host name + * and type. + */ + public String[] getRecords(String hostName, String type) + throws NamingException { + if (dnsContext == null) { + /* Initial setup failed, so all lookups will fail. */ + throw new NamingException(); + } + Set<String> results = new TreeSet<String>(); + Attributes dnsEntries = + dnsContext.getAttributes(hostName, new String[] { type }); + if (dnsEntries != null) { + Attribute dnsAttribute = dnsEntries.get(type); + if (dnsAttribute != null) { + NamingEnumeration<?> dnsEntryIterator = dnsEntries.get(type).getAll(); + while (dnsEntryIterator.hasMoreElements()) { + results.add(dnsEntryIterator.next().toString()); + } + } + } + return results.toArray(new String[results.size()]); + } + +}

1 0

[onionoo/release] Provides more accurate DNS results
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 48e5ff84d067254339d2e303547a48cc7ef00183 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Jul 4 16:43:23 2018 +0100 Provides more accurate DNS results This commit adds two new fields: {un,}verified_host_names. Whereas previously InetAddress was used to resolve reverse domain names, this instead changes the lookup mechanism to use JNDI allowing for a deeper view into the DNS. It also accounts for the fact that multiple PTR records are not forbidden in the DNS specification and are often used in shared hosting scenarios. A host name is considered verified if it has a matching forward record. If a PTR value is found to have multiple A records, it will be considered verified if any one of the A records matches the original address. If no matching record is found, it will be reported as an unverified host name. Previously, unverified host names were discarded internally by the InetAddress lookup mechanism and so this data could not be used. To maintain "bug compatibility" with the previous implementation of the "host_name" field, which will now be deprecated, the IP address is returned when a lookup fails. The host_name field continues to be used, but now will consider all verified and unverified host names. If finer grained filtering is needed, then a seperate ticket could be filed for that, but it is unclear that it is useful enough to justify the work. Fixes: #18342 --- CHANGELOG.md | 7 +++ .../torproject/onionoo/docs/DetailsDocument.java | 68 ++++++++++++++++++++ .../org/torproject/onionoo/docs/DetailsStatus.java | 69 +++++++++++++++++++++ .../org/torproject/onionoo/docs/DocumentStore.java | 3 + .../org/torproject/onionoo/docs/NodeStatus.java | 21 +++++++ .../torproject/onionoo/docs/SummaryDocument.java | 25 ++++++++ .../org/torproject/onionoo/server/NodeIndexer.java | 14 ++++- .../torproject/onionoo/server/ResponseBuilder.java | 4 ++ .../onionoo/updater/NodeDetailsStatusUpdater.java | 39 +++++++++++- .../onionoo/updater/RdnsLookupRequest.java | 72 +++++++++++++++++++--- .../onionoo/updater/RdnsLookupWorker.java | 20 +++++- .../onionoo/updater/ReverseDomainNameResolver.java | 35 ++++++++++- .../onionoo/writer/DetailsDocumentWriter.java | 4 ++ .../onionoo/writer/SummaryDocumentWriter.java | 5 +- .../onionoo/docs/SummaryDocumentTest.java | 2 +- .../onionoo/server/ResourceServletTest.java | 19 +++--- .../server/SummaryDocumentComparatorTest.java | 2 +- 17 files changed, 384 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bc8985..c9c9aba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 6.?-1.??.0 - 2018-??-?? + + * Medium changes + - Provide more accurate DNS results in "verified_host_names" and + "unverified_host_names". + + # Changes in version 6.0-1.14.0 - 2018-05-29 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index e112efe..7dcf38e 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -242,6 +242,74 @@ public class DetailsDocument extends Document { return unescapeJson(this.host_name); } + private List<String> verified_host_names; + + /** + * Creates a copy of the list with each string escaped for JSON compatibility + * and sets this as the verified host names, unless the argument was null in + * which case the verified host names are just set to null. + */ + public void setVerifiedHostNames(List<String> verifiedHostNames) { + if (null == verifiedHostNames) { + this.verified_host_names = null; + return; + } + this.verified_host_names = new ArrayList<>(); + for (String hostName : verifiedHostNames) { + this.verified_host_names.add(escapeJson(hostName)); + } + } + + /** + * Creates a copy of the list with each string having its escaping for JSON + * compatibility reversed and returns the copy, unless the held reference was + * null in which case null is returned. + */ + public List<String> getVerifiedHostNames() { + if (null == this.verified_host_names) { + return null; + } + List<String> verifiedHostNames = new ArrayList<>(); + for (String escapedHostName : this.verified_host_names) { + verifiedHostNames.add(unescapeJson(escapedHostName)); + } + return verifiedHostNames; + } + + private List<String> unverified_host_names; + + /** + * Creates a copy of the list with each string escaped for JSON compatibility + * and sets this as the unverified host names, unless the argument was null in + * which case the unverified host names are just set to null. + */ + public void setUnverifiedHostNames(List<String> unverifiedHostNames) { + if (null == unverifiedHostNames) { + this.unverified_host_names = null; + return; + } + this.unverified_host_names = new ArrayList<>(); + for (String hostName : unverifiedHostNames) { + this.unverified_host_names.add(escapeJson(hostName)); + } + } + + /** + * Creates a copy of the list with each string having its escaping for JSON + * compatibility reversed and returns the copy, unless the held reference was + * null in which case null is returned. + */ + public List<String> getUnverifiedHostNames() { + if (null == this.unverified_host_names) { + return null; + } + List<String> unverifiedHostNames = new ArrayList<>(); + for (String escapedHostName : this.unverified_host_names) { + unverifiedHostNames.add(unescapeJson(escapedHostName)); + } + return unverifiedHostNames; + } + private String last_restarted; public void setLastRestarted(Long lastRestarted) { diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 7ee0bb6..19a7380 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -5,6 +5,7 @@ package org.torproject.onionoo.docs; import org.apache.commons.lang3.StringEscapeUtils; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.SortedSet; @@ -531,6 +532,74 @@ public class DetailsStatus extends Document { return unescapeJson(this.host_name); } + private List<String> verified_host_names; + + /** + * Creates a copy of the list with each string escaped for JSON compatibility + * and sets this as the verified host names, unless the argument was null in + * which case the verified host names are just set to null. + */ + public void setVerifiedHostNames(List<String> verifiedHostNames) { + if (null == verifiedHostNames) { + this.verified_host_names = null; + return; + } + this.verified_host_names = new ArrayList<>(); + for (String hostName : verifiedHostNames) { + this.verified_host_names.add(escapeJson(hostName)); + } + } + + /** + * Creates a copy of the list with each string having its escaping for JSON + * compatibility reversed and returns the copy, unless the held reference was + * null in which case null is returned. + */ + public List<String> getVerifiedHostNames() { + if (null == this.verified_host_names) { + return null; + } + List<String> verifiedHostNames = new ArrayList<>(); + for (String escapedHostName : this.verified_host_names) { + verifiedHostNames.add(unescapeJson(escapedHostName)); + } + return verifiedHostNames; + } + + private List<String> unverified_host_names; + + /** + * Creates a copy of the list with each string escaped for JSON compatibility + * and sets this as the unverified host names, unless the argument was null in + * which case the unverified host names are just set to null. + */ + public void setUnverifiedHostNames(List<String> unverifiedHostNames) { + if (null == unverifiedHostNames) { + this.unverified_host_names = null; + return; + } + this.unverified_host_names = new ArrayList<>(); + for (String hostName : unverifiedHostNames) { + this.unverified_host_names.add(escapeJson(hostName)); + } + } + + /** + * Creates a copy of the list with each string having its escaping for JSON + * compatibility reversed and returns the copy, unless the held reference was + * null in which case null is returned. + */ + public List<String> getUnverifiedHostNames() { + if (null == this.unverified_host_names) { + return null; + } + List<String> unverifiedHostNames = new ArrayList<>(); + for (String escapedHostName : this.unverified_host_names) { + unverifiedHostNames.add(unescapeJson(escapedHostName)); + } + return unverifiedHostNames; + } + private List<String> advertised_or_addresses; public void setAdvertisedOrAddresses(List<String> advertisedOrAddresses) { diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 3fac5c9..0d75bf9 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -452,11 +452,14 @@ public class DocumentStore { long consensusWeight = -1L; long firstSeenMillis = -1L; String hostName = null; + List<String> verifiedHostNames = null; + List<String> unverifiedHostNames = null; Boolean recommendedVersion = null; SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, asNumber, contact, family, family, version, hostName, + verifiedHostNames, unverifiedHostNames, recommendedVersion); return summaryDocument; } diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 1ea8b98..64332da 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; @@ -388,6 +389,26 @@ public class NodeStatus extends Document { return this.hostName; } + private List<String> verifiedHostNames; + + public void setVerifiedHostNames(List<String> verifiedHostNames) { + this.verifiedHostNames = verifiedHostNames; + } + + public List<String> getVerifiedHostNames() { + return this.verifiedHostNames; + } + + private List<String> unverifiedHostNames; + + public void setUnverifiedHostNames(List<String> unverifiedHostNames) { + this.unverifiedHostNames = unverifiedHostNames; + } + + public List<String> getUnverifiedHostNames() { + return this.unverifiedHostNames; + } + private long lastRdnsLookup = -1L; public void setLastRdnsLookup(long lastRdnsLookup) { diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java index 31cd84c..8b5a5e1 100644 --- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java @@ -309,6 +309,28 @@ public class SummaryDocument extends Document { return this.hostName; } + @JsonProperty("vh") + private List<String> verifiedHostNames; + + public void setVerifiedHostNames(List<String> verifiedHostNames) { + this.verifiedHostNames = verifiedHostNames; + } + + public List<String> getVerifiedHostNames() { + return this.verifiedHostNames; + } + + @JsonProperty("uh") + private List<String> unverifiedHostNames; + + public void setUnverifiedHostNames(List<String> unverifiedHostNames) { + this.unverifiedHostNames = unverifiedHostNames; + } + + public List<String> getUnverifiedHostNames() { + return this.unverifiedHostNames; + } + @JsonProperty("rv") private Boolean recommendedVersion; @@ -334,6 +356,7 @@ public class SummaryDocument extends Document { String countryCode, long firstSeenMillis, String asNumber, String contact, SortedSet<String> familyFingerprints, SortedSet<String> effectiveFamily, String version, String hostName, + List<String> verifiedHostNames, List<String> unverifiedHostNames, Boolean recommendedVersion) { this.setRelay(isRelay); this.setNickname(nickname); @@ -351,6 +374,8 @@ public class SummaryDocument extends Document { this.setEffectiveFamily(effectiveFamily); this.setVersion(version); this.setHostName(hostName); + this.setVerifiedHostNames(verifiedHostNames); + this.setUnverifiedHostNames(unverifiedHostNames); this.setRecommendedVersion(recommendedVersion); } } diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index e95eda9..c95818d 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -15,8 +15,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; @@ -266,8 +268,16 @@ public class NodeIndexer implements ServletContextListener, Runnable { newRelaysByVersion.get(version).add(fingerprint); newRelaysByVersion.get(version).add(hashedFingerprint); } - String hostName = entry.getHostName(); - if (null != hostName) { + List<String> allHostNames = new ArrayList<>(); + List<String> verifiedHostNames = entry.getVerifiedHostNames(); + if (null != verifiedHostNames) { + allHostNames.addAll(verifiedHostNames); + } + List<String> unverifiedHostNames = entry.getUnverifiedHostNames(); + if (null != unverifiedHostNames) { + allHostNames.addAll(unverifiedHostNames); + } + for (String hostName : allHostNames) { String hostNameLowerCase = hostName.toLowerCase(); if (!newRelaysByHostName.containsKey(hostNameLowerCase)) { newRelaysByHostName.put(hostNameLowerCase, new HashSet<>()); diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 1dcfeeb..dff9899 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -295,6 +295,10 @@ public class ResponseBuilder { dd.setConsensusWeight(detailsDocument.getConsensusWeight()); } else if (field.equals("host_name")) { dd.setHostName(detailsDocument.getHostName()); + } else if (field.equals("verified_host_names")) { + dd.setVerifiedHostNames(detailsDocument.getVerifiedHostNames()); + } else if (field.equals("unverified_host_names")) { + dd.setUnverifiedHostNames(detailsDocument.getUnverifiedHostNames()); } else if (field.equals("last_restarted")) { dd.setLastRestarted(detailsDocument.getLastRestarted()); } else if (field.equals("bandwidth_rate")) { diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index da55475..ad2cac7 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -757,6 +757,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, private long startedRdnsLookups = -1L; private SortedMap<String, String> rdnsLookupResults = new TreeMap<>(); + private SortedMap<String, List<String>> rdnsVerifiedLookupResults = + new TreeMap<>(); + private SortedMap<String, List<String>> rdnsUnverifiedLookupResults = + new TreeMap<>(); private void finishReverseDomainNameLookups() { this.reverseDomainNameResolver.finishReverseDomainNameLookups(); @@ -764,11 +768,28 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, this.reverseDomainNameResolver.getLookupStartMillis(); Map<String, String> lookupResults = this.reverseDomainNameResolver.getLookupResults(); + Map<String, List<String>> verifiedLookupResults = + this.reverseDomainNameResolver.getVerifiedLookupResults(); + Map<String, List<String>> unverifiedLookupResults = + this.reverseDomainNameResolver.getUnverifiedLookupResults(); for (String fingerprint : this.currentRelays) { NodeStatus nodeStatus = this.knownNodes.get(fingerprint); String hostName = lookupResults.get(nodeStatus.getAddress()); - if (hostName != null) { + List<String> verifiedHostNames = + verifiedLookupResults.get(nodeStatus.getAddress()); + List<String> unverifiedHostNames = + unverifiedLookupResults.get(nodeStatus.getAddress()); + if (null != hostName) { this.rdnsLookupResults.put(fingerprint, hostName); + } else { + /* Maintains bug compatibility with previous implementation */ + this.rdnsLookupResults.put(fingerprint, nodeStatus.getAddress()); + } + if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) { + this.rdnsVerifiedLookupResults.put(fingerprint, verifiedHostNames); + } + if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty()) { + this.rdnsUnverifiedLookupResults.put(fingerprint, unverifiedHostNames); } } } @@ -878,6 +899,22 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setLastRdnsLookup(this.startedRdnsLookups); } + if (this.rdnsVerifiedLookupResults.containsKey(fingerprint)) { + List<String> verifiedHostNames = + this.rdnsVerifiedLookupResults.get(fingerprint); + detailsStatus.setVerifiedHostNames(verifiedHostNames); + nodeStatus.setVerifiedHostNames(verifiedHostNames); + nodeStatus.setLastRdnsLookup(this.startedRdnsLookups); + } + + if (this.rdnsUnverifiedLookupResults.containsKey(fingerprint)) { + List<String> unverifiedHostNames = + this.rdnsUnverifiedLookupResults.get(fingerprint); + detailsStatus.setUnverifiedHostNames(unverifiedHostNames); + nodeStatus.setUnverifiedHostNames(unverifiedHostNames); + nodeStatus.setLastRdnsLookup(this.startedRdnsLookups); + } + if (detailsStatus.getLastSeenMillis() < nodeStatus.getLastSeenMillis()) { if (this.lastSeenMeasured.containsKey(fingerprint)) { diff --git a/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java b/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java index cb9169c..7f14350 100644 --- a/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java +++ b/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java @@ -3,18 +3,26 @@ package org.torproject.onionoo.updater; -import java.net.InetAddress; -import java.net.UnknownHostException; +import org.torproject.onionoo.util.DomainNameSystem; + +import java.util.ArrayList; +import java.util.List; + +import javax.naming.NamingException; class RdnsLookupRequest extends Thread { - private final ReverseDomainNameResolver reverseDomainNameResolver; + private ReverseDomainNameResolver reverseDomainNameResolver; + + private DomainNameSystem domainNameSystem; private RdnsLookupWorker parent; private String address; - private String hostName; + private List<String> verifiedHostNames; + + private List<String> unverifiedHostNames; private long lookupStartedMillis = -1L; @@ -24,6 +32,8 @@ class RdnsLookupRequest extends Thread { ReverseDomainNameResolver reverseDomainNameResolver, RdnsLookupWorker parent, String address) { this.reverseDomainNameResolver = reverseDomainNameResolver; + this.domainNameSystem = + this.reverseDomainNameResolver.getDomainNameSystemInstance(); this.parent = parent; this.address = address; } @@ -32,23 +42,65 @@ class RdnsLookupRequest extends Thread { public void run() { this.lookupStartedMillis = System.currentTimeMillis(); try { - String result = InetAddress.getByName(this.address).getHostName(); + final List<String> verifiedResults = new ArrayList<>(); + final List<String> unverifiedResults = new ArrayList<>(); + final String[] bytes = this.address.split("\\."); + if (bytes.length == 4) { + final String reverseDnsDomain = + bytes[3] + + "." + bytes[2] + "." + bytes[1] + "." + bytes[0] + + ".in-addr.arpa"; + String[] reverseDnsRecords = + this.domainNameSystem.getRecords(reverseDnsDomain, "PTR"); + for (String reverseDnsRecord : reverseDnsRecords) { + boolean verified = false; + String[] forwardDnsRecords = + this.domainNameSystem.getRecords(reverseDnsRecord, "A"); + for (String forwardDnsRecord : forwardDnsRecords) { + if (forwardDnsRecord.equals(this.address)) { + verified = true; + break; + } + } + if (verified) { + verifiedResults.add(reverseDnsRecord.substring(0, + reverseDnsRecord.length() - 1)); + } else { + unverifiedResults.add(reverseDnsRecord.substring(0, + reverseDnsRecord.length() - 1)); + } + } + } synchronized (this) { - this.hostName = result; + this.verifiedHostNames = verifiedResults; + this.unverifiedHostNames = unverifiedResults; } - } catch (UnknownHostException e) { - /* We'll try again the next time. */ + } catch (NamingException e) { + /* The Onionoo field is omitted for both lookup failure and absence of + * a host name. We'll try again the next time. */ } this.lookupCompletedMillis = System.currentTimeMillis(); this.parent.interrupt(); } public synchronized String getHostName() { - return hostName; + List<String> verifiedHostNames = this.verifiedHostNames; + if (null != verifiedHostNames && !verifiedHostNames.isEmpty() ) { + return verifiedHostNames.get(0); + } else { + return null; + } + } + + public synchronized List<String> getVerifiedHostNames() { + return this.verifiedHostNames; + } + + public synchronized List<String> getUnverifiedHostNames() { + return this.unverifiedHostNames; } public synchronized long getLookupMillis() { return this.lookupCompletedMillis - this.lookupStartedMillis; } } - diff --git a/src/main/java/org/torproject/onionoo/updater/RdnsLookupWorker.java b/src/main/java/org/torproject/onionoo/updater/RdnsLookupWorker.java index 4c188ed..c94c334 100644 --- a/src/main/java/org/torproject/onionoo/updater/RdnsLookupWorker.java +++ b/src/main/java/org/torproject/onionoo/updater/RdnsLookupWorker.java @@ -3,6 +3,8 @@ package org.torproject.onionoo.updater; +import java.util.List; + class RdnsLookupWorker extends Thread { private final ReverseDomainNameResolver reverseDomainNameResolver; @@ -38,12 +40,28 @@ class RdnsLookupWorker extends Thread { /* Getting interrupted should be the default case. */ } String hostName = request.getHostName(); - if (hostName != null) { + if (null != hostName) { synchronized (this.reverseDomainNameResolver.rdnsLookupResults) { this.reverseDomainNameResolver.rdnsLookupResults.put( rdnsLookupJob, hostName); } } + List<String> verifiedHostNames = request.getVerifiedHostNames(); + if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) { + synchronized (this.reverseDomainNameResolver + .rdnsVerifiedLookupResults) { + this.reverseDomainNameResolver.rdnsVerifiedLookupResults.put( + rdnsLookupJob, verifiedHostNames); + } + } + List<String> unverifiedHostNames = request.getUnverifiedHostNames(); + if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty()) { + synchronized (this.reverseDomainNameResolver + .rdnsUnverifiedLookupResults) { + this.reverseDomainNameResolver.rdnsUnverifiedLookupResults.put( + rdnsLookupJob, unverifiedHostNames); + } + } long lookupMillis = request.getLookupMillis(); if (lookupMillis >= 0L) { synchronized (this.reverseDomainNameResolver.rdnsLookupMillis) { diff --git a/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java b/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java index 3c82d14..698b637 100644 --- a/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java +++ b/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java @@ -3,6 +3,7 @@ package org.torproject.onionoo.updater; +import org.torproject.onionoo.util.DomainNameSystem; import org.torproject.onionoo.util.FormattingUtils; import java.util.ArrayList; @@ -24,12 +25,18 @@ public class ReverseDomainNameResolver { private static final int RDNS_LOOKUP_WORKERS_NUM = 5; + private DomainNameSystem domainNameSystem; + private Map<String, Long> addressLastLookupTimes; Set<String> rdnsLookupJobs; Map<String, String> rdnsLookupResults; + Map<String, List<String>> rdnsVerifiedLookupResults; + + Map<String, List<String>> rdnsUnverifiedLookupResults; + List<Long> rdnsLookupMillis; long startedRdnsLookups; @@ -43,6 +50,7 @@ public class ReverseDomainNameResolver { /** Starts reverse domain name lookups in one or more background * threads and returns immediately. */ public void startReverseDomainNameLookups() { + this.domainNameSystem = new DomainNameSystem(); this.startedRdnsLookups = System.currentTimeMillis(); this.rdnsLookupJobs = new HashSet<>(); for (Map.Entry<String, Long> e : @@ -53,6 +61,8 @@ public class ReverseDomainNameResolver { } } this.rdnsLookupResults = new HashMap<>(); + this.rdnsVerifiedLookupResults = new HashMap<>(); + this.rdnsUnverifiedLookupResults = new HashMap<>(); this.rdnsLookupMillis = new ArrayList<>(); this.rdnsLookupWorkers = new ArrayList<>(); for (int i = 0; i < RDNS_LOOKUP_WORKERS_NUM; i++) { @@ -83,19 +93,42 @@ public class ReverseDomainNameResolver { } } + /** Returns reverse domain name verified lookup results. */ + public Map<String, List<String>> getVerifiedLookupResults() { + synchronized (this.rdnsVerifiedLookupResults) { + return new HashMap<>(this.rdnsVerifiedLookupResults); + } + } + + /** Returns reverse domain name unverified lookup results. */ + public Map<String, List<String>> getUnverifiedLookupResults() { + synchronized (this.rdnsUnverifiedLookupResults) { + return new HashMap<>(this.rdnsUnverifiedLookupResults); + } + } + /** Returns the time in milliseconds since the epoch when reverse domain * lookups have been started. */ public long getLookupStartMillis() { return this.startedRdnsLookups; } + public DomainNameSystem getDomainNameSystemInstance() { + return this.domainNameSystem; + } + /** Returns a string with the number of performed reverse domain name * lookups and some simple statistics on lookup time. */ public String getStatsString() { StringBuilder sb = new StringBuilder(); sb.append(" " + FormattingUtils.formatDecimalNumber( rdnsLookupMillis.size()) + " lookups performed\n"); - if (rdnsLookupMillis.size() > 0) { + sb.append(" " + FormattingUtils.formatDecimalNumber( + rdnsVerifiedLookupResults.size()) + " verified results found\n"); + sb.append(" " + FormattingUtils.formatDecimalNumber( + rdnsUnverifiedLookupResults.size()) + + " unverified results found\n"); + if (!rdnsLookupMillis.isEmpty()) { Collections.sort(rdnsLookupMillis); sb.append(" " + FormattingUtils.formatMillis( rdnsLookupMillis.get(0)) + " minimum lookup time\n"); diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index a335916..bc5bf8c 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -76,6 +76,10 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setConsensusWeight( detailsStatus.getConsensusWeight()); detailsDocument.setHostName(detailsStatus.getHostName()); + detailsDocument.setVerifiedHostNames( + detailsStatus.getVerifiedHostNames()); + detailsDocument.setUnverifiedHostNames( + detailsStatus.getUnverifiedHostNames()); String defaultPolicy = detailsStatus.getDefaultPolicy(); String portList = detailsStatus.getPortList(); if (defaultPolicy != null && (defaultPolicy.equals("accept") diff --git a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java index 356feab..ed36d56 100644 --- a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java @@ -93,12 +93,15 @@ public class SummaryDocumentWriter implements DocumentWriter { String nickname = nodeStatus.getNickname(); String version = nodeStatus.getVersion(); String hostName = nodeStatus.getHostName(); + List<String> verifiedHostNames = nodeStatus.getVerifiedHostNames(); + List<String> unverifiedHostNames = nodeStatus.getUnverifiedHostNames(); Boolean recommendedVersion = nodeStatus.getRecommendedVersion(); SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, asNumber, contact, declaredFamily, effectiveFamily, version, - hostName, recommendedVersion); + hostName, verifiedHostNames, unverifiedHostNames, + recommendedVersion); if (this.documentStore.store(summaryDocument, fingerprint)) { this.writtenDocuments++; } diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java index a832ca0..459d514 100644 --- a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java +++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java @@ -27,7 +27,7 @@ public class SummaryDocumentTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, - null, true); + null, null, null, true); } @Test() diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index d64d59d..4e9a5f0 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; - import org.junit.Before; import org.junit.Test; @@ -154,7 +153,10 @@ public class ResourceServletTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), - "0.2.3.25", "ppp-62-216-201-221.dynamic.mnet-online.de", true); + "0.2.3.25", "ppp-62-216-201-221.dynamic.mnet-online.de", + Arrays.asList( + new String[] { "ppp-62-216-201-221.dynamic.mnet-online.de" }), + null, true); this.relays.put("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", relayTorkaZ); org.torproject.onionoo.docs.SummaryDocument relayFerrari458 = @@ -169,7 +171,10 @@ public class ResourceServletTest { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), new TreeSet<>(Arrays.asList(new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, - "c-68-38-171-200.hsd1.in.comcast.net", null); + "c-68-38-171-200.hsd1.in.comcast.net", + Arrays.asList( + new String[] {"c-68-38-171-200.hsd1.in.comcast.net"}), + null, null); this.relays.put("001C13B3A55A71B977CA65EC85539D79C653A3FC", relayFerrari458); org.torproject.onionoo.docs.SummaryDocument relayTimMayTribute = @@ -183,7 +188,7 @@ public class ResourceServletTest { "1024d/51e2a1c7 \"steven j. murdoch\" " + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>", new TreeSet<String>(), new TreeSet<String>(), "0.2.3.24-rc-dev", null, - false); + null, null, false); this.relays.put("0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", relayTimMayTribute); this.bridges = new TreeMap<>(); @@ -194,7 +199,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-21 18:07:03"), false, new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, null, DateTimeHelper.parse("2013-04-20 15:37:04"), null, null, - null, null, "0.2.2.39", null, true); + null, null, "0.2.2.39", null, null, null, true); this.bridges.put("0000831B236DFF73D409AD17B40E2A728A53994F", bridgeec2bridgercc7f31fe); org.torproject.onionoo.docs.SummaryDocument bridgeUnnamed = @@ -204,7 +209,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-20 17:37:04"), false, new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, null, DateTimeHelper.parse("2013-04-14 07:07:05"), null, null, - null, null, null, null, null); + null, null, null, null, null, null, null); this.bridges.put("0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", bridgeUnnamed); org.torproject.onionoo.docs.SummaryDocument bridgegummy = @@ -215,7 +220,7 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), -1L, null, DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, - null, "0.2.4.4-alpha-dev", null, false); + null, "0.2.4.4-alpha-dev", null, null, null, false); this.bridges.put("1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", bridgegummy); } diff --git a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java index e24e26f..569300d 100644 --- a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java @@ -41,7 +41,7 @@ public class SummaryDocumentComparatorTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, - null, null); + null, null, null, null); } /** Some values for running all comparison types. */

1 0

[onionoo/release] Index relays with no known country or AS
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 641a939cde75fa3a5cddd32ee29a6508fd66b4c4 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Jul 10 11:51:23 2018 +0100 Index relays with no known country or AS Indexes are created for relays with no known country code or autonomous system number using the special values "xz" and "AS0" respectively. No changes are made to the summary or details documents. Fixes: #26665 --- CHANGELOG.md | 4 ++ .../org/torproject/onionoo/server/NodeIndexer.java | 43 ++++++++++++++-------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9c9aba..ca0142b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Provide more accurate DNS results in "verified_host_names" and "unverified_host_names". + * Minor changes + - Index relays with no known country code or autonomous system + number using the special values "xz" and "AS0" respectively. + # Changes in version 6.0-1.14.0 - 2018-05-29 diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index c95818d..f6b84b8 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -198,23 +198,36 @@ public class NodeIndexer implements ServletContextListener, Runnable { .toUpperCase(); newRelayFingerprintSummaryLines.put(fingerprint, entry); newRelayFingerprintSummaryLines.put(hashedFingerprint, entry); - if (entry.getCountryCode() != null) { - String countryCode = entry.getCountryCode(); - if (!newRelaysByCountryCode.containsKey(countryCode)) { - newRelaysByCountryCode.put(countryCode, - new HashSet<String>()); - } - newRelaysByCountryCode.get(countryCode).add(fingerprint); - newRelaysByCountryCode.get(countryCode).add(hashedFingerprint); + String countryCode; + if (null != entry.getCountryCode()) { + countryCode = entry.getCountryCode(); + } else { + /* The country code xz will never be assigned for use with ISO 3166-1 + * and is "user-assigned". Fun fact: UN/LOCODE assigns XZ to represent + * installations in international waters. */ + countryCode = "xz"; } - if (entry.getAsNumber() != null) { - String asNumber = entry.getAsNumber(); - if (!newRelaysByAsNumber.containsKey(asNumber)) { - newRelaysByAsNumber.put(asNumber, new HashSet<String>()); - } - newRelaysByAsNumber.get(asNumber).add(fingerprint); - newRelaysByAsNumber.get(asNumber).add(hashedFingerprint); + if (!newRelaysByCountryCode.containsKey(countryCode)) { + newRelaysByCountryCode.put(countryCode, + new HashSet<String>()); + } + newRelaysByCountryCode.get(countryCode).add(fingerprint); + newRelaysByCountryCode.get(countryCode).add(hashedFingerprint); + String asNumber; + if (null != entry.getAsNumber()) { + asNumber = entry.getAsNumber(); + } else { + /* Autonomous system number 0 is reserved by RFC6707, to be used for + * networks that are not routed. The use of this number should be, + * and in the majority of cases probably is, filtered and so it + * shouldn't appear in any lookup databases. */ + asNumber = "AS0"; + } + if (!newRelaysByAsNumber.containsKey(asNumber)) { + newRelaysByAsNumber.put(asNumber, new HashSet<String>()); } + newRelaysByAsNumber.get(asNumber).add(fingerprint); + newRelaysByAsNumber.get(asNumber).add(hashedFingerprint); for (String flag : entry.getRelayFlags()) { String flagLowerCase = flag.toLowerCase(); if (!newRelaysByFlag.containsKey(flagLowerCase)) {

1 0

[onionoo/release] Allows filtering by operating system
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit e95b88f0c344546df2e23262e13e3714040c36ad Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Jul 11 13:08:25 2018 +0100 Allows filtering by operating system The filter is applicable to both bridges and relays. It uses basic string operations to extract the operating system from the platform line of descriptors. Fixes: #6946 --- CHANGELOG.md | 1 + .../org/torproject/onionoo/docs/DocumentStore.java | 5 ++- .../org/torproject/onionoo/docs/NodeStatus.java | 10 +++++ .../torproject/onionoo/docs/SummaryDocument.java | 18 ++++++-- .../org/torproject/onionoo/server/NodeIndex.java | 22 +++++++++ .../org/torproject/onionoo/server/NodeIndexer.java | 22 +++++++++ .../torproject/onionoo/server/RequestHandler.java | 30 +++++++++++++ .../torproject/onionoo/server/ResourceServlet.java | 21 ++++++++- .../onionoo/updater/NodeDetailsStatusUpdater.java | 6 +++ .../onionoo/writer/SummaryDocumentWriter.java | 5 ++- .../onionoo/docs/SummaryDocumentTest.java | 2 +- .../onionoo/server/ResourceServletTest.java | 52 +++++++++++++++++++--- .../server/SummaryDocumentComparatorTest.java | 2 +- 13 files changed, 179 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4cfb82..a9f21b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * Medium changes - Provide more accurate DNS results in "verified_host_names" and "unverified_host_names". + - Allow filtering by operating system using the new "os" parameter. * Minor changes - Index relays with no known country code or autonomous system diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 0d75bf9..e474684 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -448,6 +448,7 @@ public class DocumentStore { SortedSet<String> relayFlags = new TreeSet<>(); SortedSet<String> family = null; String version = null; + String operatingSystem = null; long lastSeenMillis = -1L; long consensusWeight = -1L; long firstSeenMillis = -1L; @@ -458,8 +459,8 @@ public class DocumentStore { SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, - asNumber, contact, family, family, version, hostName, - verifiedHostNames, unverifiedHostNames, + asNumber, contact, family, family, version, operatingSystem, + hostName, verifiedHostNames, unverifiedHostNames, recommendedVersion); return summaryDocument; } diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 64332da..46da822 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -343,6 +343,16 @@ public class NodeStatus extends Document { return this.versionStatus; } + private String operatingSystem; + + public void setOperatingSystem(String operatingSystem) { + this.operatingSystem = operatingSystem; + } + + public String getOperatingSystem() { + return this.operatingSystem; + } + /* From exit lists: */ private SortedSet<String> exitAddresses; diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java index 8b5a5e1..92ebe69 100644 --- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java @@ -298,6 +298,17 @@ public class SummaryDocument extends Document { return this.version; } + @JsonProperty("o") + private String operatingSystem; + + public void setOperatingSystem(String operatingSystem) { + this.operatingSystem = operatingSystem; + } + + public String getOperatingSystem() { + return this.operatingSystem; + } + @JsonProperty("h") private String hostName; @@ -355,9 +366,9 @@ public class SummaryDocument extends Document { boolean running, SortedSet<String> relayFlags, long consensusWeight, String countryCode, long firstSeenMillis, String asNumber, String contact, SortedSet<String> familyFingerprints, - SortedSet<String> effectiveFamily, String version, String hostName, - List<String> verifiedHostNames, List<String> unverifiedHostNames, - Boolean recommendedVersion) { + SortedSet<String> effectiveFamily, String version, String operatingSystem, + String hostName, List<String> verifiedHostNames, + List<String> unverifiedHostNames, Boolean recommendedVersion) { this.setRelay(isRelay); this.setNickname(nickname); this.setFingerprint(fingerprint); @@ -373,6 +384,7 @@ public class SummaryDocument extends Document { this.setFamilyFingerprints(familyFingerprints); this.setEffectiveFamily(effectiveFamily); this.setVersion(version); + this.setOperatingSystem(operatingSystem); this.setHostName(hostName); this.setVerifiedHostNames(verifiedHostNames); this.setUnverifiedHostNames(unverifiedHostNames); diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndex.java b/src/main/java/org/torproject/onionoo/server/NodeIndex.java index 77993a3..ed9ec44 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndex.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndex.java @@ -190,6 +190,28 @@ class NodeIndex { return this.bridgesByVersion; } + private Map<String, Set<String>> relaysByOperatingSystem; + + public void setRelaysByOperatingSystem( + Map<String, Set<String>> relaysByOperatingSystem) { + this.relaysByOperatingSystem = relaysByOperatingSystem; + } + + public Map<String, Set<String>> getRelaysByOperatingSystem() { + return this.relaysByOperatingSystem; + } + + private Map<String, Set<String>> bridgesByOperatingSystem; + + public void setBridgesByOperatingSystem( + Map<String, Set<String>> bridgesByOperatingSystem) { + this.bridgesByOperatingSystem = bridgesByOperatingSystem; + } + + public Map<String, Set<String>> getBridgesByOperatingSystem() { + return this.bridgesByOperatingSystem; + } + private Map<String, Set<String>> relaysByHostName; public void setRelaysByHostName(Map<String, Set<String>> relaysByHostName) { diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index f6b84b8..1f1d279 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -157,6 +157,8 @@ public class NodeIndexer implements ServletContextListener, Runnable { Map<String, Set<String>> newRelaysByFamily = new HashMap<>(); Map<String, Set<String>> newRelaysByVersion = new HashMap<>(); Map<String, Set<String>> newBridgesByVersion = new HashMap<>(); + Map<String, Set<String>> newRelaysByOperatingSystem = new HashMap<>(); + Map<String, Set<String>> newBridgesByOperatingSystem = new HashMap<>(); Map<String, Set<String>> newRelaysByHostName = new HashMap<>(); Map<Boolean, Set<String>> newRelaysByRecommendedVersion = new HashMap<>(); newRelaysByRecommendedVersion.put(true, new HashSet<>()); @@ -281,6 +283,14 @@ public class NodeIndexer implements ServletContextListener, Runnable { newRelaysByVersion.get(version).add(fingerprint); newRelaysByVersion.get(version).add(hashedFingerprint); } + String operatingSystem = entry.getOperatingSystem(); + if (null != operatingSystem) { + if (!newRelaysByOperatingSystem.containsKey(operatingSystem)) { + newRelaysByOperatingSystem.put(operatingSystem, new HashSet<>()); + } + newRelaysByOperatingSystem.get(operatingSystem).add(fingerprint); + newRelaysByOperatingSystem.get(operatingSystem).add(hashedFingerprint); + } List<String> allHostNames = new ArrayList<>(); List<String> verifiedHostNames = entry.getVerifiedHostNames(); if (null != verifiedHostNames) { @@ -367,6 +377,16 @@ public class NodeIndexer implements ServletContextListener, Runnable { newBridgesByVersion.get(version).add(hashedFingerprint); newBridgesByVersion.get(version).add(hashedHashedFingerprint); } + String operatingSystem = entry.getOperatingSystem(); + if (null != operatingSystem) { + if (!newBridgesByOperatingSystem.containsKey(operatingSystem)) { + newBridgesByOperatingSystem.put(operatingSystem, new HashSet<>()); + } + newBridgesByOperatingSystem.get(operatingSystem) + .add(hashedFingerprint); + newBridgesByOperatingSystem.get(operatingSystem) + .add(hashedHashedFingerprint); + } Boolean recommendedVersion = entry.getRecommendedVersion(); if (null != recommendedVersion) { newBridgesByRecommendedVersion.get(recommendedVersion).add( @@ -394,6 +414,8 @@ public class NodeIndexer implements ServletContextListener, Runnable { newNodeIndex.setBridgesPublishedMillis(bridgesLastPublishedMillis); newNodeIndex.setRelaysByVersion(newRelaysByVersion); newNodeIndex.setBridgesByVersion(newBridgesByVersion); + newNodeIndex.setRelaysByOperatingSystem(newRelaysByOperatingSystem); + newNodeIndex.setBridgesByOperatingSystem(newBridgesByOperatingSystem); newNodeIndex.setRelaysByHostName(newRelaysByHostName); newNodeIndex.setRelaysByRecommendedVersion(newRelaysByRecommendedVersion); newNodeIndex.setBridgesByRecommendedVersion(newBridgesByRecommendedVersion); diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 63b8fe9..b9d9b23 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -97,6 +97,12 @@ public class RequestHandler { this.version = version; } + private String operatingSystem; + + public void setOperatingSystem(String operatingSystem) { + this.operatingSystem = operatingSystem; + } + private String hostName; public void setHostName(String hostName) { @@ -177,6 +183,7 @@ public class RequestHandler { this.filterByContact(); this.filterByFamily(); this.filterByVersion(); + this.filterByOperatingSystem(); this.filterByHostName(); this.filterByRecommendedVersion(); this.order(); @@ -558,6 +565,29 @@ public class RequestHandler { this.filteredBridges.keySet().retainAll(keepBridges); } + private void filterByOperatingSystem() { + if (null == this.operatingSystem) { + /* Not filtering by operating system. */ + return; + } + Set<String> keepRelays = new HashSet<>(); + for (Map.Entry<String, Set<String>> e + : this.nodeIndex.getRelaysByOperatingSystem().entrySet()) { + if (e.getKey().startsWith(this.operatingSystem)) { + keepRelays.addAll(e.getValue()); + } + } + this.filteredRelays.keySet().retainAll(keepRelays); + Set<String> keepBridges = new HashSet<>(); + for (Map.Entry<String, Set<String>> e + : this.nodeIndex.getBridgesByOperatingSystem().entrySet()) { + if (e.getKey().startsWith(this.operatingSystem)) { + keepBridges.addAll(e.getValue()); + } + } + this.filteredBridges.keySet().retainAll(keepBridges); + } + private void filterByHostName() { if (this.hostName == null) { /* Not filtering by host name. */ diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index a64b89c..e119518 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -69,7 +69,7 @@ public class ResourceServlet extends HttpServlet { Arrays.asList("type", "running", "search", "lookup", "fingerprint", "country", "as", "flag", "first_seen_days", "last_seen_days", "contact", "order", "limit", "offset", "fields", "family", "version", - "host_name", "recommended_version")); + "os", "host_name", "recommended_version")); private static Set<String> illegalSearchQualifiers = new HashSet<>(Arrays.asList(("search,fingerprint,order,limit," @@ -293,6 +293,15 @@ public class ResourceServlet extends HttpServlet { } rh.setVersion(versionParameter); } + if (parameterMap.containsKey("os")) { + String osParameter = this.parseOperatingSystemParameter( + parameterMap.get("os")); + if (null == osParameter) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + rh.setOperatingSystem(osParameter); + } if (parameterMap.containsKey("host_name")) { String hostNameParameter = this.parseHostNameParameter( parameterMap.get("host_name")); @@ -607,6 +616,16 @@ public class ResourceServlet extends HttpServlet { return parameter; } + private String parseOperatingSystemParameter(String parameter) { + for (char c : parameter.toCharArray()) { + if (c < 32 || c >= 127) { + /* Only accept printable ASCII. */ + return null; + } + } + return parameter.toLowerCase(); + } + private static Pattern hostNameParameterPattern = Pattern.compile("^[0-9A-Za-z_\\.\\-]+$"); diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index ad2cac7..6d22aa2 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -807,6 +807,12 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } nodeStatus.setContact(detailsStatus.getContact()); + if (null != detailsStatus.getPlatform()) { + String[] platformParts = detailsStatus.getPlatform().split(" on "); + if (platformParts.length > 1) { + nodeStatus.setOperatingSystem(platformParts[1].toLowerCase()); + } + } /* Extract tor software version for bridges from their "platform" line. * (We already know this for relays from "v" lines in the consensus.) */ diff --git a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java index ed36d56..dc6eba8 100644 --- a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java @@ -92,6 +92,7 @@ public class SummaryDocumentWriter implements DocumentWriter { SortedSet<String> effectiveFamily = nodeStatus.getEffectiveFamily(); String nickname = nodeStatus.getNickname(); String version = nodeStatus.getVersion(); + String operatingSystem = nodeStatus.getOperatingSystem(); String hostName = nodeStatus.getHostName(); List<String> verifiedHostNames = nodeStatus.getVerifiedHostNames(); List<String> unverifiedHostNames = nodeStatus.getUnverifiedHostNames(); @@ -100,8 +101,8 @@ public class SummaryDocumentWriter implements DocumentWriter { nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, asNumber, contact, declaredFamily, effectiveFamily, version, - hostName, verifiedHostNames, unverifiedHostNames, - recommendedVersion); + operatingSystem, hostName, verifiedHostNames, + unverifiedHostNames, recommendedVersion); if (this.documentStore.store(summaryDocument, fingerprint)) { this.writtenDocuments++; } diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java index 459d514..405fff6 100644 --- a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java +++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java @@ -27,7 +27,7 @@ public class SummaryDocumentTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, - null, null, null, true); + null, null, null, null, true); } @Test() diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 4e9a5f0..145619d 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -153,7 +153,7 @@ public class ResourceServletTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), - "0.2.3.25", "ppp-62-216-201-221.dynamic.mnet-online.de", + "0.2.3.25", "linux", "ppp-62-216-201-221.dynamic.mnet-online.de", Arrays.asList( new String[] { "ppp-62-216-201-221.dynamic.mnet-online.de" }), null, true); @@ -170,7 +170,7 @@ public class ResourceServletTest { new TreeSet<String>(Arrays.asList(new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), new TreeSet<>(Arrays.asList(new String[] { - "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, null, "c-68-38-171-200.hsd1.in.comcast.net", Arrays.asList( new String[] {"c-68-38-171-200.hsd1.in.comcast.net"}), @@ -187,8 +187,8 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-16 18:00:00"), "AS6830", "1024d/51e2a1c7 \"steven j. murdoch\" " + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>", - new TreeSet<String>(), new TreeSet<String>(), "0.2.3.24-rc-dev", null, - null, null, false); + new TreeSet<String>(), new TreeSet<String>(), "0.2.3.24-rc-dev", + "windows xp", null, null, null, false); this.relays.put("0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", relayTimMayTribute); this.bridges = new TreeMap<>(); @@ -199,7 +199,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-21 18:07:03"), false, new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, null, DateTimeHelper.parse("2013-04-20 15:37:04"), null, null, - null, null, "0.2.2.39", null, null, null, true); + null, null, "0.2.2.39", null, null, null, null, true); this.bridges.put("0000831B236DFF73D409AD17B40E2A728A53994F", bridgeec2bridgercc7f31fe); org.torproject.onionoo.docs.SummaryDocument bridgeUnnamed = @@ -209,7 +209,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-20 17:37:04"), false, new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, null, DateTimeHelper.parse("2013-04-14 07:07:05"), null, null, - null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null); this.bridges.put("0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", bridgeUnnamed); org.torproject.onionoo.docs.SummaryDocument bridgegummy = @@ -220,7 +220,7 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), -1L, null, DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, - null, "0.2.4.4-alpha-dev", null, null, null, false); + null, "0.2.4.4-alpha-dev", "windows 7", null, null, null, false); this.bridges.put("1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", bridgegummy); } @@ -1648,6 +1648,44 @@ public class ResourceServletTest { this.assertErrorStatusCode("/summary?version=*", 400); } + @Test(timeout = 100) + public void testOperatingSystemLinux() { + this.assertSummaryDocument( + "/summary?os=linux", 1, new String[] {"TorkaZ"}, 0, null); + } + + @Test(timeout = 100) + public void testOperatingSystemLinuxMixedCaps() { + this.assertSummaryDocument( + "/summary?os=LiNUx", 1, new String[] {"TorkaZ"}, 0, null); + } + + @Test(timeout = 100) + public void testOperatingSystemLin() { + this.assertSummaryDocument( + "/summary?os=lin", 1, new String[] {"TorkaZ"}, 0, null); + } + + @Test(timeout = 100) + public void testOperatingSystemWindows() { + this.assertSummaryDocument( + "/summary?os=windows", 1, new String[] {"TimMayTribute"}, + 1, new String[] {"gummy"}); + } + + @Test(timeout = 100) + public void testOperatingSystemWindowsExperience() { + this.assertSummaryDocument( + "/summary?os=windows xp", 1, new String[] {"TimMayTribute"}, + 0, null); + } + + @Test(timeout = 100) + public void testOperatingSystemWindows7() { + this.assertSummaryDocument( + "/summary?os=windows 7", 0, null, 1, new String[] {"gummy"}); + } + @Test public void testHostNameDe() { this.assertSummaryDocument("/summary?host_name=de", 1, null, 0, null); diff --git a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java index 569300d..2b67206 100644 --- a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java @@ -41,7 +41,7 @@ public class SummaryDocumentComparatorTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, - null, null, null, null); + null, null, null, null, null); } /** Some values for running all comparison types. */

1 0

[onionoo/release] Avoid IllegalStateException when descriptors are missing.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit b6e3a1d51722f02f2d391295a676c7b241090213 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 11 09:35:07 2018 +0200 Avoid IllegalStateException when descriptors are missing. A missing descriptor directory has caused an IllegalStateException when we attempted to write our parse history files. Let's be more careful about this case and skip this history file if there is no such directory. Fixes #26711. --- CHANGELOG.md | 2 ++ src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca0142b..d4cfb82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ * Minor changes - Index relays with no known country code or autonomous system number using the special values "xz" and "AS0" respectively. + - Avoid running into an IllegalStateException when CollecTor is + missing a whole descriptor directory. # Changes in version 6.0-1.14.0 - 2018-05-29 diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java index c19fabd..d00b8b2 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java @@ -108,6 +108,11 @@ class DescriptorQueue { if (this.historyFile == null) { return; } + if (null == this.descriptors) { + log.debug("Not writing history file {}, because we did not read a single " + + "descriptor from {}.", this.historyFile, this.directory); + return; + } SortedMap<String, Long> excludedAndParsedFiles = new TreeMap<>(); excludedAndParsedFiles.putAll( this.descriptorReader.getExcludedFiles());

1 0

[onionoo/release] Prepare for 6.1-1.15.0 release.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit eee9cf8e12523b2baa0b6d3e30736b4b1ca12eb9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 15:27:36 2018 +0200 Prepare for 6.1-1.15.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9f21b6..cd11502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 6.?-1.??.0 - 2018-??-?? +# Changes in version 6.1-1.15.0 - 2018-07-16 * Medium changes - Provide more accurate DNS results in "verified_host_names" and diff --git a/build.xml b/build.xml index e1fb1ab..1f3fa1d 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="6.0"/> + <property name="onionoo.protocol.version" value="6.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.14.0-dev"/> + value="${onionoo.protocol.version}-1.15.0"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index dff9899..decf559 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -132,7 +132,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "6.0"; + private static final String PROTOCOL_VERSION = "6.1"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;

1 0

[onionoo/master] Prepare for 6.1-1.15.0 release.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit eee9cf8e12523b2baa0b6d3e30736b4b1ca12eb9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 15:27:36 2018 +0200 Prepare for 6.1-1.15.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9f21b6..cd11502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 6.?-1.??.0 - 2018-??-?? +# Changes in version 6.1-1.15.0 - 2018-07-16 * Medium changes - Provide more accurate DNS results in "verified_host_names" and diff --git a/build.xml b/build.xml index e1fb1ab..1f3fa1d 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="6.0"/> + <property name="onionoo.protocol.version" value="6.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.14.0-dev"/> + value="${onionoo.protocol.version}-1.15.0"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index dff9899..decf559 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -132,7 +132,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "6.0"; + private static final String PROTOCOL_VERSION = "6.1"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;

1 0

[metrics-web/master] Update news.json to version 278 of doc/MetricsTimeline.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 99a3cc515e2e9b4f46ec66328b8e83978f942fb6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 12:19:50 2018 +0200 Update news.json to version 278 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 55285ff..198197a 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3140,6 +3140,15 @@ "target" : "https://bugs.torproject.org/26771" } ] }, { + "start" : "2018-07-15", + "protocols" : [ "snowflake" ], + "short_description" : "Made the Snowflake bridge report to the new Serge bridge authority.", + "description" : "Made the Snowflake bridge report to the new Serge bridge authority.", + "links" : [ { + "label" : "comment", + "target" : "https://bugs.torproject.org/26783#comment:1" + } ] +}, { "start" : "2016-02-24", "places" : [ "tm" ], "protocols" : [ "<OR>" ],

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit a5df8ebcc92a13c2dba80422a199aeb16f935c9b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 12:20:06 2018 +0200 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index a67a471..f6c7e0e 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit a67a4713f64dca654928d10d6f5ff469540a47cf +Subproject commit f6c7e0e4d9c69f889206687f23ca7dadd23a4e99

1 0

[tor/master] Avoid a use-after-null-check in proto_socks.c
by nickm＠torproject.org 16 Jul '18

16 Jul '18

commit 8505522e508c8d2379afbd86154a910948cf8c70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 07:51:11 2018 -0400 Avoid a use-after-null-check in proto_socks.c Coverity rightly complains that early in the function we're checking whether username is NULL, and later we're passing it unconditionally to strlen(). Fixes CID 1437967. Bug not in any released Tor. --- src/core/proto/proto_socks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index 9cc9568a4..ccf96f781 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -166,7 +166,7 @@ parse_socks4_request(const uint8_t *raw_data, socks_request_t *req, *is_socks4a = (dest_ip >> 8) == 0; const char *username = socks4_client_request_get_username(trunnel_req); - size_t usernamelen = username ? strlen(username) : 0; + const size_t usernamelen = username ? strlen(username) : 0; if (username && usernamelen) { if (usernamelen > MAX_SOCKS_MESSAGE_LEN) { log_warn(LD_APP, "Socks4 user name too long; rejecting."); @@ -184,7 +184,7 @@ parse_socks4_request(const uint8_t *raw_data, socks_request_t *req, // We cannot rely on trunnel here, as we want to detect if // we have abnormally long hostname field. const char *hostname = (char *)raw_data + SOCKS4_NETWORK_LEN + - strlen(username) + 1; + usernamelen + 1; size_t hostname_len = (char *)raw_data + datalen - hostname; if (hostname_len <= sizeof(req->address)) {

1 0

[metrics-web/master] Recognize new bridge authority Serge.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 7744458f33f5b257d20cba89ce5cdc4819b8ed85 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 12:16:42 2018 +0200 Recognize new bridge authority Serge. --- .../torproject/metrics/stats/servers/ConsensusStatsFileHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java index 8ccb3b5..c736496 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java +++ b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java @@ -202,6 +202,9 @@ public class ConsensusStatsFileHandler { } else if (descriptorFileName.contains( "1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1")) { authority = "Bifroest"; + } else if (descriptorFileName.contains( + "BA44A889E64B93FAA2B114E02C2A279A8555C533")) { + authority = "Serge"; } if (authority == null) { this.logger.warning("Did not recognize the bridge authority "

1 0

[metrics-web/master] Update news.json to version 277 of doc/MetricsTimeline.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 518b6489373590f2f183fa53292a98dda3eb2823 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 15 09:17:11 2018 +0200 Update news.json to version 277 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 63db2d2..55285ff 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3128,6 +3128,18 @@ "target" : "https://bugs.torproject.org/26661" } ] }, { + "start" : "2018-07-14", + "protocols" : [ "bridge" ], + "short_description" : "Release of Tor 0.3.3.9, switches bridge authority Bifroest to Serge.", + "description" : "Release of Tor 0.3.3.9, switches bridge authority Bifroest to <a href=\"https://metrics.torproject.org/rs.html#details/BA44A889E64B93FAA2B114E02C2A…">Serge</a>.", + "links" : [ { + "label" : "announcement", + "target" : "https://lists.torproject.org/pipermail/tor-announce/2018-July/000162.html" + }, { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26771" + } ] +}, { "start" : "2016-02-24", "places" : [ "tm" ], "protocols" : [ "<OR>" ],

1 0

[chutney/master] Add a minimal bwfile network with V3BandwidthsFile /tmp/bwfile
by teor＠torproject.org 16 Jul '18

16 Jul '18

commit 0d2f884aa1643a09eae95bf57157664b36f0ebbb Author: teor <teor2345(a)gmail.com> Date: Mon Jul 16 15:22:00 2018 +1000 Add a minimal bwfile network with V3BandwidthsFile /tmp/bwfile Closes 26801. --- README | 7 +++++++ networks/bwfile | 9 +++++++++ torrc_templates/authority-bwfile.tmpl | 2 ++ 3 files changed, 18 insertions(+) diff --git a/README b/README index 8d4bb72..7df2ef5 100644 --- a/README +++ b/README @@ -118,6 +118,13 @@ HS Connection Tests: # Default behavior is one client connects to each HS ./chutney stop networks/hs-025 +Bandwidth File Tests: + ./tools/test-network.sh --flavour bwfile + # Warning: Can't open bandwidth file at configured location: /tmp/bwfile + # Create a bwfile with no bandwidths, that is valid for a few days + date +%s > /tmp/bwfile + ./tools/test-network.sh --flavour bwfile + Waiting for the network: The tools/test-network.sh script waits CHUTNEY_START_TIME seconds diff --git a/networks/bwfile b/networks/bwfile new file mode 100644 index 0000000..43fdf19 --- /dev/null +++ b/networks/bwfile @@ -0,0 +1,9 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority-bwfile.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") + +# The minimum number of authorities/relays/exits is 3, the minimum path length +NODES = Authority.getN(2) + ExitRelay.getN(1) + Client.getN(1) + +ConfigureNodes(NODES) diff --git a/torrc_templates/authority-bwfile.tmpl b/torrc_templates/authority-bwfile.tmpl new file mode 100644 index 0000000..1411773 --- /dev/null +++ b/torrc_templates/authority-bwfile.tmpl @@ -0,0 +1,2 @@ +${include:authority.tmpl} +V3BandwidthsFile /tmp/bwfile

1 0

[chutney/master] Remove all comment references to obsolete tor versions
by teor＠torproject.org 16 Jul '18

16 Jul '18

commit 74e87ead493bdbe2ee1dd12f776085858feccc58 Author: teor <teor2345(a)gmail.com> Date: Mon Jul 16 15:34:41 2018 +1000 Remove all comment references to obsolete tor versions --- README | 4 ---- lib/chutney/TorNet.py | 9 ++------- networks/basic | 2 -- networks/bridges | 2 -- networks/bridges+hs | 2 -- networks/bridges+hs-v23 | 2 -- networks/bridges+ipv6 | 2 -- networks/bridges+ipv6+hs | 2 -- networks/bridges+ipv6+hs-v23 | 2 -- networks/hs | 2 -- networks/hs-exit-min | 2 -- networks/hs-v3 | 2 -- networks/middle | 2 -- networks/mixed | 2 -- networks/mixed+hs-v2 | 2 -- networks/mixed+hs-v23 | 2 -- networks/mixed+hs-v3 | 2 -- tools/ignore.warnings | 2 +- tools/test-network.sh | 3 --- torrc_templates/authority.i | 11 ----------- 20 files changed, 3 insertions(+), 56 deletions(-) diff --git a/README b/README index 7df2ef5..d845e6b 100644 --- a/README +++ b/README @@ -105,10 +105,6 @@ Connection Tests: # Run 5 sequential verification rounds CHUTNEY_ROUNDS=5 ./tools/test-network.sh --flavour basic -Note: If you create 7 or more connections to a hidden service from a single -Tor 0.2.7 client, you'll likely get a verification failure due to #15937. -This is fixed in 0.2.8. - HS Connection Tests: ./chutney configure networks/hs-025 ./chutney start networks/hs-025 diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index ceed4ee..91ebb6b 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -291,8 +291,6 @@ class LocalNodeBuilder(NodeBuilder): tor = self._env['tor'] # find the options the current tor binary supports, and cache them if tor not in _TORRC_OPTIONS: - # Note: some versions of tor (e.g. 0.2.4.23) require - # --list-torrc-options to be the first argument cmdline = [ tor, "--list-torrc-options", @@ -315,9 +313,7 @@ class LocalNodeBuilder(NodeBuilder): else: torrc_opts = _TORRC_OPTIONS[tor] # check if each option is supported before writing it - # TODO: what about unsupported values? - # e.g. tor 0.2.4.23 doesn't support TestingV3AuthInitialVoteDelay 2 - # but later version do. I say throw this one to the user. + # Unsupported option values may need special handling. with open(fn_out, 'w') as f: # we need to do case-insensitive option comparison # even if this is a static whitelist, @@ -728,8 +724,7 @@ DEFAULTS = { 'tor-gencert': os.environ.get('CHUTNEY_TOR_GENCERT', None), 'auth_cert_lifetime': 12, 'ip': os.environ.get('CHUTNEY_LISTEN_ADDRESS', '127.0.0.1'), - # Pre-0.2.8 clients will fail to parse ipv6 auth lines, - # so we default to ipv6_addr None + # we default to ipv6_addr None to support IPv4-only systems 'ipv6_addr': os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', None), 'dirserver_flags': 'no-v2', 'chutney_dir': get_absolute_chutney_path(), diff --git a/networks/basic b/networks/basic index 703f5fc..2ff8dee 100644 --- a/networks/basic +++ b/networks/basic @@ -3,8 +3,6 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(3) + ExitRelay.getN(5) + Client.getN(2) ConfigureNodes(NODES) diff --git a/networks/bridges b/networks/bridges index 2557c0f..c5f6076 100644 --- a/networks/bridges +++ b/networks/bridges @@ -8,8 +8,6 @@ BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) diff --git a/networks/bridges+hs b/networks/bridges+hs index 3d01cfa..f240bcb 100644 --- a/networks/bridges+hs +++ b/networks/bridges+hs @@ -9,8 +9,6 @@ Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ ExitRelay.getN(4) + \ diff --git a/networks/bridges+hs-v23 b/networks/bridges+hs-v23 index e2ac4cd..1afd75e 100644 --- a/networks/bridges+hs-v23 +++ b/networks/bridges+hs-v23 @@ -10,8 +10,6 @@ BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") HSv3 = Node(tag="h", hs=1, torrc="hs-.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ ExitRelay.getN(4) + \ diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 index 92c9e22..4638c82 100644 --- a/networks/bridges+ipv6 +++ b/networks/bridges+ipv6 @@ -9,8 +9,6 @@ Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 # bridges+ipv6-min only has IPv6 bridges diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs index 8cd3d71..16bc6ed 100644 --- a/networks/bridges+ipv6+hs +++ b/networks/bridges+ipv6+hs @@ -10,8 +10,6 @@ BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge- BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23 index 4e60a9a..3147085 100644 --- a/networks/bridges+ipv6+hs-v23 +++ b/networks/bridges+ipv6+hs-v23 @@ -11,8 +11,6 @@ BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 diff --git a/networks/hs b/networks/hs index b08879e..2e27b76 100644 --- a/networks/hs +++ b/networks/hs @@ -4,8 +4,6 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + ExitRelay.getN(5) + \ Client.getN(1) + HS.getN(1) diff --git a/networks/hs-exit-min b/networks/hs-exit-min index 609561a..2d94d5b 100644 --- a/networks/hs-exit-min +++ b/networks/hs-exit-min @@ -4,8 +4,6 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(2) + ExitRelay.getN(3) + \ Client.getN(1) + HS.getN(1) diff --git a/networks/hs-v3 b/networks/hs-v3 index ee440dd..6367c41 100644 --- a/networks/hs-v3 +++ b/networks/hs-v3 @@ -6,8 +6,6 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + ExitRelay.getN(5) + \ Client.getN(1) + HS.getN(1) diff --git a/networks/middle b/networks/middle index 1dc49aa..10a1720 100644 --- a/networks/middle +++ b/networks/middle @@ -4,8 +4,6 @@ NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(3) + \ NonExitRelay.getN(2) + ExitRelay.getN(3) + \ Client.getN(2) diff --git a/networks/mixed b/networks/mixed index 2c016eb..a0c126e 100644 --- a/networks/mixed +++ b/networks/mixed @@ -9,8 +9,6 @@ OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", Client = Node(tag="c", client=1, torrc="client.tmpl") OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(2) + OldClient.getN(2) diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 index a03d1d8..5d901ed 100644 --- a/networks/mixed+hs-v2 +++ b/networks/mixed+hs-v2 @@ -11,8 +11,6 @@ OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(1) + OldClient.getN(1) + \ diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index eab43e9..fd180bf 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -15,8 +15,6 @@ OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) # See 23498 #HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(1) + OldClient.getN(1) + \ diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 index ec9b593..e2e9aa5 100644 --- a/networks/mixed+hs-v3 +++ b/networks/mixed+hs-v3 @@ -11,8 +11,6 @@ OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) # Old tor versions don't have HSv3 support yet HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(1) + OldClient.getN(1) + \ diff --git a/tools/ignore.warnings b/tools/ignore.warnings index 48c7570..d0f4667 100644 --- a/tools/ignore.warnings +++ b/tools/ignore.warnings @@ -24,7 +24,7 @@ Couldn't set up any working nameservers. Network not up yet Currently, sandboxing is only implemented on Linux # We ignore consensus failure warnings Error publishing .* consensus -# Tor 23078, fixed in 0.3.0.11 and 0.3.1.6-rc +# Tor 23078, fixed in 0.3.2 and later Established prop224 intro point on circuit Every hidden service on this tor instance is NON-ANONYMOUS # We ignore consensus failure warnings diff --git a/tools/test-network.sh b/tools/test-network.sh index e893e80..97a7374 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -86,9 +86,6 @@ do shift ;; # Make this many simultaneous connections per client (1) - # Note: If you create 7 or more connections to a hidden service from - # a single Tor 0.2.7 client, you'll likely get a verification failure due - # to #15937. This is fixed in 0.2.8. --connections|--connection|--connection-count|--count) export CHUTNEY_CONNECTIONS="$2" shift diff --git a/torrc_templates/authority.i b/torrc_templates/authority.i index 1c7ca45..c2a425f 100644 --- a/torrc_templates/authority.i +++ b/torrc_templates/authority.i @@ -19,14 +19,3 @@ TestingV3AuthInitialDistDelay 2 V3AuthDistDelay 2 # This is autoconfigured by chutney, so you probably don't want to use it #TestingV3AuthVotingStartOffset 0 - -# Work around situations where the Exit, Guard and HSDir flags aren't being set -# These flags are all set eventually, but it takes Guard up to ~30 minutes -# We could be more precise here, but it's easiest just to vote everything -# Clients are sensible enough to filter out Exits without any exit ports, -# and Guards and HSDirs without ORPorts -# If your tor doesn't recognise TestingDirAuthVoteExit/HSDir, -# either update your chutney to a 2015 version, -# or update your tor to a later version, most likely 0.2.6.2-final - -# See common.i in the Comprehensive/Rapid sections for the relevant options

1 0

[stem/master] Replace Bifroest bridge authority with Serge
by atagar＠torproject.org 16 Jul '18

16 Jul '18

commit cb74dbdf3ffd44261693e2014a17a4206b6654ce Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 15 15:08:50 2018 -0700 Replace Bifroest bridge authority with Serge --- docs/change_log.rst | 1 + stem/directory.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 88558374..09237cba 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -76,6 +76,7 @@ The following are only available within Stem's `git repository * Reduced maximum descriptors fetched by the remote module to match tor's new limit (:trac:`24743`) * Consensus **shared_randomness_*_reveal_count** attributes undocumented, and unavailable if retrieved before their corresponding shared_randomness_*_value attribute (:trac:`25046`) * Allow 'proto' line to have blank values (:spec:`a8455f4`) + * Replaced Bifroest bridge authority with Serge (:trac:`26771`) * **Utilities** diff --git a/stem/directory.py b/stem/directory.py index ba0ef702..efd37641 100644 --- a/stem/directory.py +++ b/stem/directory.py @@ -647,12 +647,12 @@ DIRECTORY_AUTHORITIES = { orport_v6 = ('2620:13:4000:6000::1000:118', 443), v3ident = '27102BC123E7AF1D4741AE047E160C91ADC76B21', ), - 'Bifroest': Authority( - nickname = 'Bifroest', - address = '37.218.247.217', - or_port = 443, - dir_port = 80, - fingerprint = '1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1', + 'Serge': Authority( + nickname = 'Serge', + address = '66.111.2.131', + or_port = 9001, + dir_port = 9030, + fingerprint = 'BA44A889E64B93FAA2B114E02C2A279A8555C533', v3ident = None, # does not vote in the consensus ), }

1 0

[stem/master] Add or_addresses to RouterStatusEntryMicroV3
by atagar＠torproject.org 16 Jul '18

16 Jul '18

commit d5d5e2afe922c2e7c94c27208c5fca2bac4fbd4c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 15 17:40:42 2018 -0700 Add or_addresses to RouterStatusEntryMicroV3 Router status entry 'a' lines previously only appeared in the standard consensus but now they appear in the microdescriptor consensus as well... https://trac.torproject.org/projects/tor/ticket/26405 https://trac.torproject.org/projects/tor/ticket/23826 --- docs/change_log.rst | 1 + stem/descriptor/router_status_entry.py | 7 ++++ test/unit/descriptor/router_status_entry.py | 53 +++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 09237cba..16f54773 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -67,6 +67,7 @@ The following are only available within Stem's `git repository * Added the *orport_v6* attribute to the :class:`~stem.directory.Authority` class * Added server descriptor's new is_hidden_service_dir attribute * Added the network status vote's new bandwidth_file attribute (:spec:`84591df`) + * Added the microdescriptor router status entry's new or_addresses attribute (:trac:`26405`, :spec:`fdc8f3e8`) * Don't retry downloading descriptors when we've timed out * Don't download from tor26 and Bifroest, which are authorities that frequently timeout * `stem.descriptor.remote <api/descriptor/remote.html>`_ now consistently defaults **fall_back_to_authority** to false diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 5b99ba0c..b4cd506a 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -662,6 +662,8 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): Information about an individual router stored within a microdescriptor flavored network status document. + :var list or_addresses: **\*** relay's OR addresses, this is a tuple listing + of the form (address (**str**), port (**int**), is_ipv6 (**bool**)) :var int bandwidth: bandwidth claimed by the relay (in kb/s) :var int measured: bandwidth measured to be available by the relay :var bool is_unmeasured: bandwidth measurement isn't based on three or more @@ -675,11 +677,15 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): .. versionchanged:: 1.6.0 Added the protocols attribute. + .. versionchanged:: 1.7.0 + Added the or_addresses attribute. + **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined """ ATTRIBUTES = dict(RouterStatusEntry.ATTRIBUTES, **{ + 'or_addresses': ([], _parse_a_line), 'bandwidth': (None, _parse_w_line), 'measured': (None, _parse_w_line), 'is_unmeasured': (False, _parse_w_line), @@ -690,6 +696,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): }) PARSER_FOR_LINE = dict(RouterStatusEntry.PARSER_FOR_LINE, **{ + 'a': _parse_a_line, 'w': _parse_w_line, 'm': _parse_microdescriptor_m_line, 'pr': _parse_pr_line, diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index a4c14e01..b376f869 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -26,6 +26,12 @@ from stem.descriptor.router_status_entry import ( _base64_to_hex, ) +try: + # Added in 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + ENTRY_WITHOUT_ED25519 = """\ r seele AAoQ1DAR6kkoo19hBAX5K0QztNw m0ynPuwzSextzsiXYJYA0Hce+Cs 2015-08-23 00:26:35 73.15.150.172 9001 0 s Running Stable Valid @@ -52,6 +58,16 @@ m 18,19,20 sha256=AkZH3gIvz3wunsroqh5izBJizdYuR7kn2oVbsvqgML8 m 21 sha256=AVp41YVxKEJCaoEf0+77Cdvyw5YgpyDXdob0+LSv/pE """ +ENTRY_WITH_IPV6 = """\ +r MYLEX AQt3KEVEEfSFzinUx5oUU0FRwsQ 2018-07-15 16:38:10 77.123.42.148 444 800 +a [2001:470:71:9b9:f66d:4ff:fee7:954c]:444 +m GWb+xjav0fsuwPwPNnUvW9Q1Ivk5nz8m1McECM4KY8A +s Fast Guard HSDir Running Stable V2Dir Valid +v Tor 0.2.5.16 +pr Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2 +w Bandwidth=4950 +""" + expect_invalid_attr = functools.partial(base_expect_invalid_attr, RouterStatusEntryV3, 'nickname', 'Unnamed') expect_invalid_attr_for_text = functools.partial(base_expect_invalid_attr_for_text, RouterStatusEntryV3, 'nickname', 'Unnamed') @@ -222,6 +238,43 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual('CAB27A6FFEF7A661C18B0B11120C3E8A77FC585C', entry.digest) self.assertEqual([], entry.get_unrecognized_lines()) + def test_with_ipv6(self): + """ + Parse a router status entry with an IPv6 address. + """ + + expected_protocols = OrderedDict(( + ('Cons', [1]), + ('Desc', [1]), + ('DirCache', [1]), + ('HSDir', [1]), + ('HSIntro', [3]), + ('HSRend', [1]), + ('Link', [1, 2, 3, 4]), + ('LinkAuth', [1]), + ('Microdesc', [1]), + ('Relay', [1, 2]), + )) + + entry = RouterStatusEntryMicroV3(ENTRY_WITH_IPV6, validate = True) + self.assertEqual('MYLEX', entry.nickname) + self.assertEqual('010B7728454411F485CE29D4C79A14534151C2C4', entry.fingerprint) + self.assertEqual(datetime.datetime(2018, 7, 15, 16, 38, 10), entry.published) + self.assertEqual('77.123.42.148', entry.address) + self.assertEqual(444, entry.or_port) + self.assertEqual(800, entry.dir_port) + self.assertEqual(set([Flag.FAST, Flag.GUARD, Flag.HSDIR, Flag.RUNNING, Flag.STABLE, Flag.V2DIR, Flag.VALID]), set(entry.flags)) + self.assertEqual('Tor 0.2.5.16', entry.version_line) + self.assertEqual(Version('0.2.5.16'), entry.version) + self.assertEqual([('2001:470:71:9b9:f66d:4ff:fee7:954c', 444, True)], entry.or_addresses) + self.assertEqual(4950, entry.bandwidth) + self.assertEqual(None, entry.measured) + self.assertEqual(False, entry.is_unmeasured) + self.assertEqual([], entry.unrecognized_bandwidth_entries) + self.assertEqual(expected_protocols, entry.protocols) + self.assertEqual('1966FEC636AFD1FB2EC0FC0F36752F5BD43522F9399F3F26D4C70408CE0A63C0', entry.digest) + self.assertEqual([], entry.get_unrecognized_lines()) + def test_missing_fields(self): """ Parses a router status entry that's missing fields.

1 0

[tor/master] Copy socks5.trunnel from trunnel examples dir
by nickm＠torproject.org 15 Jul '18

15 Jul '18

commit adbe6a25215b5f2c626a0801a49d596c0e478b5c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun May 13 14:06:43 2018 +0200 Copy socks5.trunnel from trunnel examples dir --- src/trunnel/socks5.trunnel | 115 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/src/trunnel/socks5.trunnel b/src/trunnel/socks5.trunnel new file mode 100644 index 000000000..ab53a4315 --- /dev/null +++ b/src/trunnel/socks5.trunnel @@ -0,0 +1,115 @@ +// Example: here's a quickie implementation of the messages in the +// socks5 protocol. + +struct socks5_client_version { + u8 version IN [5]; + u8 n_methods; + u8 methods[n_methods]; +} + +struct socks5_server_method { + u8 version IN [5]; + u8 method; +} + +const CMD_CONNECT = 1; +const CMD_BIND = 2; +const CMD_UDP_ASSOCIATE = 3; +// This is a tor extension +const CMD_RESOLVE_PTR = 0xF1; + +const ATYPE_IPV4 = 1; +const ATYPE_IPV6 = 4; +const ATYPE_DOMAINNAME = 3; + +struct domainname { + u8 len; + char name[len]; +} + +struct socks5_client_request { + u8 version IN [5]; + u8 command IN [CMD_CONNECT, CMD_BIND, CMD_UDP_ASSOCIATE, CMD_RESOLVE_PTR]; + u8 reserved IN [0]; + u8 atype; + union dest_addr[atype] { + ATYPE_IPV4: u32 ipv4; + ATYPE_IPV6: u8 ipv6[16]; + ATYPE_DOMAINNAME: struct domainname domainname; + default: fail; + }; + u16 dest_port; +} + +struct socks5_server_reply { + u8 version IN [5]; + u8 reply; + u8 reserved IN [0]; + u8 atype; + union bind_addr[atype] { + ATYPE_IPV4: u32 ipv4; + ATYPE_IPV6: u8 ipv6[16]; + ATYPE_DOMAINNAME: struct domainname domainname; + default: fail; + }; + u16 bind_port; +} + +struct socks5_client_userpass_auth { + u8 version IN [1]; + u8 username_len; + char username[username_len]; + u8 passwd_len; + char passwd[passwd_len]; +} + +struct socks5_server_userpath_auth { + u8 version IN [1]; + u8 status; +} + +// Oh why not. Here's socks4 and socks4a. + +struct socks4_client_request { + u8 version IN [4]; + u8 command IN [CMD_CONNECT,CMD_BIND,CMD_RESOLVE_PTR]; + u16 port; + u32 addr; + nulterm username; + union socks4a_addr[addr] { + 1..255: + nulterm hostname; + default: + ; + }; +} + +struct socks4_server_reply { + u8 version IN [4]; + u8 status; + u16 port; + u32 addr; +} + +// And here's the extended stuff from proposal 229 + +struct tor_socksauth_keyval { + u16 keylen; + char key[keylen]; + u16 vallen; + char val[vallen]; +} + +struct tor_extended_socks_auth_request { + u8 version IN [1]; + u16 npairs; + struct tor_socksauth_keyval pairs[npairs]; +} + +struct tor_extended_socks_auth_response { + u8 version IN [1]; + u8 status; + u16 npairs; + struct tor_socksauth_keyval pairs[npairs]; +} +

1 0