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

[tor/master] Fix compilation of test_addr.c
by nickm＠torproject.org 09 May '18

09 May '18

commit 01d729cbfe88e8a77b7bd42434e32771402f3fe7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 8 20:20:54 2018 -0400 Fix compilation of test_addr.c This needs to include crypto_rand.h (which it didn't before it was merged). --- src/test/test_addr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 505e1533d..40db31320 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -6,6 +6,7 @@ #define ADDRESSMAP_PRIVATE #include "orconfig.h" #include "or.h" +#include "crypto_rand.h" #include "test.h" #include "addressmap.h" #include "log_test_helpers.h"

1 0

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

09 May '18

commit e6451b3ff8148b34ea157a78977e9b5a9fa3671f Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 00:20:31 2018 +0000 Update translations for support-tbb --- nb.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nb.json b/nb.json index 3908f8f67..05350dc5a 100644 --- a/nb.json +++ b/nb.json @@ -134,19 +134,19 @@ "tbb-22": { "id": "#tbb-22", "control": "tbb-22", - "title": "How can I make Tor run faster? Is Tor Browser slower than other browsers?", + "title": "Hvordan kan jeg få Tor til å kjøre raskere? Er Tor-nettleseren tregere enn andre nettlesere?", "description": "<p class=\"mb-3\">Using Tor Browser can sometimes be slower than other browsers. The Tor network has over a million daily users, and just over 6000 relays to route all of their traffic, and the load on each server can sometimes cause latency. You can help improve the speed of the network by running your own relay, or encouraging others to do so. That said, Tor is much faster than it used to be and you may not actually notice any change in speed from other browsers.</p>" }, "tbb-23": { "id": "#tbb-23", "control": "tbb-23", - "title": "What search engine comes with Tor Browser and how does it protect my privacy?", - "description": "<p class=\"mb-3\">DuckDuckGo is the default search engine in Tor Browser. DuckDuckGo does not track its users nor does it store any data about user searches.</p>" + "title": "Hvilken søkemotor kommer med Tor-nettleseren, og hvordan tar den hensyn til mitt personvern?", + "description": "<p class=\"mb-3\">DuckDuckGo er forvalgt søkemotor i Tor-nettleseren. DuckDuckGo sporer ikke sine brukere, og lagrer ikke data om brukersøk.</p>" }, "tbb-24": { "id": "#tbb-24", "control": "tbb-24", - "title": "I'm having a problem with DuckDuckGo.", + "title": "Jeg har et problem med DuckDuckGo.", "description": "<p class=\"mb-3\">Please see the <mark><a href=\"https://duck.co/help\">DuckDuckGo support portal</a></mark>. If you believe this is a Tor Browser issue, please report it on our <mark><a href=\"https://trac.torproject.org/\">bug tracker</a></mark>.</p>" }, "tbb-25": { @@ -164,7 +164,7 @@ "tbb-27": { "id": "#tbb-27", "control": "tbb-27", - "title": "How do I update Tor Browser?", + "title": "Hvordan oppdaterer jeg Tor-nettleseren?", "description": "<p class=\"mb-3\">You can update Tor Browser as soon as a new version is released.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image4.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Tor Browser will prompt you to update the software once a new version has been released.</h4><p class=\"card-text\">The Torbutton icon (the little green onion in the top left corner of the browser) will display a yellow triangle.</p></div></div></div><p class=\"mb-3\">You may see a written indication when Tor Browser opens telling you that an update is available.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image5.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div><p class=\"mb-3\">Tor browser will install the updates.</p><div class=\"col-md-6\"><div clas s=\"card\"><img class=\"card-img-top\" src=\"/static/images/image3.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div>" }, "tbb-28": { @@ -176,25 +176,25 @@ "tbb-29": { "id": "#tbb-29", "control": "tbb-29", - "title": "Is there a way to change the IP address that Tor Browser assigns me for a particular site?", + "title": "Finnes det noen måte å endre IP-adressen Tor-nettleseren tildeler meg for en gitt side?", "description": "<p class=\"mb-3\">Tor Browser has two ways to change your relay circuit — \"New Identity\" and \"New Tor Circuit for this Site\". Both options are located in the Torbutton (little green onion) menu.</p><h5>New Identity</h5><p class=\"mb-3\">This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking \"New Identity\".</p><h5>New Tor Circuit for this Site</h5><p class=\"mb-3\">This option is useful if the exit relay you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs a nd windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image1.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div>" }, "tbb-30": { "id": "#tbb-30", "control": "tbb-30", - "title": "A website (bank, email provider, etc..) locks me out whenever I use Tor, what can I do?", + "title": "En nettside (bank, e-posttilbyder, osv.) låser meg ute når jeg bruker Tor, hva kan jeg gjøre?", "description": "<p class=\"mb-3\">Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been compromised, and lock you out. The only way to resolve this is by following the site’s recommended procedure for account recovery, or contacting the operators and explaining the situation. You may be able to avoid this scenario if your provider offers 2-factor authentication, which is a much better security option than IP-based reputations. Contact your provider and ask them if they provide 2FA.</p>" }, "tbb-31": { "id": "#tbb-31", "control": "tbb-31", - "title": "Which platforms is Tor Browser available for?", + "title": "Hvilke plattformer finnes Tor-nettleseren på?", "description": "<p class=\"mb-3\">Tor Browser is currently available on Windows, Linux and OSX. For Android, The Guardian Project maintains the Tor-powered apps Orbot and Orfox. There is no official version of Tor for iOS yet, though we recommend Onion Browser.</p>" }, "tbb-32": { "id": "#tbb-32", "control": "tbb-32", - "title": "Can I set Tor Browser as my default browser?", + "title": "Kan jeg sette Tor-nettleseren som min forvalgte nettleser?", "description": "<p class=\"mb-3\">There is currently no supported method for setting Tor Browser as your default browser. The Tor Browser works hard to isolate itself from the rest of your system, and the steps for making it the default browser are unreliable. This means sometimes a website would load in the Tor Browser, and sometimes it would load in another browser, this type of behavior can be dangerous and anonymity-breaking.</p>" }, "tbb-33": { @@ -224,7 +224,7 @@ "tbb-37": { "id": "#tbb-37", "control": "tbb-37", - "title": "I need Tor Browser in a language that's not English.", + "title": "Jeg trenger Tor-nettleseren på et språk som ikke er Engelsk.", "description": "<p class=\"mb-3\">We currently offer Tor Browser in the following languages:</p><p class=\"mb-3\"><ul><li>English (en-US)</li><li>\"العربية\" (ar)</li><li>Deutsch (de)</li><li>Español (es-ES)</li><li> فارسى (fa)</li><li>Français (fr)</li><li>Italiano (it)</li><li>日本語 (ja)</li><li>Korean (ko)</li><li>Nederlands (nl)</li><li>Polish (pl)</li><li>Português (pt-BR)</li><li>Русский (ru)</li><li>Türkçe (tr)</li><li>Vietnamese (vi)</li><li>简体字 (zh-CN)</li></ul></p>" }, "tbb-38": { @@ -242,7 +242,7 @@ "tbb-40": { "id": "#tbb-40", "control": "tbb-40", - "title": "Does Tor Browser use a different circuit for each website?", + "title": "Bruker Tor-nettleseren en egen krets for hver nettside?", "description": "<p class=\"mb-3\">In Tor Browser, every domain gets its own circuit. <mark><a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…">The Design and Implementation of Tor Browser</a></mark> document has further details regarding this issue.</p>" }, "tbb-41": { @@ -254,7 +254,7 @@ "tbb-42": { "id": "#tbb-42", "control": "tbb-42", - "title": "Why does my Tor Browser say something about Firefox not working?", + "title": "Hvorfor sier Tor-nettleseren noe om at Firefox ikke fungerer?", "description": "<p class=\"mb-3\">Tor Browser is built using <mark><a href=\"https://www.mozilla.org/en-US/firefox/organizations/\">Firefox ESR</a></mark>, so errors regarding Firefox may occur. Please be sure no other instance of Tor Browser is already running, and that you have extracted Tor Browser in a location that your user has the correct permissions for. If you are running an anti-virus, please see [linkto: My antivirus/malware protection is blocking me from accessing Tor Browser], it is common for anti-virus / anti-malware software to cause this type of issue.</p>" } }

1 0

[translation/support-faq] Update translations for support-faq
by translation＠torproject.org 09 May '18

09 May '18

commit 8705a9c859e4504ea75d99eba6fdee4e956fa7f0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 00:20:03 2018 +0000 Update translations for support-faq --- nb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb.json b/nb.json index fa464d008..a17ae6973 100644 --- a/nb.json +++ b/nb.json @@ -20,7 +20,7 @@ "faq-4": { "id": "#faq-4", "control": "faq-4", - "title": "Which platforms is Tor Browser available for?", + "title": "Hvilke plattformer finnes Tor-nettleseren på?", "description": "<p class=\"mb-3\">Tor Browser is currently available on Windows, Linux and macOS (OS X). For Android, The Guardian Project maintains the Tor-powered apps Orbot and Orfox. There is no official version of Tor for iOS yet, though we recommend Onion Browser.</p>" }, "faq-5": {

1 0

[translation/support-censorship] Update translations for support-censorship
by translation＠torproject.org 09 May '18

09 May '18

commit ff0fc60568ea7f4839b16ad454bc63bf944b96a2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 00:19:48 2018 +0000 Update translations for support-censorship --- nb.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb.json b/nb.json index 8bd329b02..188e34481 100644 --- a/nb.json +++ b/nb.json @@ -20,7 +20,7 @@ "censorship-4": { "id": "#censorship-4", "control": "censorship-4", - "title": "I can’t connect to Tor Browser, is my network censored?", + "title": "Jeg kan ikke koble til med Tor-nettleseren, er nettverket mitt sensurert?", "description": "<p class=\"mb-3\">You might be on a censored network, and so you should try using bridges. Some bridges are built in to Tor Browser, and you can use those bridges by choosing \"configure\" (then following the prompts) in the Tor Launcher window that pops up when you open Tor Browser for the first time. If you need other bridges, you can get them at our <mark><a href=\"https://bridges.torproject.org/\">Bridges website</a></mark>. For more information about bridges, see the <mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a></mark>.</p>" }, "censorship-5": { @@ -32,7 +32,7 @@ "censorship-6": { "id": "#censorship-6", "control": "censorship-6", - "title": "I can’t connect to Tor Browser, is my network censored?", + "title": "Jeg kan ikke koble til med Tor-nettleseren, er nettverket mitt sensurert?", "description": "<p class=\"mb-3\">You might be on a censored network, and so you should try using bridges. Some bridges are built in to Tor Browser, and you can use those bridges by choosing \"configure\" (then following the prompts) in the Tor Launcher window that pops up when you open Tor Browser for the first time. If you need other bridges, you can get them at our <mark><a href=\"https://bridges.torproject.org/\">Bridges website</a></mark>. For more information about bridges, see the <mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a></mark>.</p>" }

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 09 May '18

09 May '18

commit 0cbaea4231d84822dc1905744d572c680bec73ec Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 00:16:32 2018 +0000 Update translations for tor-launcher-network-settings --- nb/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 492b6cd85..781a07619 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -41,8 +41,8 @@ <!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land"> <!ENTITY torsettings.useBridges.default "Velg en bro med flere innfartsårer"> <!ENTITY torsettings.useBridges.default.placeholder "velg en bro"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.bridgeDB "Forespør en bro fra torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Skriv inn tegnene fra bildet"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Send inn"> <!ENTITY torsettings.useBridges.custom "Tilby en bro jeg kjenner">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 09 May '18

09 May '18

commit 7a71ea732bc3003c9c92120f57ab1b1297b7d4b9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 00:16:16 2018 +0000 Update translations for tor-launcher-properties --- nb/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index 8e97a0dc1..4c50bee54 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -26,7 +26,7 @@ torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller v torlauncher.error_proxy_type_missing=Du må velge mellomtjenertypen. torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Forespør en bro. torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har tilkoblingstypen %S tilgjengelig. Juster innstillingene dine. torlauncher.bridge_suffix.meek-amazon=(virker i Kina) @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ingen rute til vert torlauncher.bootstrapWarning.ioerror=lese/skrive -feil torlauncher.bootstrapWarning.pt_missing=pluggbar transport mangler -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Tilkoblingen til tjeneren gitt tapt. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunne ikke koble til tjeneren. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunne ikke koble til mellomtjeneren.

1 0

[tor/master] Mark bug cases of addressmap_get_virtual_address as non-covered
by nickm＠torproject.org 09 May '18

09 May '18

commit 5162cf50212ed8a55ec4c6c87b60b59348233d0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 15:28:40 2018 -0400 Mark bug cases of addressmap_get_virtual_address as non-covered --- src/or/addressmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 96ce27557..133d3f91e 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -959,9 +959,11 @@ addressmap_get_virtual_address(int type) char tmp[TOR_ADDR_BUF_LEN]; tor_addr_to_str(tmp, &addr, sizeof(tmp), 0); if (strmap_get(addressmap, tmp)) { + // LCOV_EXCL_START log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.", buf, tmp); continue; + // LCOV_EXCL_STOP } return tor_strdup(buf); @@ -970,8 +972,10 @@ addressmap_get_virtual_address(int type) log_warn(LD_CONFIG, "Ran out of virtual addresses!"); return NULL; } else { + // LCOV_EXCL_START log_warn(LD_BUG, "Called with unsupported address type (%d)", type); return NULL; + // LCOV_EXCL_STOP } }

1 0

[tor/master] More unit tests for addressmap_get_virtual_address().
by nickm＠torproject.org 09 May '18

09 May '18

commit 24ba5fd748a9a27a6069312961843d5f8f662f93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 15:28:42 2018 -0400 More unit tests for addressmap_get_virtual_address(). Previously the coverage on this function was mostly accidental, coming as it did from test_entryconn.c. These new tests use mocking to ensure that we actually hit the different failure and retry cases of addressmap_get_virtual_address(), and make our test coverage a bit more deterministic. Closes ticket 25993. --- changes/ticket25993 | 4 ++ src/ext/rust | 2 +- src/test/test_addr.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 1 deletion(-) diff --git a/changes/ticket25993 b/changes/ticket25993 new file mode 100644 index 000000000..8eafcd181 --- /dev/null +++ b/changes/ticket25993 @@ -0,0 +1,4 @@ + o Minor features (testing): + - We now have improved testing for addressmap_get_virtual_address() + function. This should improve our test coverage, and make our test + coverage more deterministic. Closes ticket 25993. diff --git a/src/ext/rust b/src/ext/rust index fbc0c2578..e92c124a4 160000 --- a/src/ext/rust +++ b/src/ext/rust @@ -1 +1 @@ -Subproject commit fbc0c25785696a25b9cbc09ed645cc8d404ee0f6 +Subproject commit e92c124a41535bd2131b9506a7d95c68c9d8feda diff --git a/src/test/test_addr.c b/src/test/test_addr.c index e1a40b7e6..505e1533d 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -8,6 +8,7 @@ #include "or.h" #include "test.h" #include "addressmap.h" +#include "log_test_helpers.h" /** Mocking replacement: only handles localhost. */ static int @@ -941,6 +942,158 @@ test_virtaddrmap(void *data) ; } +static const char *canned_data = NULL; +static size_t canned_data_len = 0; + +/* Mock replacement for crypto_rand() that returns canned data from + * canned_data above. */ +static void +crypto_canned(char *ptr, size_t n) +{ + if (canned_data_len) { + size_t to_copy = MIN(n, canned_data_len); + memcpy(ptr, canned_data, to_copy); + canned_data += to_copy; + canned_data_len -= to_copy; + n -= to_copy; + ptr += to_copy; + } + if (n) { + crypto_rand_unmocked(ptr, n); + } +} + +static void +test_virtaddrmap_persist(void *data) +{ + (void)data; + const char *a, *b, *c; + tor_addr_t addr; + char *ones = NULL; + + addressmap_init(); + + // Try a hostname. + a = addressmap_register_virtual_address(RESOLVED_TYPE_HOSTNAME, + tor_strdup("foobar.baz")); + tt_assert(a); + tt_assert(!strcmpend(a, ".virtual")); + + // mock crypto_rand to repeat the same result twice; make sure we get + // different outcomes. (Because even though the odds for receiving the + // same 80-bit address twice is only 1/2^40, it could still happen for + // some user -- but running our test through 2^40 iterations isn't + // reasonable.) + canned_data = "1234567890" // the first call returns this. + "1234567890" // the second call returns this. + "abcdefghij"; // the third call returns this. + canned_data_len = 30; + MOCK(crypto_rand, crypto_canned); + + a = addressmap_register_virtual_address(RESOLVED_TYPE_HOSTNAME, + tor_strdup("quuxit.baz")); + b = addressmap_register_virtual_address(RESOLVED_TYPE_HOSTNAME, + tor_strdup("nescio.baz")); + tt_assert(a); + tt_assert(b); + tt_str_op(a, OP_EQ, "gezdgnbvgy3tqojq.virtual"); + tt_str_op(b, OP_EQ, "mfrggzdfmztwq2lk.virtual"); + + // Now try something to get us an ipv4 address + UNMOCK(crypto_rand); + tt_int_op(0,OP_EQ, parse_virtual_addr_network("192.168.0.0/16", + AF_INET, 0, NULL)); + a = addressmap_register_virtual_address(RESOLVED_TYPE_IPV4, + tor_strdup("foobar.baz")); + tt_assert(a); + tt_assert(!strcmpstart(a, "192.168.")); + tor_addr_parse(&addr, a); + tt_int_op(AF_INET, OP_EQ, tor_addr_family(&addr)); + + b = addressmap_register_virtual_address(RESOLVED_TYPE_IPV4, + tor_strdup("quuxit.baz")); + tt_str_op(b, OP_NE, a); + tt_assert(!strcmpstart(b, "192.168.")); + + // Try some canned entropy and verify all the we discard duplicates, + // addresses that end with 0, and addresses that end with 255. + MOCK(crypto_rand, crypto_canned); + canned_data = "\x01\x02\x03\x04" // okay + "\x01\x02\x03\x04" // duplicate + "\x03\x04\x00\x00" // bad ending 1 + "\x05\x05\x00\xff" // bad ending 2 + "\x05\x06\x07\xf0"; // okay + canned_data_len = 20; + a = addressmap_register_virtual_address(RESOLVED_TYPE_IPV4, + tor_strdup("wumble.onion")); + b = addressmap_register_virtual_address(RESOLVED_TYPE_IPV4, + tor_strdup("wumpus.onion")); + tt_str_op(a, OP_EQ, "192.168.3.4"); + tt_str_op(b, OP_EQ, "192.168.7.240"); + + // Now try IPv6! + UNMOCK(crypto_rand); + tt_int_op(0,OP_EQ, parse_virtual_addr_network("1010:F000::/20", + AF_INET6, 0, NULL)); + a = addressmap_register_virtual_address(RESOLVED_TYPE_IPV6, + tor_strdup("foobar.baz")); + tt_assert(a); + tt_assert(!strcmpstart(a, "[1010:f")); + tor_addr_parse(&addr, a); + tt_int_op(AF_INET6, OP_EQ, tor_addr_family(&addr)); + + b = addressmap_register_virtual_address(RESOLVED_TYPE_IPV6, + tor_strdup("quuxit.baz")); + tt_str_op(b, OP_NE, a); + tt_assert(!strcmpstart(b, "[1010:f")); + + // Try IPv6 with canned entropy, to make sure we detect duplicates. + MOCK(crypto_rand, crypto_canned); + canned_data = "acanthopterygian" // okay + "cinematographist" // okay + "acanthopterygian" // duplicate + "acanthopterygian" // duplicate + "acanthopterygian" // duplicate + "cinematographist" // duplicate + "coadministration"; // okay + canned_data_len = 16 * 7; + a = addressmap_register_virtual_address(RESOLVED_TYPE_IPV6, + tor_strdup("wuffle.baz")); + b = addressmap_register_virtual_address(RESOLVED_TYPE_IPV6, + tor_strdup("gribble.baz")); + c = addressmap_register_virtual_address(RESOLVED_TYPE_IPV6, + tor_strdup("surprisingly-legible.baz")); + tt_str_op(a, OP_EQ, "[1010:f16e:7468:6f70:7465:7279:6769:616e]"); + tt_str_op(b, OP_EQ, "[1010:fe65:6d61:746f:6772:6170:6869:7374]"); + tt_str_op(c, OP_EQ, "[1010:f164:6d69:6e69:7374:7261:7469:6f6e]"); + + // Try address exhaustion: make sure we can actually fail if we + // get too many already-existing addresses. + canned_data_len = 128*1024; + canned_data = ones = tor_malloc(canned_data_len); + memset(ones, 1, canned_data_len); + // There is some chance this one will fail if a previous random + // allocation gave out the address already. + a = addressmap_register_virtual_address(RESOLVED_TYPE_IPV4, + tor_strdup("might-work.onion")); + if (a) { + tt_str_op(a, OP_EQ, "192.168.1.1"); + } + setup_capture_of_logs(LOG_WARN); + // This one will definitely fail, since we've set up the RNG to hand + // out "1" forever. + b = addressmap_register_virtual_address(RESOLVED_TYPE_IPV4, + tor_strdup("wont-work.onion")); + tt_assert(b == NULL); + expect_single_log_msg_containing("Ran out of virtual addresses!"); + + done: + UNMOCK(crypto_rand); + tor_free(ones); + addressmap_free_all(); + teardown_capture_of_logs(); +} + static void test_addr_localname(void *arg) { @@ -1095,6 +1248,7 @@ struct testcase_t addr_tests[] = { ADDR_LEGACY(ip6_helpers), ADDR_LEGACY(parse), { "virtaddr", test_virtaddrmap, 0, NULL, NULL }, + { "virtaddr_persist", test_virtaddrmap_persist, TT_FORK, NULL, NULL }, { "localname", test_addr_localname, 0, NULL, NULL }, { "dup_ip", test_addr_dup_ip, 0, NULL, NULL }, { "sockaddr_to_str", test_addr_sockaddr_to_str, 0, NULL, NULL },

1 0

[tor/master] Merge branch 'ticket25993_squashed'
by nickm＠torproject.org 09 May '18

09 May '18

commit a0f051137de293342d692df1d2cfa1386e5e7769 Merge: 26990f3ad 24ba5fd74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 8 20:09:42 2018 -0400 Merge branch 'ticket25993_squashed' changes/ticket25993 | 4 ++ src/or/addressmap.c | 4 ++ src/test/test_addr.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'hello71/bug23883'
by nickm＠torproject.org 09 May '18

09 May '18

commit 26990f3adc06d6907029d4580abdf3488153737e Merge: 6bfa87d3a 2a3998a2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 8 20:05:35 2018 -0400 Merge remote-tracking branch 'hello71/bug23883' doc/HACKING/HelpfulTools.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)

1 0