tor-commits June 2020

tor-commits@lists.torproject.org

17 participants
1326 discussions

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 854e4df581f68bc05e3e7f9589f9703e09130273 Merge: 7c7e2e2fe 754d4e9a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 12:37:30 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[snowflake-mobile/master] Created a workable UI and created a service class
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 49c4d5c62078d3831d66bb159d9b164fad2e90ff Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 3 20:23:45 2020 +0530 Created a workable UI and created a service class --- .idea/misc.xml | 2 +- .../org/torproject/snowflake/MainActivity.java | 30 ++++++++++++++++++++++ .../torproject/snowflake/MyPersistentService.java | 16 ++++++++++++ app/src/main/res/layout/activity_main.xml | 10 ++++---- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59..37a7509 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 31b77ff..240e285 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -2,7 +2,11 @@ package org.torproject.snowflake; import androidx.appcompat.app.AppCompatActivity; +import android.app.ActivityManager; +import android.content.Context; import android.os.Bundle; +import android.widget.Button; +import android.widget.Toast; public class MainActivity extends AppCompatActivity { @@ -10,5 +14,31 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + + Button startButton = findViewById(R.id.start_button); + + startButton.setOnClickListener(v -> { + if (isServiceRunning()){ //Toggling the service. + //TODO: Start service + } + else{ + //TODO: Stop service + } + }); + if (BuildConfig.DEBUG) + startButton.performClick(); //To perform an automatic click in testing environment. + } + + //Test to see if the service is already running. + private boolean isServiceRunning() { + ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); + if (manager != null) { + for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + if (MyPersistentService.class.getName().equals(service.service.getClassName())) { + return true; + } + } + } + return false; } } diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java new file mode 100644 index 0000000..cc4806d --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -0,0 +1,16 @@ +package org.torproject.snowflake; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; + +import androidx.annotation.Nullable; + +//Main foreground service to handle network calls and to relay the data in the back ground. +public class MyPersistentService extends Service { + @Nullable + @Override + public IBinder onBind(Intent intent) { + return null; + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4fc2444..1c42128 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,13 +6,13 @@ android:layout_height="match_parent" tools:context=".MainActivity"> - <TextView + <Button + android:id="@+id/start_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Hello World!" + android:text="Service Toggle" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file

1 0

[tor/master] Remove tor.sh from .gitignore
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 5ba7d494c5618a1bd546902db1a49479b7b55b86 Author: c <c(a)chroniko.jp> Date: Fri Jun 5 10:28:29 2020 +0000 Remove tor.sh from .gitignore The files contrib/dist/tor.sh and contrib/dist/suse/tor.sh should not exist anymore, but when building in same repository for older versions of Tor, these files may return and not be cleaned up properly. This commit unignores those files from .gitignore, in order to make it clear that these files are no longer auto-generated and should be cleaned up. --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index ea6b68ec5..97b145590 100644 --- a/.gitignore +++ b/.gitignore @@ -79,11 +79,9 @@ uptime-*.json /callgraph/ # /contrib/ -/contrib/dist/tor.sh /contrib/dist/torctl /contrib/dist/tor.service /contrib/operator-tools/tor.logrotate -/contrib/dist/suse/tor.sh # /debian/ /debian/files

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1920/head'
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit f548f1475bee7d85629be4411e09d05836eba942 Merge: 1fb9be539 5ba7d494c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 10:12:00 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1920/head' .gitignore | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/master] Actually, bail out of routerstatus_format_entry() if fmt_addr32() fails
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 38cbfda119558877aeb4fa81578f0d0f6962d03e Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 19:54:47 2020 +0300 Actually, bail out of routerstatus_format_entry() if fmt_addr32() fails --- src/feature/nodelist/fmt_routerstatus.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 6cecbf4df..ca4a31263 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -54,22 +54,23 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, smartlist_t *chunks = smartlist_new(); const char *ip_str = fmt_addr32(rs->addr); + if (ip_str[0] == '\0') + goto err; format_iso_time(published, rs->published_on); digest_to_base64(identity64, rs->identity_digest); digest_to_base64(digest64, rs->descriptor_digest); - if (ip_str[0]) - smartlist_add_asprintf(chunks, - "r %s %s %s%s%s %s %d %d\n", - rs->nickname, - identity64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", - published, - ip_str, - (int)rs->or_port, - (int)rs->dir_port); + smartlist_add_asprintf(chunks, + "r %s %s %s%s%s %s %d %d\n", + rs->nickname, + identity64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", + published, + ip_str, + (int)rs->or_port, + (int)rs->dir_port); /* TODO: Maybe we want to pass in what we need to build the rest of * this here, instead of in the caller. Then we could use the

1 0

[tor/master] Check output value of tor_inet_ntop/tor_inet_ntoa in dns.c
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit b5bfdbfd41e38ac73d6655ff3da5a06b66f54d8a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 18:07:14 2020 +0300 Check output value of tor_inet_ntop/tor_inet_ntoa in dns.c --- src/feature/relay/dns.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 4dcf5b703..26e9c6bf1 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -1591,12 +1591,17 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses, } else if (type == DNS_IPv6_AAAA && count) { char answer_buf[TOR_ADDR_BUF_LEN]; char *escaped_address; + const char *ip_str; struct in6_addr *addrs = addresses; tor_addr_from_in6(&addr, &addrs[0]); - tor_inet_ntop(AF_INET6, &addrs[0], answer_buf, sizeof(answer_buf)); + ip_str = tor_inet_ntop(AF_INET6, &addrs[0], answer_buf, + sizeof(answer_buf)); escaped_address = esc_for_log(string_address); - if (answer_is_wildcarded(answer_buf)) { + if (BUG(ip_str == NULL)) { + log_warn(LD_EXIT, "tor_inet_ntop() failed!"); + result = DNS_ERR_NOTEXIST; + } else if (answer_is_wildcarded(answer_buf)) { log_debug(LD_EXIT, "eventdns said that %s resolves to ISP-hijacked " "address %s; treating as a failure.", safe_str(escaped_address), @@ -1863,6 +1868,7 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl, void *addresses, void *arg) { (void)ttl; + const char *ip_str; ++n_wildcard_requests; if (result == DNS_ERR_NONE && count) { char *string_address = arg; @@ -1872,16 +1878,22 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl, for (i = 0; i < count; ++i) { char answer_buf[INET_NTOA_BUF_LEN+1]; struct in_addr in; + int ntoa_res; in.s_addr = addrs[i]; - tor_inet_ntoa(&in, answer_buf, sizeof(answer_buf)); - wildcard_increment_answer(answer_buf); + ntoa_res = tor_inet_ntoa(&in, answer_buf, sizeof(answer_buf)); + tor_assert_nonfatal(ntoa_res > 0); + if (ntoa_res > 0) + wildcard_increment_answer(answer_buf); } } else if (type == DNS_IPv6_AAAA) { const struct in6_addr *addrs = addresses; for (i = 0; i < count; ++i) { char answer_buf[TOR_ADDR_BUF_LEN+1]; - tor_inet_ntop(AF_INET6, &addrs[i], answer_buf, sizeof(answer_buf)); - wildcard_increment_answer(answer_buf); + ip_str = tor_inet_ntop(AF_INET6, &addrs[i], answer_buf, + sizeof(answer_buf)); + tor_assert_nonfatal(ip_str); + if (ip_str) + wildcard_increment_answer(answer_buf); } }

1 0

[tor/master] Add changes file
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 17c4e489e95e808a74696d6e46d50dc136d46f10 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 19:42:41 2020 +0300 Add changes file --- changes/ticket33788 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket33788 b/changes/ticket33788 new file mode 100644 index 000000000..236c05662 --- /dev/null +++ b/changes/ticket33788 @@ -0,0 +1,4 @@ + o Minor features (code safety): + - Check for failures of tor_inet_ntop() and tor_inet_ntoa() functions in + DNS and IP address processing code and adjust codepaths to make them + less likely to crash entire Tor instance. Resolves issue 33788.

1 0

[tor/master] Check that fmt_addr32() returned non-empty string before putting it into documents
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 8ab7e30484c307ade39277488b954a5f21b5f6e5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 19:09:53 2020 +0300 Check that fmt_addr32() returned non-empty string before putting it into documents --- src/feature/dirauth/dirvote.c | 78 +++++++++++++++++---------------- src/feature/nodelist/fmt_routerstatus.c | 23 +++++----- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 6bf30d083..c8b4637e6 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -322,43 +322,47 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(digest_algo_b64_digest_bw_file); } - smartlist_add_asprintf(chunks, - "network-status-version 3\n" - "vote-status %s\n" - "consensus-methods %s\n" - "published %s\n" - "valid-after %s\n" - "fresh-until %s\n" - "valid-until %s\n" - "voting-delay %d %d\n" - "%s%s" /* versions */ - "%s" /* protocols */ - "known-flags %s\n" - "flag-thresholds %s\n" - "params %s\n" - "%s" /* bandwidth file headers */ - "%s" /* bandwidth file digest */ - "dir-source %s %s %s %s %d %d\n" - "contact %s\n" - "%s" /* shared randomness information */ - , - v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", - methods, - published, va, fu, vu, - v3_ns->vote_seconds, v3_ns->dist_seconds, - client_versions_line, - server_versions_line, - protocols_lines, - flags, - flag_thresholds, - params, - bw_headers_line ? bw_headers_line : "", - bw_file_digest ? bw_file_digest: "", - voter->nickname, fingerprint, voter->address, - fmt_addr32(addr), voter->dir_port, voter->or_port, - voter->contact, - shared_random_vote_str ? - shared_random_vote_str : ""); + const char *ip_str = fmt_addr32(addr); + + if (ip_str[0]) { + smartlist_add_asprintf(chunks, + "network-status-version 3\n" + "vote-status %s\n" + "consensus-methods %s\n" + "published %s\n" + "valid-after %s\n" + "fresh-until %s\n" + "valid-until %s\n" + "voting-delay %d %d\n" + "%s%s" /* versions */ + "%s" /* protocols */ + "known-flags %s\n" + "flag-thresholds %s\n" + "params %s\n" + "%s" /* bandwidth file headers */ + "%s" /* bandwidth file digest */ + "dir-source %s %s %s %s %d %d\n" + "contact %s\n" + "%s" /* shared randomness information */ + , + v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", + methods, + published, va, fu, vu, + v3_ns->vote_seconds, v3_ns->dist_seconds, + client_versions_line, + server_versions_line, + protocols_lines, + flags, + flag_thresholds, + params, + bw_headers_line ? bw_headers_line : "", + bw_file_digest ? bw_file_digest: "", + voter->nickname, fingerprint, voter->address, + ip_str, voter->dir_port, voter->or_port, + voter->contact, + shared_random_vote_str ? + shared_random_vote_str : ""); + } tor_free(params); tor_free(flags); diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 0cf4a6eea..6cecbf4df 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -53,20 +53,23 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, char digest64[BASE64_DIGEST_LEN+1]; smartlist_t *chunks = smartlist_new(); + const char *ip_str = fmt_addr32(rs->addr); + format_iso_time(published, rs->published_on); digest_to_base64(identity64, rs->identity_digest); digest_to_base64(digest64, rs->descriptor_digest); - smartlist_add_asprintf(chunks, - "r %s %s %s%s%s %s %d %d\n", - rs->nickname, - identity64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", - published, - fmt_addr32(rs->addr), - (int)rs->or_port, - (int)rs->dir_port); + if (ip_str[0]) + smartlist_add_asprintf(chunks, + "r %s %s %s%s%s %s %d %d\n", + rs->nickname, + identity64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", + published, + ip_str, + (int)rs->or_port, + (int)rs->dir_port); /* TODO: Maybe we want to pass in what we need to build the rest of * this here, instead of in the caller. Then we could use the

1 0

[tor/master] Check for possible failures of tor_inet_ntop/tor_inet_ntoa in fmt_addr32 and tor_dup_ip
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit d8e24684b6607baa95dd4950a14ea671edcef1dc Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 18:33:18 2020 +0300 Check for possible failures of tor_inet_ntop/tor_inet_ntoa in fmt_addr32 and tor_dup_ip --- src/lib/net/address.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index b8f5f3774..b24fe6c91 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1196,14 +1196,24 @@ fmt_addrport(const tor_addr_t *addr, uint16_t port) /** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4 * addresses. Also not thread-safe, also clobbers its return buffer on - * repeated calls. */ + * repeated calls. Clean internal buffer and return empty string on failure. */ const char * fmt_addr32(uint32_t addr) { static char buf[INET_NTOA_BUF_LEN]; struct in_addr in; + int success; + in.s_addr = htonl(addr); - tor_inet_ntoa(&in, buf, sizeof(buf)); + + success = tor_inet_ntoa(&in, buf, sizeof(buf)); + tor_assertf_nonfatal(success > 0, + "Failed to convert IP %04X to string", addr); + + if (success <= 0) { + memset(buf, 0, INET_NTOA_BUF_LEN); + } + return buf; } @@ -1995,17 +2005,24 @@ parse_port_range(const char *port, uint16_t *port_min_out, } /** Given a host-order <b>addr</b>, call tor_inet_ntop() on it - * and return a strdup of the resulting address. + * and return a strdup of the resulting address. Return NULL if + * tor_inet_ntop() fails. */ char * tor_dup_ip(uint32_t addr) { + const char *ip_str; char buf[TOR_ADDR_BUF_LEN]; struct in_addr in; in.s_addr = htonl(addr); - tor_inet_ntop(AF_INET, &in, buf, sizeof(buf)); - return tor_strdup(buf); + ip_str = tor_inet_ntop(AF_INET, &in, buf, sizeof(buf)); + + tor_assertf_nonfatal(ip_str, "Failed to duplicate IP %04X", addr); + if (ip_str) + return tor_strdup(buf); + + return NULL; } /**

1 0

[tor/master] Bail out of format_networkstatus_vote if fmt_addr32() failed.
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit ded99992b831bfff782a3b3c612297a4634d3d88 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 20:01:21 2020 +0300 Bail out of format_networkstatus_vote if fmt_addr32() failed. Something is fishy if we cannot put IP address string into dir-vote line. --- src/feature/dirauth/dirvote.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index c8b4637e6..0a9ade132 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -372,6 +372,9 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(bw_headers_line); tor_free(bw_file_digest); + if (ip_str[0] == '\0') + goto err; + if (!tor_digest_is_zero(voter->legacy_id_digest)) { char fpbuf[HEX_DIGEST_LEN+1]; base16_encode(fpbuf, sizeof(fpbuf), voter->legacy_id_digest, DIGEST_LEN);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2020