September 2017 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Sep '17

27 Sep '17

commit 2dc96b0af19673036b5d144ee50143ed859cca07 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 27 17:47:10 2017 +0000 Update translations for tails-misc --- nl.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nl.po b/nl.po index 3079a23c4..e905859dd 100644 --- a/nl.po +++ b/nl.po @@ -17,6 +17,7 @@ # Nathan Follens, 2015 # Midgard, 2014 # T. Des Maison <ton.siedsma(a)bof.nl>, 2014 +# Thomas van Voorst <thomasv.voorst(a)hotmail.com>, 2017 # Tjeerd <transifex(a)syrion.net>, 2014 # Tonko Mulder <tonko(a)tonkomulder.nl>, 2015 # Lazlo, 2013 @@ -26,8 +27,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-23 19:05+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-09-27 17:43+0000\n" +"Last-Translator: Thomas van Voorst <thomasv.voorst(a)hotmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -353,4 +354,4 @@ msgstr "Tails specifieke tools" #: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 msgid "To start a Root Terminal, you need to authenticate." -msgstr "" +msgstr "Om een Root terminal te starten moet er eerst geauthenticeerd worden"

1 0

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

27 Sep '17

commit 03a5732d3f031d9e1df57486e182e26500573c7f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 27 17:45:58 2017 +0000 Update translations for liveusb-creator --- nl/nl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 125a06728..749ccad1c 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-25 14:02+0200\n" -"PO-Revision-Date: 2017-09-27 17:14+0000\n" +"PO-Revision-Date: 2017-09-27 17:20+0000\n" "Last-Translator: Thomas van Voorst <thomasv.voorst(a)hotmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -418,7 +418,7 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "" +msgstr "\n\nDe blijvende opslag op deze USB stick zal worden bewaard" #: ../tails_installer/gui.py:726 #, python-format @@ -469,7 +469,7 @@ msgid "" "There was a problem executing `%s`.\n" "%s\n" "%s" -msgstr "" +msgstr "Er was een probleem bij het uitvoeren van ' %s'.%s\n%s" #: ../tails_installer/source.py:63 #, python-format

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 27 Sep '17

27 Sep '17

commit c0da9306d03da60694a9d02e6c34d1d4e8bd3e5e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 27 17:45:22 2017 +0000 Update translations for torcheck_completed --- nl/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torcheck.po b/nl/torcheck.po index efe221c44..07bf99fb2 100644 --- a/nl/torcheck.po +++ b/nl/torcheck.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-09-23 18:03+0000\n" +"PO-Revision-Date: 2017-09-27 17:38+0000\n" "Last-Translator: Cleveridge <erwin.de.laat(a)cleveridge.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 27 Sep '17

27 Sep '17

commit 199e9ac027442f17050aba5b08234aaccc6fe2b5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 27 17:45:16 2017 +0000 Update translations for torcheck --- nl/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torcheck.po b/nl/torcheck.po index efe221c44..07bf99fb2 100644 --- a/nl/torcheck.po +++ b/nl/torcheck.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-09-23 18:03+0000\n" +"PO-Revision-Date: 2017-09-27 17:38+0000\n" "Last-Translator: Cleveridge <erwin.de.laat(a)cleveridge.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

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

27 Sep '17

commit 26ed09362cda58892e4655d1d4a305fdf5257c2f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 27 17:15:58 2017 +0000 Update translations for liveusb-creator --- nl/nl.po | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 0d97d9372..125a06728 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -10,6 +10,7 @@ # Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 # Richard E. van der Luit <nippur(a)fedoraproject.org>, 2012 # Shondoit Walker <shondoit(a)gmail.com>, 2013 +# Thomas van Voorst <thomasv.voorst(a)hotmail.com>, 2017 # Tjeerd <transifex(a)syrion.net>, 2013 # Tonko Mulder <tonko(a)tonkomulder.nl>, 2015 # Lazlo, 2013 @@ -19,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-21 01:33+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-09-27 17:14+0000\n" +"Last-Translator: Thomas van Voorst <thomasv.voorst(a)hotmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -328,11 +329,11 @@ msgstr "" #: ../tails_installer/gui.py:454 msgid "Upgrade" -msgstr "" +msgstr "Upgrade" #: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7 msgid "Install" -msgstr "" +msgstr "Installeren" #: ../tails_installer/gui.py:465 #, python-format @@ -341,15 +342,15 @@ msgstr "" #: ../tails_installer/gui.py:476 msgid "No ISO image selected" -msgstr "" +msgstr "Geen ISO image geselecteerd" #: ../tails_installer/gui.py:477 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "Selecteerd een Tails ISO image" #: ../tails_installer/gui.py:516 msgid "No device suitable to install Tails could be found" -msgstr "" +msgstr "Er kon geen geschikt apparaat voor een Tails installatie worden gevonden" #: ../tails_installer/gui.py:518 #, python-format @@ -373,7 +374,7 @@ msgstr "Het toestel \"%(pretty_name)s\" is te klein om Tails te installeren (hie #: ../tails_installer/gui.py:584 msgid "An error happened while installing Tails" -msgstr "" +msgstr "Er is een fout opgetreden tijdens het installeren van Tails" #: ../tails_installer/gui.py:596 msgid "Refreshing releases..." @@ -389,7 +390,7 @@ msgstr "Installatie afgerond!" #: ../tails_installer/gui.py:644 msgid "Installation was completed." -msgstr "" +msgstr "Installatie afgerond!" #: ../tails_installer/gui.py:693 msgid "Unable to mount device" @@ -397,7 +398,7 @@ msgstr "Kan apparaat niet aankoppelen" #: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730 msgid "Confirm the target USB stick" -msgstr "" +msgstr "Bevestig de doel USB stick" #: ../tails_installer/gui.py:701 #, python-format @@ -473,49 +474,49 @@ msgstr "" #: ../tails_installer/source.py:63 #, python-format msgid "'%s' does not exist" -msgstr "" +msgstr "'%s' bestaat niet" #: ../tails_installer/source.py:65 #, python-format msgid "'%s' is not a directory" -msgstr "" +msgstr "%s is geen directory" #: ../tails_installer/source.py:75 #, python-format msgid "Skipping '%(filename)s'" -msgstr "" +msgstr "'%(filename)s' wordt overgeslagen" #: ../tails_installer/utils.py:44 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" -msgstr "" +msgstr "Er was een probleem bij het uitvoeren van ' %s'.%s\n%s" #: ../tails_installer/utils.py:124 msgid "Could not open device for writing." -msgstr "" +msgstr "Kon het apparaat niet openen om te schrijven." #: ../data/tails-installer.ui.h:1 msgid "Installation Instructions" -msgstr "" +msgstr "Installatie instructies" #: ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" -msgstr "" +msgstr "Clone de huidige Tails" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "Gebruik een gedownloade Tails ISO image" #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:" -msgstr "" +msgstr "Selecteer een distributie om te downloaden:" #: ../data/tails-installer.ui.h:5 msgid "Target USB stick:" -msgstr "" +msgstr "Doel USB stick:" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)" -msgstr "" +msgstr "Herinstalleren (Verwijder alle data)"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Sep '17

27 Sep '17

commit 7dcdab4662e4ca9799feb078d57c95a3bf611826 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 27 17:15:40 2017 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 2204d4bb3..67e26df64 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -24,18 +24,18 @@ <!ENTITY https-everywhere.menu.showCounter "Toon Teller"> <!ENTITY https-everywhere.menu.viewAllRules "Toon Alle Regels"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> +<!ENTITY https-everywhere.options.importSettings "Instellingen importeren"> <!ENTITY https-everywhere.options.import "Importeren"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.imported "De instellingen zijn geÏmporteerd"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere-voorkeuren"> <!ENTITY https-everywhere.prefs.enable_all "Alles inschakelen"> <!ENTITY https-everywhere.prefs.disable_all "Alles uitschakelen"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> -<!ENTITY https-everywhere.prefs.settings_warning "Warning:"> +<!ENTITY https-everywhere.prefs.export_settings "Instellingen exporteren"> +<!ENTITY https-everywhere.prefs.settings_warning "Waarschuwing:"> <!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!"> <!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:"> -<!ENTITY https-everywhere.prefs.settings_global "Global preferences"> +<!ENTITY https-everywhere.prefs.settings_global "Globale voorkeuren"> <!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting"> <!ENTITY https-everywhere.prefs.settings_custom "Custom site rules"> <!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">

1 0

[tor/master] socks5 unit tests: add check for ipv6 address type.
by nickm＠torproject.org 27 Sep '17

27 Sep '17

commit 5418aa84eec9f08af7ab7b68cbc9145750ad0a1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 27 11:23:09 2017 -0400 socks5 unit tests: add check for ipv6 address type. --- src/test/test_socks.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/test/test_socks.c b/src/test/test_socks.c index f39d845bc..fbc540789 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -204,6 +204,24 @@ test_socks_5_supported_commands(void *ptr) tt_int_op(0,OP_EQ, buf_datalen(buf)); socks_request_clear(socks); + /* SOCKS 5 Send CONNECT [01] to one of the ipv6 addresses for + torproject.org:80 */ + ADD_DATA(buf, "\x05\x01\x00"); + ADD_DATA(buf, "\x05\x01\x00\x04" + "\x20\x02\x41\xb8\x02\x02\x0d\xeb\x02\x13\x21\xff\xfe\x20\x14\x26" + "\x00\x50"); + tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks),OP_EQ, 1); + tt_int_op(5,OP_EQ, socks->socks_version); + tt_int_op(2,OP_EQ, socks->replylen); + tt_int_op(5,OP_EQ, socks->reply[0]); + tt_int_op(0,OP_EQ, socks->reply[1]); + tt_str_op("[2002:41b8:202:deb:213:21ff:fe20:1426]",OP_EQ, socks->address); + tt_int_op(80,OP_EQ, socks->port); + + tt_int_op(0,OP_EQ, buf_datalen(buf)); + socks_request_clear(socks); + /* SOCKS 5 Send CONNECT [01] to FQDN torproject.org:4369 */ ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\x01\x00\x03\x0Etorproject.org\x11\x11");

1 0

[tor/master] Mark some tests in parse_socks.c as unreachable (BUG, LCOV)
by nickm＠torproject.org 27 Sep '17

27 Sep '17

commit 14124f82dfbdf68e202f6e5f8220e6567e7a9d1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 27 11:15:03 2017 -0400 Mark some tests in parse_socks.c as unreachable (BUG, LCOV) These tests aren't reachable, given their actual arguments. I'm going to mark them as BUG(), and as unreachable with LCOV. --- src/or/proto_socks.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c index f92d61491..3fb3a131d 100644 --- a/src/or/proto_socks.c +++ b/src/or/proto_socks.c @@ -340,13 +340,16 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, tor_addr_to_str(tmpbuf, &destaddr, sizeof(tmpbuf), 1); - if (strlen(tmpbuf)+1 > MAX_SOCKS_ADDR_LEN) { + if (BUG(strlen(tmpbuf)+1 > MAX_SOCKS_ADDR_LEN)) { + /* LCOV_EXCL_START -- This branch is unreachable, given the + * size of tmpbuf and the actual value of MAX_SOCKS_ADDR_LEN */ socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); log_warn(LD_APP, "socks5 IP takes %d bytes, which doesn't fit in %d. " "Rejecting.", (int)strlen(tmpbuf)+1,(int)MAX_SOCKS_ADDR_LEN); return -1; + /* LCOV_EXCL_STOP */ } strlcpy(req->address,tmpbuf,sizeof(req->address)); req->port = ntohs(get_uint16(data+4+addrlen)); @@ -375,12 +378,15 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, *want_length_out = 7+len; return 0; /* not yet */ } - if (len+1 > MAX_SOCKS_ADDR_LEN) { + if (BUG(len+1 > MAX_SOCKS_ADDR_LEN)) { + /* LCOV_EXCL_START -- unreachable, since len is at most 255, + * and MAX_SOCKS_ADDR_LEN is 256. */ socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); log_warn(LD_APP, "socks5 hostname is %d bytes, which doesn't fit in " "%d. Rejecting.", len+1,MAX_SOCKS_ADDR_LEN); return -1; + /* LCOV_EXCL_STOP */ } memcpy(req->address,data+5,len); req->address[len] = 0; @@ -443,10 +449,13 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, log_debug(LD_APP,"socks4: destip not in form 0.0.0.x."); in.s_addr = htonl(destip); tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); - if (strlen(tmpbuf)+1 > MAX_SOCKS_ADDR_LEN) { + if (BUG(strlen(tmpbuf)+1 > MAX_SOCKS_ADDR_LEN)) { + /* LCOV_EXCL_START -- This branch is unreachable, given the + * size of tmpbuf and the actual value of MAX_SOCKS_ADDR_LEN */ log_debug(LD_APP,"socks4 addr (%d bytes) too long. Rejecting.", (int)strlen(tmpbuf)); return -1; + /* LCOV_EXCL_STOP */ } log_debug(LD_APP, "socks4: successfully read destip (%s)",

1 0

[tor/master] Socks tests for bad socks5 username/passwd auth.
by nickm＠torproject.org 27 Sep '17

27 Sep '17

commit 04f7873babeecddae05186002d26f2be506c1ec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 27 11:16:29 2017 -0400 Socks tests for bad socks5 username/passwd auth. --- src/test/test_socks.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 74dd75793..f39d845bc 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -405,6 +405,48 @@ test_socks_5_authenticate_with_data(void *ptr) ; } +/** Try to negotiate an unsupported authentication type */ +static void +test_socks_5_auth_unsupported_type(void *ptr) +{ + SOCKS_TEST_INIT(); + + /* None of these authentication types are recognized. */ + ADD_DATA(buf, "\x05\x03\x99\x21\x10"); + tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), + OP_EQ, -1); + tt_int_op(0,OP_EQ, socks->socks_version); + tt_int_op(2,OP_EQ, socks->replylen); + tt_int_op(5,OP_EQ, socks->reply[0]); + tt_int_op(0xff,OP_EQ, socks->reply[1]); + + done: + ; +} + +/** Try to negotiate an unsupported version of username/password auth. */ +static void +test_socks_5_auth_unsupported_version(void *ptr) +{ + SOCKS_TEST_INIT(); + + /* Negotiate username/password */ + ADD_DATA(buf, "\x05\x01\x02"); + tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), + OP_EQ, 0); + tt_int_op(0,OP_EQ, buf_datalen(buf)); /* buf should be drained */ + /* Now, suggest an unrecognized username/password version */ + ADD_DATA(buf, "\x02\x05" "hello" "\x05" "world"); + tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), + OP_EQ, -1); + + done: + ; +} + /** Perform SOCKS 5 authentication before method negotiated */ static void test_socks_5_auth_before_negotiation(void *ptr) @@ -606,6 +648,8 @@ struct testcase_t socks_tests[] = { SOCKSENT(5_unsupported_commands), SOCKSENT(5_supported_commands), SOCKSENT(5_no_authenticate), + SOCKSENT(5_auth_unsupported_type), + SOCKSENT(5_auth_unsupported_version), SOCKSENT(5_auth_before_negotiation), SOCKSENT(5_authenticate), SOCKSENT(5_authenticate_with_data),

1 0

[tor/master] testing: test many possible truncated SOCKS commands
by nickm＠torproject.org 27 Sep '17

27 Sep '17

commit 5427365907ef42a25ba1f3de072dcd6244e7a75b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 27 10:54:56 2017 -0400 testing: test many possible truncated SOCKS commands Many of the 'truncated command' paths in fetch_from_buf_socks() were not reached by the tests. This new unit test tries to check them exhaustively. --- src/test/test_socks.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 6dc8215a9..74dd75793 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -497,6 +497,105 @@ test_socks_5_malformed_commands(void *ptr) ; } +/** check for correct behavior when the socks command has not arrived. */ +static void +test_socks_truncated(void *ptr) +{ + const struct { + enum { NONE, AUTH, ALL } setup; + const char *body; + size_t len; + } commands[] = { + /* SOCKS4 */ + /* Connect, to an IP. */ + { NONE, "\x04\x01\x05\x05\x01\x02\x03\x04\x00", 9}, + /* Connect, to an IP, with authentication. */ + { NONE, "\x04\x01\x05\x05\x01\x02\x03\x04hello\x00", 14}, + /* SOCKS4A */ + /* Connect, to a hostname */ + { NONE, "\x04\x01\x09\x09\x00\x00\x00\x01\x00www.example.com\x00", 25}, + /* Connect, to a hostname, with authentication */ + { NONE, "\x04\x01\x09\x09\x00\x00\x00\x01hi\x00www.example.com\x00", 27}, + /* SOCKS5 */ + /* initial handshake */ + { NONE, "\x05\x00", 2 }, + /* no-auth handshake */ + { NONE, "\x05\x03\x99\x21\x10", 5 }, + /* SOCSK5, username-password, all empty. */ + { AUTH, "\x01\x00\x00", 3 }, + /* SOCSK5, username-password, 1 char each. */ + { AUTH, "\x01\x01x\x01y", 5 }, + /* SOCSK5, username-password, max length. */ + { AUTH, "\x01\xff" + "Ogni tempo ha il suo fascismo: se ne notano i segni premonitori " + "dovunque la concentrazione di potere nega al cittadino la " + "possibilit\xc3\xa0 e la capacit\xc3\xa0 di esprimere ed attuare la " + "sua volont\xc3\xa0. A questo si arriva in molti modi, non " + "necessariamente col terror" + "\xff" + "e dell'intimidazione poliziesca, ma anche negando o distorcendo " + "l'informazione, inquinando la giustizia, paralizzando la scuola, " + "diffondendo in molti modi sottili la nostalgia per un mondo in cui " + "regnava sovrano l'ordine, ed in cui la sicurezza dei pochi " + /* privilegiati riposava sul lavoro forzato e sul silenzio forzato dei + molti. -- Primo Levi */ , 513 }, + /* Socks5, IPv4 address */ + { ALL, "\x05\x01\x00\x01\x01\x02\x03\x04\x20\x20", 10 }, + /* Socks5, IPv6 address */ + { ALL, "\x05\x01\x00\x04" + "\x49\x20\x48\x41\x5a\x20\x45\x41\x53\x54\x45\x52\x20\x45\x47\x47" + "\x20\x20", 22 }, + /* Socks5, hostname, empty. */ + { ALL, "\x05\x01\x00\x03" "\x00" "\x00\x50", 7 }, + /* Socks5, hostname, moderate. */ + { ALL, "\x05\x01\x00\x03" "\x11" "onion.example.com" "\x00\x50", 24 }, + /* Socks5, hostname, maximum. */ + { ALL, "\x05\x01\x00\x03" "\xff" + "whatsoever.I.shall.see.or.hear.in.the.course.of.my.profession.as.well." + "as.outside.my.profession.in.my.intercourse.with.men.if.it.be.what." + "should.not.be.published.abroad.I.will.never.divulge.holding.such." + "things.to.be.holy.secrets.x.hippocratic.oath.wikipedia" + "\x00\x50", 262 }, + }; + unsigned i, j; + SOCKS_TEST_INIT(); + for (i = 0; i < ARRAY_LENGTH(commands); ++i) { + for (j = 0; j < commands[i].len; ++j) { + switch (commands[i].setup) { + default: /* Falls through */ + case NONE: + /* This test calls for no setup on the socks state. */ + break; + case AUTH: + /* This test calls for the socks state to be waiting for + * username/password authentication */ + ADD_DATA(buf, "\x05\x01\x02"); + tt_int_op(0, OP_EQ, fetch_from_buf_socks(buf, socks, 0, 0)); + tt_int_op(0, OP_EQ, buf_datalen(buf)); + break; + case ALL: + /* This test calls for the socks state to be waiting for + * the connection request */ + ADD_DATA(buf, "\x05\x01\x00"); + tt_int_op(0, OP_EQ, fetch_from_buf_socks(buf, socks, 0, 0)); + tt_int_op(0, OP_EQ, buf_datalen(buf)); + } + + TT_BLATHER(("Checking command %u, length %u, omitting char %u", i, j, + (unsigned)commands[i].body[j])); + buf_add(buf, commands[i].body, j); + /* This should return 0 meaning "not done yet" */ + tt_int_op(0, OP_EQ, fetch_from_buf_socks(buf, socks, 0, 0)); + tt_uint_op(j, OP_EQ, buf_datalen(buf)); /* Nothing was drained */ + buf_clear(buf); + socks_request_free(testdata->req); + socks = testdata->req = socks_request_new(); + } + } + done: + ; +} + #define SOCKSENT(name) \ { #name, test_socks_##name, TT_FORK, &socks_setup, NULL } @@ -512,6 +611,8 @@ struct testcase_t socks_tests[] = { SOCKSENT(5_authenticate_with_data), SOCKSENT(5_malformed_commands), + SOCKSENT(truncated), + END_OF_TESTCASES };

1 0