November 2022 - tor-commits - lists.torproject.org

[builders/tor-browser-build] branch main updated: Bug 40254: Add per-platform download json files
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 983f9860 Bug 40254: Add per-platform download json files 983f9860 is described below commit 983f9860892b094e391e2b166cbc5c09106aa65b Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Wed Nov 2 17:54:31 2022 +0100 Bug 40254: Add per-platform download json files We also add android download json files (#40110). --- projects/release/update_responses_config.yml | 1 + tools/update-responses/update_responses | 38 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d27afd84..9c9b6693 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -2,6 +2,7 @@ tmp_dir: '[% c("tmp_dir") %]' create_downloads_json: 1 appname_marfile: tor-browser +appname_bundle_android: tor-browser appname_bundle_macos: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win32: torbrowser-install diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 265994a5..5725edbb 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -153,6 +153,39 @@ sub get_version_downloads { $config->{versions}{$version}{downloads} = $downloads; } +sub get_perplatform_downloads { + my ($config, $version, $gittag) = @_; + my $downloads = {}; + my $vdir = version_dir($config, $version); + my $download_url = "$config->{download}{bundles_url}/$version"; + opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; + foreach my $file (readdir $d) { + next unless -f "$vdir/$file"; + my $os; + if ($file =~ m/^$config->{appname_bundle_macos}-$version-macos_(.+).dmg$/) { + $os = 'macos'; + } elsif ($file =~ m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) { + $os = $1 eq 'linux64' ? 'linux-x86_64' : 'linux-i686'; + } elsif ($file =~ m/^$config->{appname_bundle_win64}-${version}_(.+).exe$/) { + $os = 'windows-x86_64'; + } elsif ($file =~ m/^$config->{appname_bundle_win32}-${version}_(.+).exe$/) { + $os = 'windows-i686'; + } elsif ($file =~ m/^$config->{appname_bundle_android}-${version}-(android-armv7|android-x86|android-x86_64|android-aarch64)-multi.apk/) { + $os = $1; + } else { + next; + } + $downloads->{$os} = { + version => $version, + git_tag => $gittag, + binary => "$download_url/$file", + sig => "$download_url/$file.asc", + }; + } + closedir $d; + $config->{versions}{$version}{pp_downloads} = $downloads; +} + sub extract_mar { my ($mar_file, $dest_dir, $compression) = @_; my $old_cwd = getcwd; @@ -432,6 +465,11 @@ sub write_downloads_json { }; write_htdocs($channel, 'downloads.json', JSON->new->utf8->canonical->encode($data)); + my $pp_downloads = get_perplatform_downloads($config, $version, $tag); + foreach my $os (keys %{$pp_downloads}) { + write_htdocs($channel, "download-$os.json", + JSON->new->utf8->canonical->encode($pp_downloads->{$os})); + } } } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-android-service] branch main updated: Bug 41481: Update PendingIntent for Android 12+
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-android-service. The following commit(s) were added to refs/heads/main by this push: new f324999 Bug 41481: Update PendingIntent for Android 12+ f324999 is described below commit f324999c1773a8d8c83c50106a2cac30be93aabf Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Nov 28 09:54:28 2022 +0100 Bug 41481: Update PendingIntent for Android 12+ --- .../main/java/org/torproject/android/service/TorService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index f1ddcda..662d3cc 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -142,17 +142,25 @@ public final class TorService extends Service implements TorServiceConstants, Or } intent.setAction(TorServiceConstants.TOR_APP_USERNAME); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - PendingIntent pendIntent = PendingIntent.getActivity(getApplicationContext(), 0, intent, 0); + int flags = 0; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + flags = flags | PendingIntent.FLAG_IMMUTABLE; + } + PendingIntent pendIntent = PendingIntent.getActivity(getApplicationContext(), 0, intent, flags); if (mNotifyBuilder == null) { mNotifyBuilder = new NotificationBuilderCompat(this, NOTIFICATION_CHANNEL_ID) .setContentTitle(getString(R.string.app_name)).setContentIntent(pendIntent).setCategory("service") .setSmallIcon(R.drawable.ic_stat_tor); + flags = PendingIntent.FLAG_UPDATE_CURRENT; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + flags = flags | PendingIntent.FLAG_IMMUTABLE; + } Intent intentRefresh = new Intent(CMD_NEWNYM); PendingIntent pendingIntentNewNym = PendingIntent.getBroadcast(getApplicationContext (), 0, - intentRefresh, PendingIntent.FLAG_UPDATE_CURRENT); + intentRefresh, flags); mNotifyBuilder.addAction(R.drawable.ic_refresh_white_24dp, getString(R.string .menu_new_identity), pendingIntentNewNym); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch release-0.4.7 updated (0f72752037 -> ba77ccae02)
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from 0f72752037 Merge branch 'maint-0.4.7' into release-0.4.7 new be7afe658e Clip DNS TTL values once in event callback new 15efc25fb5 dns: Make TTLs fuzzy at exit relays new efeef819f5 changes: Add file for ticket 40674 new a91bcb5516 Merge branch 'maint-0.4.5' into maint-0.4.7 new ba77ccae02 Merge branch 'maint-0.4.7' into release-0.4.7 The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch release-0.4.5 updated (4b50e85bcf -> 2941006d25)
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.5 in repository tor. from 4b50e85bcf Merge branch 'maint-0.4.5' into release-0.4.5 new be7afe658e Clip DNS TTL values once in event callback new 15efc25fb5 dns: Make TTLs fuzzy at exit relays new efeef819f5 changes: Add file for ticket 40674 new 2941006d25 Merge branch 'maint-0.4.5' into release-0.4.5 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40674 | 3 +++ src/core/or/connection_edge.c | 20 ++++++++++++++++++-- src/core/or/connection_edge.h | 14 ++++++++++---- src/feature/relay/dns.c | 8 ++++---- src/test/test_cell_formats.c | 4 ++-- src/test/test_dns.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 changes/ticket40674 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (fbc9e92fdb -> a91bcb5516)
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.7 in repository tor. from fbc9e92fdb relay: Use the configured number of threads for worker work calculation new be7afe658e Clip DNS TTL values once in event callback new 15efc25fb5 dns: Make TTLs fuzzy at exit relays new efeef819f5 changes: Add file for ticket 40674 new a91bcb5516 Merge branch 'maint-0.4.5' into maint-0.4.7 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.5 updated (ee38514cc4 -> efeef819f5)
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.5 in repository tor. from ee38514cc4 build: fix -Wstrict-prototypes (Clang 16) new be7afe658e Clip DNS TTL values once in event callback new 15efc25fb5 dns: Make TTLs fuzzy at exit relays new efeef819f5 changes: Add file for ticket 40674 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40674 | 3 +++ src/core/or/connection_edge.c | 20 ++++++++++++++++++-- src/core/or/connection_edge.h | 14 ++++++++++---- src/feature/relay/dns.c | 8 ++++---- src/test/test_cell_formats.c | 4 ++-- src/test/test_dns.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 changes/ticket40674 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (21121eb231 -> 85ca92951a)
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from 21121eb231 Merge branch 'tor-gitlab/mr/652' new be7afe658e Clip DNS TTL values once in event callback new 15efc25fb5 dns: Make TTLs fuzzy at exit relays new efeef819f5 changes: Add file for ticket 40674 new a91bcb5516 Merge branch 'maint-0.4.5' into maint-0.4.7 new bf8f829314 Merge branch 'maint-0.4.7' new 85ca92951a changes: Fix file without ticket number The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/bsd_libc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 6

[tor] branch main updated (c408d0a7f9 -> 21121eb231)
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from c408d0a7f9 Merge branch 'tor-gitlab/mr/657' new dba3090a68 return BSD if tor_libc_get_name sees __BSD_VISIBLE new 9c7f919d6f should we identify __FreeBSD__, return its version new c98ec6d001 return what OpenBSD gives as base system version new 8a879395ab make tor_libc_get_name aware of NetBSD new 2077b880d8 once NetBSD was presented, return its version new 64f8490ede present __DragonFly_version, from DragonFlyBSD new cc95be8e17 fix: we shall not produce warnings compiling tor new bd64e6bd08 fix: %s/param.sh/param.h new 4b23bd8c9c add chagelog file related to MR!652 new 642e56bdb6 perform proper 'OR' while checking defined vars new 21121eb231 Merge branch 'tor-gitlab/mr/652' The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/bsd_libc | 3 +++ src/lib/osinfo/libc.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 changes/bsd_libc -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 11

[tor] branch main updated: use consensus ip:port for dir auths if different
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new c56980f5e5 use consensus ip:port for dir auths if different new c408d0a7f9 Merge branch 'tor-gitlab/mr/657' c56980f5e5 is described below commit c56980f5e5fc22c9feace1dc3b6192fbd9f1ebdb Author: Roger Dingledine <arma(a)torproject.org> AuthorDate: Tue Oct 25 03:00:03 2022 -0400 use consensus ip:port for dir auths if different Directory authorities and relays now interact properly with directory authorities if they change addresses. In the past, they would continue to upload votes, signatures, descriptors, etc to the hard-coded address in the configuration. Now, if the directory authority is listed in the consensus at a different address, they will direct queries to this new address. Specifically, these three activities have changed: * Posting a vote, a signature, or a relay descriptor to all the dir auths. * Dir auths fetching missing votes or signatures from all the dir auths. * Dir auths fetching new descriptors from a specific dir auth when they just learned about them from that dir auth's vote. We already do this desired behavior (prefer the address in the consensus, but fall back to the hard-coded dirservers info if needed) when fetching missing certs. There is a fifth case, in router_pick_trusteddirserver(), where clients and relays are trying to reach a random dir auth to fetch something. I left that case alone for now because the interaction with fallbackdirs is complicated. Implements ticket 40705. --- changes/ticket40705 | 7 +++++++ src/feature/dirclient/dirclient.c | 23 +++++++++++++++++------ src/feature/nodelist/routerlist.c | 15 +++++++++++---- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/changes/ticket40705 b/changes/ticket40705 new file mode 100644 index 0000000000..2de01c76d5 --- /dev/null +++ b/changes/ticket40705 @@ -0,0 +1,7 @@ + o Major features (dirauth): + - Directory authorities and relays now interact properly with + directory authorities if they change addresses. In the past, they + would continue to upload votes, signatures, descriptors, etc to + the hard-coded address in the configuration. Now, if the directory + authority is listed in the consensus at a different address, they + will direct queries to this new address. Implements ticket 40705. diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c index 9555714e79..84eefdd90b 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -242,7 +242,14 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, * harmless, and we may as well err on the side of getting things uploaded. */ SMARTLIST_FOREACH_BEGIN(dirservers, dir_server_t *, ds) { - routerstatus_t *rs = &(ds->fake_status); + const routerstatus_t *rs = router_get_consensus_status_by_id(ds->digest); + if (!rs) { + /* prefer to use the address in the consensus, but fall back to + * the hard-coded trusted_dir_server address if we don't have a + * consensus or this digest isn't in our consensus. */ + rs = &ds->fake_status; + } + size_t upload_len = payload_len; if ((type & ds->type) == 0) @@ -276,10 +283,8 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, } if (purpose_needs_anonymity(dir_purpose, router_purpose, NULL)) { indirection = DIRIND_ANONYMOUS; - } else if (!reachable_addr_allows_dir_server(ds, - FIREWALL_DIR_CONNECTION, - 0)) { - if (reachable_addr_allows_dir_server(ds, FIREWALL_OR_CONNECTION, 0)) + } else if (!reachable_addr_allows_rs(rs, FIREWALL_DIR_CONNECTION, 0)) { + if (reachable_addr_allows_rs(rs, FIREWALL_OR_CONNECTION, 0)) indirection = DIRIND_ONEHOP; else indirection = DIRIND_ANONYMOUS; @@ -590,7 +595,13 @@ directory_get_from_all_authorities(uint8_t dir_purpose, continue; if (!(ds->type & V3_DIRINFO)) continue; - const routerstatus_t *rs = &ds->fake_status; + const routerstatus_t *rs = router_get_consensus_status_by_id(ds->digest); + if (!rs) { + /* prefer to use the address in the consensus, but fall back to + * the hard-coded trusted_dir_server address if we don't have a + * consensus or this digest isn't in our consensus. */ + rs = &ds->fake_status; + } directory_request_t *req = directory_request_new(dir_purpose); directory_request_set_routerstatus(req, rs); directory_request_set_router_purpose(req, router_purpose); diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 8bcc42bc3f..9f0f845126 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -2651,7 +2651,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, digestmap_t *map = NULL; smartlist_t *no_longer_old = smartlist_new(); smartlist_t *downloadable = smartlist_new(); - routerstatus_t *source = NULL; + const routerstatus_t *source = NULL; int authdir = authdir_mode(options); int n_delayed=0, n_have=0, n_would_reject=0, n_wouldnt_use=0, n_inprogress=0, n_in_oldrouters=0; @@ -2667,10 +2667,17 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, networkstatus_voter_info_t *voter = smartlist_get(consensus->voters, 0); tor_assert(voter); ds = trusteddirserver_get_by_v3_auth_digest(voter->identity_digest); - if (ds) - source = &(ds->fake_status); - else + if (ds) { + source = router_get_consensus_status_by_id(ds->digest); + if (!source) { + /* prefer to use the address in the consensus, but fall back to + * the hard-coded trusted_dir_server address if we don't have a + * consensus or this digest isn't in our consensus. */ + source = &ds->fake_status; + } + } else { log_warn(LD_DIR, "couldn't lookup source from vote?"); + } } map = digestmap_new(); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: cpu: Set number of threads to number of cores
by gitolite role 28 Nov '22

28 Nov '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new b9de73e46e cpu: Set number of threads to number of cores new 3ac08ac200 Merge branch 'tor-gitlab/mr/658' b9de73e46e is described below commit b9de73e46ea86de1ca1e4810cd14ea21c81acfc8 Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Wed Nov 23 13:40:47 2022 -0500 cpu: Set number of threads to number of cores Cap this to 2 threads always because we need a low and high priority thread even with a single core. Fixes #40713 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40713 | 4 ++++ src/core/mainloop/cpuworker.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket40713 b/changes/ticket40713 new file mode 100644 index 0000000000..eaddfd30d7 --- /dev/null +++ b/changes/ticket40713 @@ -0,0 +1,4 @@ + o Minor feature (cpuworker): + - Always use the number of threads for our CPU worker pool to the number of + core available but cap it to a minimum of 2 in case of a single core. + Fixes bug 40713; bugfix on 0.3.5.1-alpha. diff --git a/src/core/mainloop/cpuworker.c b/src/core/mainloop/cpuworker.c index 3ad556a184..0459f22efe 100644 --- a/src/core/mainloop/cpuworker.c +++ b/src/core/mainloop/cpuworker.c @@ -129,7 +129,7 @@ cpu_init(void) always make sure we have at least two threads, so that there will be at least one thread of each kind. */ - const int n_threads = get_num_cpus(get_options()) + 1; + const int n_threads = MAX(get_num_cpus(get_options()), 2); threadpool = threadpool_new(n_threads, replyqueue, worker_state_new, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0