- tor-commits - lists.torproject.org

[tor] branch release-0.4.5 updated (0d91cb8099 -> 621c922134)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch release-0.4.5 in repository tor. from 0d91cb8099 Merge branch 'maint-0.4.5' into release-0.4.5 new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 621c922134 Merge branch 'maint-0.4.5' into release-0.4.5 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/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (5345b43fb8 -> 5f2b75aafd)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch maint-0.4.7 in repository tor. from 5345b43fb8 version: Bump to 0.4.7.7-dev new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 new 5f2b75aafd Merge branch 'maint-0.4.6' 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: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.6 updated (32356a6076 -> 4ba89c0ccc)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch maint-0.4.6 in repository tor. from 32356a6076 Merge branch 'maint-0.4.5' into maint-0.4.6 new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 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/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.5 updated (dc90226cc3 -> c213c1b0d1)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch maint-0.4.5 in repository tor. from dc90226cc3 Merge branch 'tor-gitlab/mr/491' into maint-0.4.5 new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. The 2 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/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (853270a871 -> 20112c13ac)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch main in repository tor. from 853270a871 Merge remote-tracking branch 'tor-gitlab/mr/574' new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 new 5f2b75aafd Merge branch 'maint-0.4.6' into maint-0.4.7 new 20112c13ac Merge branch 'maint-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: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 5

[builders/tor-browser-build] branch master updated: Bug 40485: Resolve Android reproducibility issues
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new aa756d0 Bug 40485: Resolve Android reproducibility issues aa756d0 is described below commit aa756d032f812a7770fedfb60f1383bd47f60522 Author: Matthew Finkel <sysrqb(a)torproject.org> AuthorDate: Fri May 6 16:35:08 2022 +0000 Bug 40485: Resolve Android reproducibility issues --- projects/application-services/bug40485.patch | 54 ++++++++++++++++++++++++++++ projects/application-services/build | 1 + projects/application-services/config | 2 ++ projects/fenix/build | 3 ++ 4 files changed, 60 insertions(+) diff --git a/projects/application-services/bug40485.patch b/projects/application-services/bug40485.patch new file mode 100644 index 0000000..fb97a22 --- /dev/null +++ b/projects/application-services/bug40485.patch @@ -0,0 +1,54 @@ +diff --git a/components/support/nimbus-fml/src/parser.rs b/components/support/nimbus-fml/src/parser.rs +index 1de9a301..19d29373 100644 +--- a/components/support/nimbus-fml/src/parser.rs ++++ b/components/support/nimbus-fml/src/parser.rs +@@ -2,7 +2,7 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +-use std::{collections::HashMap, path::Path}; ++use std::{collections::BTreeMap, collections::HashMap, path::Path}; + + use serde::{Deserialize, Serialize}; + use serde_json::json; +@@ -22,7 +22,7 @@ pub(crate) struct EnumVariantBody { + #[derive(Debug, Deserialize, Serialize, Clone)] + pub(crate) struct EnumBody { + description: String, +- variants: HashMap<String, EnumVariantBody>, ++ variants: BTreeMap<String, EnumVariantBody>, + } + + #[derive(Debug, Deserialize, Serialize, Clone)] +@@ -39,26 +39,26 @@ pub(crate) struct FieldBody { + pub(crate) struct ObjectBody { + description: String, + failable: Option<bool>, +- fields: HashMap<String, FieldBody>, ++ fields: BTreeMap<String, FieldBody>, + } + + #[derive(Debug, Deserialize, Serialize, Clone, Default)] + pub(crate) struct Types { +- enums: HashMap<String, EnumBody>, +- objects: HashMap<String, ObjectBody>, ++ enums: BTreeMap<String, EnumBody>, ++ objects: BTreeMap<String, ObjectBody>, + } + + #[derive(Debug, Deserialize, Serialize, Clone)] + pub(crate) struct FeatureBody { + description: String, +- variables: HashMap<String, FieldBody>, ++ variables: BTreeMap<String, FieldBody>, + #[serde(alias = "defaults")] + default: Option<serde_json::Value>, + } + #[derive(Debug, Deserialize, Serialize, Clone, Default)] + pub(crate) struct ManifestFrontEnd { + types: Types, +- features: HashMap<String, FeatureBody>, ++ features: BTreeMap<String, FeatureBody>, + channels: Vec<String>, + } + diff --git a/projects/application-services/build b/projects/application-services/build index f526973..121dc12 100755 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -76,6 +76,7 @@ do done patch -p1 < $rootdir/no-git.patch +patch -p1 < $rootdir/bug40485.patch export RUST_ANDROID_GRADLE_PYTHON_COMMAND=python3 [% IF c('var/fetch_gradle_dependencies') %] # XXX: `assemble` is still not enough to see all fetched dependencies via diff --git a/projects/application-services/config b/projects/application-services/config index 29a6084..d65014f 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -97,6 +97,8 @@ input_files: enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' + # Delete when this patch is included upstream + - filename: bug40485.patch steps: list_toolchain_updates: diff --git a/projects/fenix/build b/projects/fenix/build index 1c1890f..3306e3d 100755 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -77,6 +77,9 @@ v=[% c("variant") %] exit 1 fi + # Bug 40485: Inject deterministic build date into Glean. + echo "ext.gleanBuildDate = \"0\"" >> app/build.gradle + # We put the tor-browser version last to avoid int-parsing errors when consumers of project.versionName # assume it starts with a major version number, as it does for all Mozilla version names. version_name='[% c("var/fenix_version") %]-[% c("variant") %] ([% c("var/torbrowser_version") %])' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.0 updated: Bug 40490: Add Pier as a valid signer
by gitolite role 06 May '22

06 May '22

This is an automated email from the git hooks/post-receive script. sysrqb pushed a commit to branch maint-11.0 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.0 by this push: new 506bd3e Bug 40490: Add Pier as a valid signer 506bd3e is described below commit 506bd3e13f3c8aacea5cb5e33faabc9c9627b4b4 Author: Matthew Finkel <sysrqb(a)torproject.org> AuthorDate: Fri May 6 17:12:40 2022 +0000 Bug 40490: Add Pier as a valid signer --- keyring/torbutton.gpg | Bin 233555 -> 234748 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 939143b..9fed395 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40490: Add Pier as a valid signer
by gitolite role 06 May '22

06 May '22

This is an automated email from the git hooks/post-receive script. sysrqb pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 43033ab Bug 40490: Add Pier as a valid signer 43033ab is described below commit 43033abc8a89da9012c385dbb415ce1c971d6959 Author: Matthew Finkel <sysrqb(a)torproject.org> AuthorDate: Fri May 6 17:12:40 2022 +0000 Bug 40490: Add Pier as a valid signer --- keyring/torbutton.gpg | Bin 233555 -> 234748 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 939143b..9fed395 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[Git][tpo/applications/fenix][tor-browser-96.3.0-11.0-1] 2 commits: Bug 40212: Disable all telemetry "brutally"
by Matthew Finkel (＠sysrqb) 06 May '22

06 May '22

Matthew Finkel pushed to branch tor-browser-96.3.0-11.0-1 at The Tor Project / Applications / fenix Commits: fd471edf by aguestuser at 2022-05-03T17:27:09+02:00 Bug 40212: Disable all telemetry "brutally" As a temporary fix for crashes in the telemetry code, we modified the function that tells whether telemetry is enabled to always tall that it is not. - - - - - f1f2ba80 by Matthew Finkel at 2022-05-06T16:06:09+00:00 Merge branch 'bug_40212' into 'tor-browser-96.3.0-11.0-1' Bug 40212: Disabled all telemetry "brutally" See merge request tpo/applications/fenix!147 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt ===================================== @@ -152,10 +152,7 @@ internal class ReleaseMetricController( private fun isInitialized(type: MetricServiceType): Boolean = initialized.contains(type) - private fun isTelemetryEnabled(type: MetricServiceType): Boolean = when (type) { - MetricServiceType.Data -> isDataTelemetryEnabled() - MetricServiceType.Marketing -> isMarketingDataTelemetryEnabled() - } + private fun isTelemetryEnabled(@Suppress("UNUSED_PARAMETER") type: MetricServiceType): Boolean = false @Suppress("LongMethod", "MaxLineLength") private fun Fact.toEvent(): Event? = when { View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/093d02e69858… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/093d02e69858… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-spec] branch master updated: Bug 40028: Create issue template for network audits
by gitolite role 05 May '22

05 May '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch master in repository tor-browser-spec. The following commit(s) were added to refs/heads/master by this push: new a437cf1 Bug 40028: Create issue template for network audits a437cf1 is described below commit a437cf18f2f7cd239f4b5fb3137e840082756b31 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Apr 4 23:11:17 2022 +0000 Bug 40028: Create issue template for network audits - also update code_audit.sh to also print a commit's message/hash for further investigation, save reports in script directory, a renamed reports to include repo folder name, added cc and hh file extensions to c/cpp filter, changed arg order to make it easer to change filter for same commit range --- .gitlab/issue_templates/Firefox Issue Audit.md | 113 +++++++++++++++++++++++++ audits/code_audit.sh | 70 ++++++++++++--- 2 files changed, 169 insertions(+), 14 deletions(-) diff --git a/.gitlab/issue_templates/Firefox Issue Audit.md b/.gitlab/issue_templates/Firefox Issue Audit.md new file mode 100644 index 0000000..81f781f --- /dev/null +++ b/.gitlab/issue_templates/Firefox Issue Audit.md @@ -0,0 +1,113 @@ +# General + +The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript). + +The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation. + +`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit. + +## Firefox: https://github.com/mozilla/gecko-dev.git + +- Start: `$(FIRST_GIT_HASH)` ( `$(START_TAG)` ) +- End: `$(LAST_GIT_HASH)` ( `$(END_TAG)` ) + +### Languages: +- [ ] java +- [ ] cpp +- [ ] js +- [ ] rust + +Nothing of interest (using `code_audit.sh`) + +**OR** + +### foreach PROBLEMATIC_HASH: +#### $(PROBLEMATIC_HASH) +- Summary +- Review Result: (SAFE|BAD) + +--- + +## Application Services: https://github.com/mozilla/application-services.git + +- Start: `$(FIRST_GIT_HASH)` ( `$(START_TAG)` ) +- End: `$(LAST_GIT_HASH)` ( `$(END_TAG)` ) + +### Languages: +- [ ] java +- [ ] cpp +- [ ] js +- [ ] rust + +Nothing of interest (using `code_audit.sh`) + +**OR** + +### foreach PROBLEMATIC_HASH: +#### $(PROBLEMATIC_HASH) +- Summary +- Review Result: (SAFE|BAD) + +## Android Components: https://github.com/mozilla-mobile/android-components.git + +- Start: `$(FIRST_GIT_HASH)` ( `$(START_TAG)` ) +- End: `$(LAST_GIT_HASH)` ( `$(END_TAG)` ) + +### Languages: +- [ ] java +- [ ] cpp +- [ ] js +- [ ] rust + +Nothing of interest (using `code_audit.sh`) + +**OR** + +### foreach PROBLEMATIC_HASH: +#### $(PROBLEMATIC_HASH) +- Summary +- Review Result: (SAFE|BAD) + +## Fenix: https://github.com/mozilla-mobile/fenix.git + +- Start: `$(FIRST_GIT_HASH)` ( `$(START_TAG)` ) +- End: `$(LAST_GIT_HASH)` ( `$(END_TAG)` ) + +### Languages: +- [ ] java +- [ ] cpp +- [ ] js +- [ ] rust + +Nothing of interest (using `code_audit.sh`) + +**OR** + +### foreach PROBLEMATIC_HASH: +#### $(PROBLEMATIC_HASH) +- Summary +- Review Result: (SAFE|BAD) + +## Ticket Review ## + +Bugzilla Query: `https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=FIXED&target_milestone=$(FIREFOX_VERSION)%20Branch&order=priority%2Cbug_severity&limit=0` + +where `$(FIREFOX_VERSION)` is the major Firefox version we are auditing (eg: '91') + +Nothing of interest (manual inspection) + +**OR** (foreach)** + +### foreach PROBLEMATIC_TICKET: +#### $(PROBLEMATIC_TICKET) +- Summary +- Review Result: (SAFE|BAD) + +## Regression/Prior Vuln Review ## + +Review proxy bypass bugs; check for new vectors to look for: + - https://gitlab.torproject.org/groups/tpo/applications/-/issues?scope=all&ut… + - Look for new features like these. Especially external app launch vectors + +## Export +- [ ] Export Report and save to `tor-browser-spec/audits` diff --git a/audits/code_audit.sh b/audits/code_audit.sh index d260d15..a8b5868 100755 --- a/audits/code_audit.sh +++ b/audits/code_audit.sh @@ -1,15 +1,17 @@ #!/bin/bash -e +# set -x + if [ $# -ne 4 ]; then - echo "usage: <path/to/repo> <lang> <old commit> <new commit>" + echo "usage: <path/to/repo> <old commit> <new commit> <lang>" exit 1 fi REPO_DIR=$1 -SCOPE=$2 -OLD=$3 -NEW=$4 +OLD=$2 +NEW=$3 +SCOPE=$4 declare -a KEYWORDS @@ -127,7 +129,7 @@ case "${SCOPE}" in initialize_java_symbols ;; "c-cpp" | "c-cxx" | "c" | "cxx" | "cpp" ) - EXT="c cpp h cxx hpp hxx" + EXT="c cpp h cxx hpp hxx cc hh" SCOPE="c-cpp" initialize_cpp_symbols ;; @@ -145,6 +147,7 @@ case "${SCOPE}" in ;; esac +AUDIT_DIR=$(pwd) cd "$REPO_DIR" # Step 2: Generate match pattern based on in-scope keywords @@ -156,19 +159,58 @@ declare -a path for ext in ${EXT}; do path+=("*.${ext}") done -echo "Diffing patches-${OLD}-${NEW}-${SCOPE}.diff from all ${path[*]} files" +PROJECT_NAME=$(basename $(pwd)) +REPORT_FILE="$AUDIT_DIR/$PROJECT_NAME-$SCOPE-${OLD:0:8}-${NEW:0:8}.report" + +echo "Diffing all ${path[*]} files in commit range ${OLD:0:8}..${NEW:0:8}" # Exclude Deleted and Unmerged files from diff DIFF_FILTER=ACMRTXB -git diff --stat --color=always --color-moved --diff-filter="${DIFF_FILTER}" -U20 -G"${GREP_LINE}" "$OLD" "$NEW" -- "${path[@]}" > "patches-${OLD}-${NEW}-${SCOPE}.diff" -# Step 4: Highlight the keyword with an annoying, flashing color +rm -f "${REPORT_FILE}" + +# Step 4: Concat a diff of each commit containing keyword and the commit message/hash +# of said commit + +# Flashing Color constants export GREP_COLOR="05;37;41" -# Capture the entire file and/or overlap with the previous match, add GREP_COLOR highlighting -grep -A10000 -B10000 --color=always -E "${GREP_LINE}" "patches-${OLD}-${NEW}-${SCOPE}.diff" > "keywords-$OLD-$NEW-$SCOPE.diff" -# Add a 'XXX MATCH XXX' at the end of each matched line, easily searchable. -sed -i 's/$\x1b\[05;37;41.*$/\1 XXX MATCH XXX/' "keywords-$OLD-$NEW-$SCOPE.diff" +for COMMIT in $(git rev-list --ancestry-path $OLD..$NEW); do + TEMP_DIFF="$(mktemp)" + + echo "Diffing $COMMIT..." + + # Do each diff commit by commit so we can add context from the commit log + # to each diff + git diff --stat --color=always --color-moved --diff-filter="${DIFF_FILTER}" -U20 -G"${GREP_LINE}" $COMMIT~ $COMMIT -- "${path[@]}" > "${TEMP_DIFF}" + if [ -s "${TEMP_DIFF}" ] + then + # Highlight the keyword with an annoying, flashing color + FLASHING_DIFF="$(mktemp)" + grep -A10000 -B10000 --color=always -E "${GREP_LINE}" "${TEMP_DIFF}" > "${FLASHING_DIFF}" + mv "${FLASHING_DIFF}" "${TEMP_DIFF}" + + # Add a 'XXX MATCH XXX' at the end of each matched line, easily searchable. + sed -i 's/$\x1b\[05;37;41.*$/\1 XXX MATCH XXX/' "${TEMP_DIFF}" + + # Found some diff, so cat the changelog for commit then the diff + echo "-----------------------------------------------" >> "${REPORT_FILE}" + git log -n 1 $COMMIT >> "${REPORT_FILE}" + echo "-----------------------------------------------" >> "${REPORT_FILE}" + cat "${TEMP_DIFF}" >> "${REPORT_FILE}" + fi + + rm -f "${TEMP_DIFF}" +done # Step 5: Review the code changes -echo "Diff generated. View it with:" -echo " less -R $REPO_DIR/keywords-$OLD-$NEW-$SCOPE.diff" + +if [ -s "${REPORT_FILE}" ] +then + echo "" + echo "Report generated. View it with:" + echo "" + echo "less -R \"$(basename "${REPORT_FILE}")\"" +else + echo "No keywords found. No report generated" +fi + -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0