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

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

05 Feb '21

commit 2631d9103b77e7306c8a1eb69e3812e2ef4e4198 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 5 16:15:19 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index 87bcc65202..04e847db4a 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -9808,6 +9808,12 @@ msgid "" "24 hours of an abuse ticket. Their ticket system does not reliably handle " "email replies, use the web interface instead. | 2017-10-31 |" msgstr "" +"| [PraHost](https://www.prahost.com/) | - | - | დიახ | დიახ | 2014 წლის " +"ნოემბერში განაცხადეს რომ დაუშვებდნენ გამსვლელ კვანძებს, თუ საჩივრები " +"უყურადღებოდ არ დარჩება. სერვერის მომსახურება შეწყდება თუ „სათანადო“ " +"მოქმედება (იხილეთ: შეზღუდვა) არ მოჰყვებოდა 24 საათში, საჩივრის ბილეთს. მათი " +"ბილეთების სისტემა არაა გამოსადეგი ელფოსტის პასუხებისთვის, სანაცვლოდ " +"ვებგვერდი გამოიყენეთ. | 2017-10-31 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body) @@ -9837,6 +9843,9 @@ msgid "" "Hong Kong VPS type is OpenVZ,and ISP is SoftLayer. VPS locate in Pacnet's " "data centers, Hong Kong. | - | 05/01/16 |" msgstr "" +"| [hosthatch](https://hosthatch.com/) | AS36351 | დიახ | დიახ | არა | მათი " +"ჰონგ-კონგის VPS-სახეობაა OpenVZ, ხოლო ISP არის SoftLayer. VPS განთავსებულია " +"Pacnet-ის მონაცემთა ცენტრებში, ჰონგ-კონგი. | - | 05/01/16 |" #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 7a152997fe2d55acdc9b743242dabff0ec823d6e Merge: d103466282 0a40892e8c Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 16:05:57 2021 +0000 Merge branch 'maint-0.4.5' src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.4] Only check for bindable ports if we are unsure if it will fail.
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 67aefd5520c7d9b3004ee25b860e5b54b3401188 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Feb 4 23:11:11 2021 +0000 Only check for bindable ports if we are unsure if it will fail. We currently assume that the only way for Tor to listen on ports in the privileged port range (1 to 1023), on Linux, is if we are granted the NET_BIND_SERVICE capability. Today on Linux, it's possible to specify the beginning of the unprivileged port range using a sysctl configuration option. Docker (and thus the CI service Tor uses) recently changed this sysctl value to 0, which causes our tests to fail as they assume that we should NOT be able to bind to a privileged port *without* the NET_BIND_SERVICE capability. In this patch, we read the value of the sysctl value via the /proc/sys/ filesystem iff it's present, otherwise we assume the default unprivileged port range begins at port 1024. See: tor#40275 --- src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index baddf8d66e..91277e374f 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -31,7 +31,47 @@ static const struct { { NULL, 0 } }; +/* Returns the first port that we think we can bind to without special + * permissions. Usually this function returns 1024. */ +static uint16_t +unprivileged_port_range_start(void) +{ + uint16_t result = 1024; + +#if defined(__linux__) + char *content = NULL; + + content = read_file_to_str( + "/proc/sys/net/ipv4/ip_unprivileged_port_start", + 0, + NULL); + + if (content != NULL) { + int ok = 1; + uint16_t tmp_result; + + tmp_result = (uint16_t)tor_parse_long(content, 10, 0, 65535, &ok, NULL); + + if (ok) { + result = tmp_result; + } else { + fprintf(stderr, + "Unable to convert ip_unprivileged_port_start to integer: %s\n", + content); + } + } + + tor_free(content); +#endif /* defined(__linux__) */ + + return result; +} + #if !defined(_WIN32) + +#define PORT_TEST_RANGE_START 600 +#define PORT_TEST_RANGE_END 1024 + /* 0 on no, 1 on yes, -1 on failure. */ static int check_can_bind_low_ports(void) @@ -41,7 +81,7 @@ check_can_bind_low_ports(void) memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - for (port = 600; port < 1024; ++port) { + for (port = PORT_TEST_RANGE_START; port < PORT_TEST_RANGE_END; ++port) { sin.sin_port = htons(port); tor_socket_t fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (! SOCKET_OK(fd)) { @@ -149,10 +189,24 @@ main(int argc, char **argv) /* Succeed if we can do a setuid with capability retention, and doing so * does not make us lose the ability to bind low ports */ { - int keepcaps = (test_id == TEST_SETUID_KEEPCAPS); + const int keepcaps = (test_id == TEST_SETUID_KEEPCAPS); okay = switch_id(username, keepcaps ? SWITCH_ID_KEEP_BINDLOW : 0) == 0; + if (okay) { - okay = check_can_bind_low_ports() == keepcaps; + /* Only run this check if there are ports we may not be able to bind + * to. */ + const uint16_t min_port = unprivileged_port_range_start(); + + if (min_port >= PORT_TEST_RANGE_START && + min_port < PORT_TEST_RANGE_END) { + okay = check_can_bind_low_ports() == keepcaps; + } else { + fprintf(stderr, + "Skipping check for whether we can bind to any " + "privileged ports as the user system seems to " + "allow us to bind to ports even without any " + "capabilities set.\n"); + } } break; }

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 4b332ce62a2f661036febca494f2c1f6a03d52b2 Merge: 306e8f87bc 6578a3e865 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 16:05:57 2021 +0000 Merge branch 'maint-0.4.4' into release-0.4.4 src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 6578a3e8659f84152162b643acafacf43487a4a1 Merge: 2933c37188 67aefd5520 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 16:04:53 2021 +0000 Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4 src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 6578a3e8659f84152162b643acafacf43487a4a1 Merge: 2933c37188 67aefd5520 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 16:04:53 2021 +0000 Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4 src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] Only check for bindable ports if we are unsure if it will fail.
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 67aefd5520c7d9b3004ee25b860e5b54b3401188 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Feb 4 23:11:11 2021 +0000 Only check for bindable ports if we are unsure if it will fail. We currently assume that the only way for Tor to listen on ports in the privileged port range (1 to 1023), on Linux, is if we are granted the NET_BIND_SERVICE capability. Today on Linux, it's possible to specify the beginning of the unprivileged port range using a sysctl configuration option. Docker (and thus the CI service Tor uses) recently changed this sysctl value to 0, which causes our tests to fail as they assume that we should NOT be able to bind to a privileged port *without* the NET_BIND_SERVICE capability. In this patch, we read the value of the sysctl value via the /proc/sys/ filesystem iff it's present, otherwise we assume the default unprivileged port range begins at port 1024. See: tor#40275 --- src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index baddf8d66e..91277e374f 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -31,7 +31,47 @@ static const struct { { NULL, 0 } }; +/* Returns the first port that we think we can bind to without special + * permissions. Usually this function returns 1024. */ +static uint16_t +unprivileged_port_range_start(void) +{ + uint16_t result = 1024; + +#if defined(__linux__) + char *content = NULL; + + content = read_file_to_str( + "/proc/sys/net/ipv4/ip_unprivileged_port_start", + 0, + NULL); + + if (content != NULL) { + int ok = 1; + uint16_t tmp_result; + + tmp_result = (uint16_t)tor_parse_long(content, 10, 0, 65535, &ok, NULL); + + if (ok) { + result = tmp_result; + } else { + fprintf(stderr, + "Unable to convert ip_unprivileged_port_start to integer: %s\n", + content); + } + } + + tor_free(content); +#endif /* defined(__linux__) */ + + return result; +} + #if !defined(_WIN32) + +#define PORT_TEST_RANGE_START 600 +#define PORT_TEST_RANGE_END 1024 + /* 0 on no, 1 on yes, -1 on failure. */ static int check_can_bind_low_ports(void) @@ -41,7 +81,7 @@ check_can_bind_low_ports(void) memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - for (port = 600; port < 1024; ++port) { + for (port = PORT_TEST_RANGE_START; port < PORT_TEST_RANGE_END; ++port) { sin.sin_port = htons(port); tor_socket_t fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (! SOCKET_OK(fd)) { @@ -149,10 +189,24 @@ main(int argc, char **argv) /* Succeed if we can do a setuid with capability retention, and doing so * does not make us lose the ability to bind low ports */ { - int keepcaps = (test_id == TEST_SETUID_KEEPCAPS); + const int keepcaps = (test_id == TEST_SETUID_KEEPCAPS); okay = switch_id(username, keepcaps ? SWITCH_ID_KEEP_BINDLOW : 0) == 0; + if (okay) { - okay = check_can_bind_low_ports() == keepcaps; + /* Only run this check if there are ports we may not be able to bind + * to. */ + const uint16_t min_port = unprivileged_port_range_start(); + + if (min_port >= PORT_TEST_RANGE_START && + min_port < PORT_TEST_RANGE_END) { + okay = check_can_bind_low_ports() == keepcaps; + } else { + fprintf(stderr, + "Skipping check for whether we can bind to any " + "privileged ports as the user system seems to " + "allow us to bind to ports even without any " + "capabilities set.\n"); + } } break; }

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 0a40892e8c376a3106cec1a4e9ba74f4dd146e68 Merge: ff1b24fb73 6578a3e865 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 16:05:57 2021 +0000 Merge branch 'maint-0.4.4' into maint-0.4.5 src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 33a0e016e0faf73d01806e1667c38befe8baae4f Merge: 9a81e01b25 0a40892e8c Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 16:05:57 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4
by ahf＠torproject.org 05 Feb '21

05 Feb '21

commit 6578a3e8659f84152162b643acafacf43487a4a1 Merge: 2933c37188 67aefd5520 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 16:04:53 2021 +0000 Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4 src/test/test_switch_id.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-)

1 0