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

[tor/master] Don't do a DNS lookup on a bridge line address
by nickm＠torproject.org 05 Apr '14

05 Apr '14

commit 9c0a1adfa21f12e6682fa26d43fbf91bab4e6fc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 15:31:29 2014 -0400 Don't do a DNS lookup on a bridge line address Fixes bug 10801; bugfix on 07bf274d in 0.2.0.1-alpha. --- changes/bug10801 | 4 ++++ src/common/address.c | 16 ++++++++++++---- src/common/address.h | 3 ++- src/or/config.c | 10 ++-------- src/test/test_addr.c | 26 ++++++++++++++++++++------ 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/changes/bug10801 b/changes/bug10801 new file mode 100644 index 0000000..201bbea --- /dev/null +++ b/changes/bug10801 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Stop accepting bridge lines containing hostnames. Doing so allowed + clients to perform DNS requests on the hostnames, which was not + sensible behavior. Fixes bug 10801; bugfix on 0.2.0.1-alpha. diff --git a/src/common/address.c b/src/common/address.c index 14a7b6b..3e89861 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1439,12 +1439,16 @@ is_internal_IP(uint32_t ip, int for_listening) * to the port. * * Don't do DNS lookups and don't allow domain names in the <ip> field. - * Don't accept addrport of the form "<ip>" or "<ip>:0". + * + * If default_port is less than 0, don't accept addrport of the + * form "<ip>" or "<ip>:0". Otherwise, accept those forms, and set + * *port_out to default_port. * * Return 0 on success, -1 on failure. */ int tor_addr_port_parse(int severity, const char *addrport, - tor_addr_t *address_out, uint16_t *port_out) + tor_addr_t *address_out, uint16_t *port_out, + int default_port) { int retval = -1; int r; @@ -1458,8 +1462,12 @@ tor_addr_port_parse(int severity, const char *addrport, if (r < 0) goto done; - if (!*port_out) - goto done; + if (!*port_out) { + if (default_port >= 0) + *port_out = default_port; + else + goto done; + } /* make sure that address_out is an IP address */ if (tor_addr_parse(address_out, addr_tmp) < 0) diff --git a/src/common/address.h b/src/common/address.h index 77e5855..7afcb0d 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -209,7 +209,8 @@ int tor_addr_port_split(int severity, const char *addrport, char **address_out, uint16_t *port_out); int tor_addr_port_parse(int severity, const char *addrport, - tor_addr_t *address_out, uint16_t *port_out); + tor_addr_t *address_out, uint16_t *port_out, + int default_port); int tor_addr_hostname_is_local(const char *name); diff --git a/src/or/config.c b/src/or/config.c index ef02946..fc959f7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4169,16 +4169,10 @@ parse_bridge_line(const char *line, int validate_only) addrport = field1; } - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + if (tor_addr_port_parse(LOG_INFO, addrport, &addr, &port, 443)<0) { log_warn(LD_CONFIG, "Error parsing Bridge address '%s'", addrport); goto err; } - if (!port) { - log_info(LD_CONFIG, - "Bridge address '%s' has no port; using default port 443.", - addrport); - port = 443; - } if (smartlist_len(items)) { fingerprint = smartlist_join_strings(items, "", 0, NULL); @@ -4384,7 +4378,7 @@ get_bindaddr_from_transport_listen_line(const char *line,const char *transport) goto err; /* Validate addrport */ - if (tor_addr_port_parse(LOG_WARN, addrport, &addr, &port)<0) { + if (tor_addr_port_parse(LOG_WARN, addrport, &addr, &port, -1)<0) { log_warn(LD_CONFIG, "Error parsing ServerTransportListenAddr " "address '%s'", addrport); goto err; diff --git a/src/test/test_addr.c b/src/test/test_addr.c index fec85a4..5452ee9 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -735,7 +735,7 @@ test_addr_parse(void) /* Correct call. */ r= tor_addr_port_parse(LOG_DEBUG, "192.0.2.1:1234", - &addr, &port); + &addr, &port, -1); test_assert(r == 0); tor_addr_to_str(buf, &addr, sizeof(buf), 0); test_streq(buf, "192.0.2.1"); @@ -744,31 +744,45 @@ test_addr_parse(void) /* Domain name. */ r= tor_addr_port_parse(LOG_DEBUG, "torproject.org:1234", - &addr, &port); + &addr, &port, -1); test_assert(r == -1); /* Only IP. */ r= tor_addr_port_parse(LOG_DEBUG, "192.0.2.2", - &addr, &port); + &addr, &port, -1); test_assert(r == -1); + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2", + &addr, &port, 200); + test_assert(r == 0); + tt_int_op(port,==,200); + /* Bad port. */ r= tor_addr_port_parse(LOG_DEBUG, "192.0.2.2:66666", - &addr, &port); + &addr, &port, -1); + test_assert(r == -1); + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2:66666", + &addr, &port, 200); test_assert(r == -1); /* Only domain name */ r= tor_addr_port_parse(LOG_DEBUG, "torproject.org", - &addr, &port); + &addr, &port, -1); + test_assert(r == -1); + r= tor_addr_port_parse(LOG_DEBUG, + "torproject.org", + &addr, &port, 200); test_assert(r == -1); /* Bad IP address */ r= tor_addr_port_parse(LOG_DEBUG, "192.0.2:1234", - &addr, &port); + &addr, &port, -1); test_assert(r == -1); done:

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 05 Apr '14

05 Apr '14

commit 83bdaf9d9d189f878b0f913ff10087543c5d3536 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 5 13:45:15 2014 +0000 Update translations for https_everywhere --- is/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/https-everywhere.dtd b/is/https-everywhere.dtd index 6523c7b..5730015 100644 --- a/is/https-everywhere.dtd +++ b/is/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "Búið til af"> <!ENTITY https-everywhere.about.librarians ""Ruleset Librarians""> <!ENTITY https-everywhere.about.thanks "þökk sé"> -<!ENTITY https-everywhere.about.contribute "Ef þú vilt HTTPS Alls staðar, þú might íhuga"> +<!ENTITY https-everywhere.about.contribute "Ef þér líkar HTTPS Alls staðar, vildirðu íhuga"> <!ENTITY https-everywhere.about.donate_tor "Framlag til Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.donate_eff "Framlag til EFF">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Apr '14

05 Apr '14

commit 23a1bb555cd1085a4ff0a938d7abd62f1e22b71a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 5 09:45:34 2014 +0000 Update translations for tor-launcher-network-settings --- it/network-settings.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 2f17932..c319724 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -46,7 +46,8 @@ <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default " +"> <!ENTITY torsettings.useBridges.type "Tipo di trasporto:"> <!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati"> <!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)">

1 0

[metrics-tasks/master] Added command-line-argument feature and cleared some indentation errors(#9889).
by karsten＠torproject.org 05 Apr '14

05 Apr '14

commit 0dabd9903c8005d344a3860063fe5c44f5cf2e8f Author: Sreenatha Bhatlapenumarthi <sreenatha.dev(a)gmail.com> Date: Thu Apr 3 22:17:49 2014 +0530 Added command-line-argument feature and cleared some indentation errors(#9889). Also implemented the recommended way of checking for keys in dictionaries. --- task-9889/tshirt.py | 57 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py index d9f5962..eddcb6c 100755 --- a/task-9889/tshirt.py +++ b/task-9889/tshirt.py @@ -1,6 +1,8 @@ #!/usr/bin/python -import urllib, urllib2 +import sys +import urllib +import urllib2 import json import threading import _strptime @@ -9,8 +11,9 @@ from datetime import timedelta, datetime TWO_MONTHS = 2 * 30 * 86400 -def print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_percent, avg_bandwidth): - """ Provides debugging information about relay operator's eligibility +def print_debug_info(fingerprint, first_seen_check, exit_port_check, + uptime_percent, avg_bandwidth): + """ Provides debugging information about relay operator's eligibility for acquiring a t-shirt """ print("=================================================================") @@ -26,7 +29,8 @@ def print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_perc if avg_bandwidth == -1: print("Average bandwidth in past 2 months : Insufficient data") else: - print("Average bandwidth in past 2 months : " + str(avg_bandwidth) + "KBytes/s") + print("Average bandwidth in past 2 months : " + str(avg_bandwidth) + + "KBytes/s") print("\nEligibility") print("------------") @@ -42,18 +46,19 @@ def print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_perc if avg_bandwidth >= 500: print("Eligible for T-shirt") print("Reason : Average bandwidth greater than 500KBytes/s and " - "relay uptime greater than 95%") + "relay uptime greater than 95%") else: print("Not eligible for T-shirt") - print("Reason : Average bandwidth less than 500KBytes/s and port 80 blocked") + print("Reason : Average bandwidth less than 500KBytes/s and " + "port 80 blocked") else: if avg_bandwidth < 100: print("Not eligible for T-shirt") print("Reason : Average bandwidth less than 100KBytes/s") else: print("Eligible for T-shirt") - print("Reason : Average bandwidth greater than 100KBytes/s," - "relay uptime greater than 95% and port 80 unblocked") + print("Reason : Average bandwidth greater than 100KBytes/s," + "relay uptime greater than 95% and port 80 unblocked") print("") @@ -70,7 +75,7 @@ def fetch_data(doc_type, params): except urllib2.HTTPError, error: print("Error " + str(error.code) + ": " + error.reason) exit() - # Exit if no relay object in response + # Exit if no relay object in response response_dict = json.loads(response.read()) if response_dict['relays'] == []: print("Error: No such relay") @@ -83,11 +88,11 @@ def calculate_2mo_avg(response, response_type): # Check if required data is present in the response if response_type == 'uptime': - if '3_months' not in response['uptime'].keys(): + if '3_months' not in response['uptime']: return -1 data = response['uptime']['3_months'] elif response_type == 'bandwidth': - if '3_months' not in response['write_history'].keys(): + if '3_months' not in response['write_history']: return -1 data = response['write_history']['3_months'] # Sum up all values within past 2 months @@ -103,7 +108,7 @@ def calculate_2mo_avg(response, response_type): _sum += (data['values'][i]) count += 1 # Calculate the result - return (_sum * data['factor'])/count + return (_sum * data['factor']) / count def check_in_ports(ports): @@ -113,8 +118,8 @@ def check_in_ports(ports): if entry == '80': return True if '-' in entry: - [x,y] = entry.split('-') - if 80 in range(int(x),int(y)): + [x, y] = entry.split('-') + if 80 in range(int(x), int(y)): return True return False @@ -148,16 +153,16 @@ def get_avg_bandwidth(response): """ Calculates average bandwidth of traffic through the relay """ return round(calculate_2mo_avg(response, 'bandwidth') / 1000.0, 2) - + def check_tshirt(search_query): - """ Fetches required onionoo documents and evaluates the + """ Fetches required onionoo documents and evaluates the t-shirt qualification criteria for each of the relays """ # Fetch the required documents from onionoo params = { - 'type' : 'relay', - 'search' : search_query + 'type': 'relay', + 'search': search_query } bandwidth_data = fetch_data('bandwidth', params)['relays'] print "Fetched bandwidth document" @@ -167,16 +172,26 @@ def check_tshirt(search_query): details_data = fetch_data('details', params)['relays'] print "Fetched details document" + if not len(bandwidth_data) == len(uptime_data) == len(details_data): + print("Oops! Inconsistent onionoo data") + exit() + for i in range(len(details_data)): fingerprint = details_data[i]['fingerprint'] first_seen_check = check_first_seen(details_data[i]) exit_port_check = check_exit_port(details_data[i]) uptime_percent = get_uptime_percent(uptime_data[i]) avg_bandwidth = get_avg_bandwidth(bandwidth_data[i]) - print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_percent, avg_bandwidth) + print_debug_info(fingerprint, first_seen_check, exit_port_check, + uptime_percent, avg_bandwidth) if __name__ == "__main__": - search_query = raw_input('Enter relay search-query : ') + if len(sys.argv) == 1: + search_query = raw_input('Enter relay search-query : ') + elif len(sys.argv) != 2: + print("Usage: python %s search_term(optional)" % sys.argv[0]) + exit() + else: + search_query = sys.argv[1] check_tshirt(search_query) -

1 0

r26692: {website} s/obfs2, obfs3/obfs3/ (website/trunk/projects/en)
by Matt Pagan 05 Apr '14

05 Apr '14

Author: mttp Date: 2014-04-05 08:08:20 +0000 (Sat, 05 Apr 2014) New Revision: 26692 Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml website/trunk/projects/en/obfsproxy-instructions.wml Log: s/obfs2,obfs3/obfs3/ Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-debian-instructions.wml 2014-04-04 10:52:19 UTC (rev 26691) +++ website/trunk/projects/en/obfsproxy-debian-instructions.wml 2014-04-05 08:08:20 UTC (rev 26692) @@ -74,7 +74,7 @@ \## CHANGEME_2 -> provide some email address so we can contact you if there's a problem \#ContactInfo CHANGEME_2 -ServerTransportPlugin obfs2,obfs3 exec /usr/bin/obfsproxy managed +ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed </pre> Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2014-04-04 10:52:19 UTC (rev 26691) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2014-04-05 08:08:20 UTC (rev 26692) @@ -89,7 +89,7 @@ <tt>## CHANGEME_2 -> provide some email address so we can contact you if there's a problem</tt> <tt>#ContactInfo CHANGEME_2</tt> - <tt>ServerTransportPlugin obfs2,obfs3 exec /usr/local/bin/obfsproxy managed</tt> + <tt>ServerTransportPlugin obfs3 exec /usr/local/bin/obfsproxy managed</tt>

1 0

[flashproxy/master] ChangeLog for #11290.
by dcf＠torproject.org 05 Apr '14

05 Apr '14

commit da5781e66b0410e2194b65329b68f65561b51f4c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 4 18:27:05 2014 -0700 ChangeLog for #11290. --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index a7d7095..18582ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ o Fixed a bug in the browser proxy which caused it to stop accepting new connections once it had failed 5 previous connections. + o Updated the Tor Browser detection for the Firefox 24.0 User-Agent + string. Patch by Arlo Breault. Fixes bug 11290. + Changes in version 1.6 o Allowed the --port-forwarding option to work when the remote port number is given as 0.

1 0

[flashproxy/master] Latest TBB isn't recognized as likely
by dcf＠torproject.org 05 Apr '14

05 Apr '14

commit 4a86adafebab526f73307993bc3cb3a729d083b2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Mar 23 19:48:57 2014 -0700 Latest TBB isn't recognized as likely * Adds a v24 userAgent string. * Adds a test for is_likely_tor_browser(). --- proxy/flashproxy-test.js | 27 +++++++++++++++++++++++++++ proxy/flashproxy.js | 1 + 2 files changed, 28 insertions(+) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index e004ee8..fc4fcd2 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -345,6 +345,32 @@ function test_have_websocket_binary_frames() { window.navigator = _navigator; } +function test_is_likely_tor_browser() { + var TESTS = [ + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:10.0.2) Gecko/20100101 Firefox/10.0.2", expected: false }, + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:11.0) Gecko/20100101 Firefox/11.0", expected: false }, + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36", expected: false }, + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/536.30.1 (KHTML, like Gecko) Version/6.0.5 Safari/536.30.1", expected: false }, + { ua: "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0", expected: true }, + { ua: "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0", expected: true }, + { ua: "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0", expected: true }, + { expected: false }, // no userAgent + ]; + var _navigator = window.navigator; + window.navigator = { mimeTypes: [] }; + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + window.navigator.userAgent = test.ua; + var actual = is_likely_tor_browser(); + + if (objects_equal(actual, test.expected)) + pass(test.ua); + else + fail(test.ua, test.expected, actual); + } + window.navigator = _navigator; +} + test_build_url(); test_parse_cookie_string(); test_parse_query_string(); @@ -353,6 +379,7 @@ test_parse_addr_spec(); test_get_param_addr(); test_lang_keys(); test_have_websocket_binary_frames(); +test_is_likely_tor_browser(); if (num_failed == 0) process.exit(0); diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 12c4c1e..e50785c 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -1049,6 +1049,7 @@ function safe_repr(s) { var TBB_UAS = [ "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0", + "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0", ]; function is_likely_tor_browser() { return TBB_UAS.indexOf(window.navigator.userAgent) > -1

1 0

[torsocks/master] Fix: change TSOCKS_LOOPBACK bitness
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 8cedb97d013a4d78e81685c45339479e68354db5 Author: Lunar <lunar(a)torproject.org> Date: Mon Mar 24 19:31:50 2014 -0400 Fix: change TSOCKS_LOOPBACK bitness This changes the loopback constant to be in host byte order and use htonl() when needed in network byte order. With this, tests pass on powerpc. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 4 ++-- src/common/utils.c | 2 +- tests/unit/test_utils.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index e977b41..2058a23 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -101,8 +101,8 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #define TSOCKS_CLASSA_NET 0xff000000 #define TSOCKS_LOOPBACK_NET 0x7f000000 -/* Loopback address in network byte order. */ -#define TSOCKS_LOOPBACK 0x0100007f +/* Loopback addresses. */ +#define TSOCKS_LOOPBACK 0x7f000001 #define TSOCKS_LOOPBACK6 { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #define TSOCKS_ANY ((unsigned long int) 0x00000000) #define TSOCKS_ANY6 { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } diff --git a/src/common/utils.c b/src/common/utils.c index 890bbde..377dcae 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -277,7 +277,7 @@ int utils_localhost_resolve(const char *name, int af, void *buf, size_t len) assert(buf); if (af == AF_INET) { - const in_addr_t addr = TSOCKS_LOOPBACK; + const in_addr_t addr = htonl(TSOCKS_LOOPBACK); entry = match_name(name, localhost_names_v4); if (entry) { diff --git a/tests/unit/test_utils.c b/tests/unit/test_utils.c index a115db1..dc5b0ca 100644 --- a/tests/unit/test_utils.c +++ b/tests/unit/test_utils.c @@ -64,7 +64,7 @@ static void test_is_address_ipv6(void) static void test_localhost_resolve(void) { int ret = 0; - in_addr_t ipv4, loopback = TSOCKS_LOOPBACK; + in_addr_t ipv4, loopback = htonl(TSOCKS_LOOPBACK); struct in6_addr ipv6; const uint8_t loopback6[] = TSOCKS_LOOPBACK6; @@ -117,7 +117,7 @@ static void test_sockaddr_is_localhost(void) diag("Utils sockaddr is localhost"); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = TSOCKS_LOOPBACK; + sin.sin_addr.s_addr = htonl(TSOCKS_LOOPBACK); ret = utils_sockaddr_is_localhost((const struct sockaddr *) &sin); ok(ret == 1, "Loopback matches localhost");

1 0

[torsocks/master] Fix: add autogen.sh to installation procedures
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit d53279bca3bee6523350e585f9b8b3fc22c49f14 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Mar 26 09:59:53 2014 -0400 Fix: add autogen.sh to installation procedures Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9137849..7dff09e 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ will force the application to quit and stop everything. Installation ----------------- + $ ./autogen.sh $ ./configure $ make $ sudo make install

1 0

[torsocks/master] Fix: socketpair() denied for INET[6] socket
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 44748d5103be53801212ed9feeffaddc30ea420a Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Mar 31 15:58:15 2014 -0400 Fix: socketpair() denied for INET[6] socket The SOCK_STREAM check was wrong since you could pass SOCK_DGRAM and match the check so the socketpair() now denies INET/INET6 socket. Note that socketpair() only supports AF_UNIX and AF_LOCAL on most *nix system. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/socketpair.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib/socketpair.c b/src/lib/socketpair.c index a358124..c1c70f7 100644 --- a/src/lib/socketpair.c +++ b/src/lib/socketpair.c @@ -32,17 +32,10 @@ LIBC_SOCKETPAIR_RET_TYPE tsocks_socketpair(LIBC_SOCKETPAIR_SIG) DBG("[socketpair] Creating socket with domain %d, type %d and protocol %d", domain, type, protocol); - switch (type) { - case SOCK_STREAM: - break; - default: - if (domain == AF_INET || domain == AF_INET6) { - ERR("Non TCP socketpair denied. Tor network can't handle it. " - "Stopping everything!"); - errno = EINVAL; - return -1; - } - break; + if (domain == AF_INET || domain == AF_INET6) { + DBG("Non TCP socketpair denied. Tor network can't handle it."); + errno = EPERM; + return -1; } /* Stream socket for INET/INET6 is good so open it. */

1 0