- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 40732: Review the Bundle-Data and do not ship the default profile
by Richard Pospesel (＠richard) 17 Jan '23

17 Jan '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7855f0b6 by Pier Angelo Vendrame at 2023-01-16T20:32:34+01:00 Bug 40732: Review the Bundle-Data and do not ship the default profile In this commit we stop shipping Bundle-Data/$osname in base-browser, which means that the default profile is now distributed only in Tor Browser (and only on Windows and Linux). For this reason, we had to modify also the start-browser script. On macOS we still had profile.ini, which we do not need anymore, so this commit removes it. Also, we are disabling the profile migration in the browser build configuration (tor-browser#41577), so the logic to populate the override.ini has been removed, too. Finally, we had two .dmg templates: one for installing Tor Browser to /Applications, and one to install it to the desktop. We were not using the latter anymore, and this commits duplicate the former to start differentiating the dmg resources between the various browsers. - - - - - 14 changed files: - projects/browser/Bundle-Data/mac-applications.dmg/.DS_Store → projects/browser/Bundle-Data/BaseBrowser.dmg/.DS_Store - projects/browser/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns → projects/browser/Bundle-Data/BaseBrowser.dmg/.VolumeIcon.icns - projects/browser/Bundle-Data/mac-applications.dmg/.background/background.tiff → projects/browser/Bundle-Data/BaseBrowser.dmg/.background/background.tiff - projects/browser/Bundle-Data/mac-desktop.dmg/.DS_Store → projects/browser/Bundle-Data/TorBrowser.dmg/.DS_Store - + projects/browser/Bundle-Data/TorBrowser.dmg/.VolumeIcon.icns - + projects/browser/Bundle-Data/TorBrowser.dmg/.background/background.tiff - − projects/browser/Bundle-Data/mac-desktop.dmg/._Desktop - − projects/browser/Bundle-Data/mac-desktop.dmg/.background/background.png - − projects/browser/Bundle-Data/mac-desktop.dmg/Desktop - projects/browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults → projects/browser/Bundle-Data/mac/Contents/Resources/TorBrowser/Tor/torrc-defaults - − projects/browser/Bundle-Data/mac/TorBrowser/Data/Browser/profiles.ini - − projects/browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc - projects/browser/RelativeLink/start-browser - projects/browser/build Changes: ===================================== projects/browser/Bundle-Data/mac-applications.dmg/.DS_Store → projects/browser/Bundle-Data/BaseBrowser.dmg/.DS_Store ===================================== ===================================== projects/browser/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns → projects/browser/Bundle-Data/BaseBrowser.dmg/.VolumeIcon.icns ===================================== ===================================== projects/browser/Bundle-Data/mac-applications.dmg/.background/background.tiff → projects/browser/Bundle-Data/BaseBrowser.dmg/.background/background.tiff ===================================== ===================================== projects/browser/Bundle-Data/mac-desktop.dmg/.DS_Store → projects/browser/Bundle-Data/TorBrowser.dmg/.DS_Store ===================================== Binary files a/projects/browser/Bundle-Data/mac-desktop.dmg/.DS_Store and b/projects/browser/Bundle-Data/TorBrowser.dmg/.DS_Store differ ===================================== projects/browser/Bundle-Data/TorBrowser.dmg/.VolumeIcon.icns ===================================== Binary files /dev/null and b/projects/browser/Bundle-Data/TorBrowser.dmg/.VolumeIcon.icns differ ===================================== projects/browser/Bundle-Data/TorBrowser.dmg/.background/background.tiff ===================================== Binary files /dev/null and b/projects/browser/Bundle-Data/TorBrowser.dmg/.background/background.tiff differ ===================================== projects/browser/Bundle-Data/mac-desktop.dmg/._Desktop deleted ===================================== Binary files a/projects/browser/Bundle-Data/mac-desktop.dmg/._Desktop and /dev/null differ ===================================== projects/browser/Bundle-Data/mac-desktop.dmg/.background/background.png deleted ===================================== Binary files a/projects/browser/Bundle-Data/mac-desktop.dmg/.background/background.png and /dev/null differ ===================================== projects/browser/Bundle-Data/mac-desktop.dmg/Desktop deleted ===================================== Binary files a/projects/browser/Bundle-Data/mac-desktop.dmg/Desktop and /dev/null differ ===================================== projects/browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults → projects/browser/Bundle-Data/mac/Contents/Resources/TorBrowser/Tor/torrc-defaults ===================================== ===================================== projects/browser/Bundle-Data/mac/TorBrowser/Data/Browser/profiles.ini deleted ===================================== @@ -1,9 +0,0 @@ -[General] -StartWithLastProfile=1 - -[Profile0] -Name=default -IsRelative=1 -Path=profile.default -Default=1 - ===================================== projects/browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc deleted ===================================== ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -92,7 +92,7 @@ if test -r /proc/cpuinfo && ! grep -q '^flags\s*:.* sse2' /proc/cpuinfo; then exit 1 fi -tbb_usage () { +print_usage () { printf "\n[% c('var/Project_Name') %] Script Options\n" printf " --verbose Display Tor and Firefox output in the terminal\n" printf " --log [file] Record Tor and Firefox output in file (default: [% c('var/project-name') %].log)\n" @@ -357,27 +357,22 @@ cd "${HOME}" if [ "$show_usage" -eq 1 ]; then # Display Firefox help, then our help [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ - --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ - -profile [% c('var/ProjectName') %]/Data/Browser/profile.default --help 2>/dev/null - tbb_usage + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" --help 2>/dev/null + print_usage elif [ "$detach" -eq 1 ] ; then [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ - --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ - -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" > "$logfile" 2>&1 </dev/null & disown "$!" elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ - --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ - -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" 2>&1 </dev/null | \ tee "$logfile" elif [ "$show_output" -eq 1 ]; then [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ - --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ - -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" < /dev/null + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" < /dev/null else [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ - --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ - -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" > "$logfile" 2>&1 </dev/null fi exit $? ===================================== projects/browser/build ===================================== @@ -203,31 +203,18 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz END; %] [% IF c("var/macos") %] - # The Bundle-Data is designed for embedded data, so we need to modify - # the structure when we want the data to be outside the app directory. - # We also create an override.ini file to disable the profile migrator. - SKELETON_TMP=$rootdir/Bundle-Data/mac-skeleton-tmp - SKELETON_TMP_RESOURCES=$SKELETON_TMP/Contents/Resources - mkdir -p $SKELETON_TMP_RESOURCES/browser - echo "[XRE]" > $SKELETON_TMP_RESOURCES/browser/override.ini - echo "EnableProfileMigrator=0" >> $SKELETON_TMP_RESOURCES/browser/override.ini - [% IF c("var/tor-browser") -%] - mkdir -p $SKELETON_TMP_RESOURCES/TorBrowser/Tor - cp -p Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults $SKELETON_TMP_RESOURCES/TorBrowser/Tor/ - [% END -%] - rm -Rf Bundle-Data/mac - mv $SKELETON_TMP Bundle-Data/mac - - tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x + tar -C "Bundle-Data/[% c('var/ProjectName') %].dmg" -c . | tar -C $TB_STAGE_DIR -x [% END %] for tbdir in "${TBDIRS[@]}" do mkdir -p "$tbdir/$DOCSPATH" cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH" - tar -C Bundle-Data/[% bundledata_osname %] \ - [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \ - -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x + [% IF c("var/tor-browser") -%] + tar -C Bundle-Data/[% bundledata_osname %] \ + [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \ + -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x + [% END -%] done [% IF c("var/tor-browser") -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 3 commits: Bug 28124: Switch to Mozilla's libdmg-hfsplus
by Richard Pospesel (＠richard) 17 Jan '23

17 Jan '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0ae26788 by Pier Angelo Vendrame at 2023-01-16T19:30:36+00:00 Bug 28124: Switch to Mozilla's libdmg-hfsplus To show the DMG icon it seems we need to create the DMG from a HFS filesystem, rather than an ISO one. So, to then do so, with this commit I am switching to Mozilla's fork of libdmg-hfsplus, I am updating its build script and using it to build also the hfsplus tool. Also, add the hfsplus project, which is needed to create the HFS filesystem in the first place. - - - - - e75f3348 by Pier Angelo Vendrame at 2023-01-16T19:30:36+00:00 Bug 28124: Switch from ISO to HFS and show the disk icon Use the new tools from the previous commit to build the DMG from a HFS filesystem, and configure it to show the custom volume icon. - - - - - 71e464f1 by Pier Angelo Vendrame at 2023-01-16T19:30:36+00:00 Bug 28124: Update the macOS volume icon - - - - - 13 changed files: - projects/browser/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns - − projects/browser/Bundle-Data/mac-applications.dmg/Applications - projects/browser/build - projects/browser/config - projects/browser/ddmg.sh - + projects/hfsplus-tools/build - + projects/hfsplus-tools/config - + projects/hfsplus-tools/only-newfs_include.diff - projects/libdmg-hfsplus/build - projects/libdmg-hfsplus/config - − projects/libdmg-hfsplus/libdmg.patch - tools/signing/ddmg.sh - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/browser/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns ===================================== Binary files a/projects/browser/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns and b/projects/browser/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns differ ===================================== projects/browser/Bundle-Data/mac-applications.dmg/Applications deleted ===================================== @@ -1 +0,0 @@ -/Applications \ No newline at end of file ===================================== projects/browser/build ===================================== @@ -33,8 +33,9 @@ touch "$GENERATEDPREFSPATH" TORBINPATH=Contents/MacOS/Tor TORCONFIGPATH=Contents/Resources/TorBrowser/Tor + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/hfsplus-tools') %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/libdmg') %] - export PATH=/var/tmp/dist/libdmg-hfsplus:$PATH + export PATH=/var/tmp/dist/hfsplus-tools:/var/tmp/dist/libdmg-hfsplus:$PATH [% ELSE %] TBDIR=$TB_STAGE_DIR/Browser TBDIRS=("$TBDIR") ===================================== projects/browser/config ===================================== @@ -33,7 +33,6 @@ targets: macos: var: arch_deps: - - genisoimage - faketime - python3-dev - python3-pip @@ -106,6 +105,9 @@ input_files: sha256sum: 078026ae894fe516ce9e61a1084d1b6dc883cd72c51027de342132141ca7f00d - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' + - project: hfsplus-tools + name: hfsplus-tools + enable: '[% c("var/macos") %]' - project: libdmg-hfsplus name: libdmg enable: '[% c("var/macos") %]' ===================================== projects/browser/ddmg.sh ===================================== @@ -5,17 +5,26 @@ find [% src %] ! -executable -exec chmod 0644 {} \; find [% src %] -exec [% c("touch") %] {} \; dmg_tmpdir=\$(mktemp -d) -[% SET filelist = '"\$dmg_tmpdir/filelist.txt"' %] -pushd [% src %] -find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] -find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] +hfsfile="\$dmg_tmpdir/tbb-uncompressed.dmg" +# hfsplus sets all the times to time(NULL) export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "\$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 +# Use a similar strategy to Mozilla (they have 1.02, we have 1.1) +size=\$(du -ms [% src %] | awk '{ print int( \$1 * 1.1 ) }') +dd if=/dev/zero of="\$hfsfile" bs=1M count=\$size +newfs_hfs -v "[% c("var/Project_Name") %]" "\$hfsfile" -dmg dmg "\$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] +pushd [% src %] + +hfsplus "\$hfsfile" addall . +# hfsplus does not play well with dangling links +hfsplus "\$hfsfile" symlink /Applications /Applications +# Show the volume icon +hfsplus "\$hfsfile" attr / C + +dmg dmg "\$hfsfile" [% c('dmg_out', { error_if_undef => 1 }) %] popd rm -Rf "\$dmg_tmpdir" ===================================== projects/hfsplus-tools/build ===================================== @@ -0,0 +1,22 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir /var/tmp/dist +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/clang') %] +export PATH="/var/tmp/dist/clang/bin:$PATH" + +tar -xf diskdev_cmds-[% c("version") %].tar.gz +cd diskdev_cmds-[% c("version") %] + +patch -p1 < $rootdir/only-newfs_include.diff + +make -j[% c("num_procs") %] + +mkdir -p "$distdir" +cp newfs_hfs.tproj/newfs_hfs "$distdir/" + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/hfsplus-tools/config ===================================== @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: 540.1.linux3 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 +var: + deps: + - build-essential + - libssl-dev + - uuid-dev +input_files: + # See hfsplus-tools in taskcluster/ci/fetch/toolchains.yml + - URL: https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/diskdev_cmds-540.1.li… c("version") %].tar.gz + sha256: b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497 + - project: container-image + # The project uses a flag that is not supported by GCC + - name: clang + project: clang + # Build only newfs (we do not care of fsck), and remove a header that does not + # exist on Linux (at that path) and is not required on Linux either. + - filename: only-newfs_include.diff ===================================== projects/hfsplus-tools/only-newfs_include.diff ===================================== @@ -0,0 +1,25 @@ +diff '--color=auto' -Naur diskdev_cmds-540.1.linux3_orig/Makefile diskdev_cmds-540.1.linux3/Makefile +--- diskdev_cmds-540.1.linux3_orig/Makefile 2023-01-13 10:01:32.474525600 +0100 ++++ diskdev_cmds-540.1.linux3/Makefile 2023-01-13 10:01:50.346876760 +0100 +@@ -3,7 +3,7 @@ + CC := clang + CFLAGS := -g3 -Wall -fblocks -I$(PWD)/BlocksRunTime -I$(PWD)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1 -D VERSION=\"$(VERSION)\" + LDFLAGS := -Wl,--build-id -L$(PWD)/BlocksRunTime +-SUBDIRS := BlocksRunTime newfs_hfs.tproj fsck_hfs.tproj ++SUBDIRS := newfs_hfs.tproj + + all clean: + for d in $(SUBDIRS); do $(MAKE) -C $$d -f Makefile.lnx $@; done +diff '--color=auto' -Naur diskdev_cmds-540.1.linux3_orig/newfs_hfs.tproj/makehfs.c diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c +--- diskdev_cmds-540.1.linux3_orig/newfs_hfs.tproj/makehfs.c 2023-01-13 10:01:32.474525600 +0100 ++++ diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 2023-01-13 10:02:07.899221800 +0100 +@@ -38,8 +38,8 @@ + #endif + #include <sys/errno.h> + #include <sys/stat.h> +-#include <sys/sysctl.h> + #if !LINUX ++#include <sys/sysctl.h> + #include <sys/vmmeter.h> + #endif + ===================================== projects/libdmg-hfsplus/build ===================================== @@ -1,16 +1,22 @@ #!/bin/bash [% c("var/set_default_env") -%] -distdir=$(pwd)/dist -mkdir -p $distdir/[% project %] -tar xf [% project %]-[% c('version') %].tar.gz -cd [% project %]-[% c('version') %] -patch -p1 < ../libdmg.patch -cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt -cd dmg -make -j[% c("num_procs") %] -make install -cd $distdir +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" + +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +cmake . -GNinja -DCMAKE_BUILD_TYPE=Release +ninja -j[% c("num_procs") %] -v + +mkdir $distdir +# We take only dmg and hfsplus like Mozilla does +cp dmg/dmg hfs/hfsplus $distdir/ +cd /var/tmp/dist [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] + }) %] ===================================== projects/libdmg-hfsplus/config ===================================== @@ -1,16 +1,18 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://github.com/vasi/libdmg-hfsplus -git_hash: dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 +git_url: https://github.com/mozilla/libdmg-hfsplus +git_hash: 2ee327795680101d36f9700bd0fb618362237718 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 var: deps: - build-essential - - cmake - zlib1g-dev - libbz2-dev input_files: - project: container-image - - filename: libdmg.patch + - name: cmake + project: cmake + - name: ninja + project: ninja ===================================== projects/libdmg-hfsplus/libdmg.patch deleted ===================================== @@ -1,39 +0,0 @@ -From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Thu, 6 Mar 2014 19:47:05 -0800 -Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. - -Some of the struct padding and fields contained unitialized memory, which -caused two successive invocations to produce archives that differed in some -bytes. ---- - dmg/dmglib.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dmg/dmglib.c b/dmg/dmglib.c -index f481b1f..b74e50b 100644 ---- a/dmg/dmglib.c -+++ b/dmg/dmglib.c -@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { - ChecksumToken dataForkToken; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - off_t plistOffset; - uint32_t plistSize; - uint32_t dataForkChecksum; -@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { - uint64_t numSectors; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - char partitionName[512]; - - off_t fileLength; --- -1.8.1.2 - ===================================== tools/signing/ddmg.sh ===================================== @@ -21,20 +21,33 @@ find $src_dir ! -executable -exec chmod 0644 {} \; 2> /dev/null find $src_dir -exec touch -m -t 200001010101 {} \; 2> /dev/null set -e +VOLUME_LABEL="${VOLUME_LABEL:-Tor Browser}" + dmg_tmpdir=$(mktemp -d) -filelist="$dmg_tmpdir/filelist.txt" -cd $src_dir -find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > $filelist -find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> $filelist +hfsfile="$dmg_tmpdir/tbb-uncompressed.dmg" export LD_PRELOAD=$faketime_path export FAKETIME="2000-01-01 01:01:01" echo "Starting: " $(basename $dest_file) -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list $filelist -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 +# Use a similar strategy to Mozilla (they have 1.02, we have 1.1) +size=$(du -ms "$src_dir" | awk '{ print int( $1 * 1.1 ) }') +dd if=/dev/zero of="$hfsfile" bs=1M count=$size +newfs_hfs -v "$VOLUME_LABEL" "$hfsfile" + +cd $src_dir + +# hfsplus does not play well with dangling links, so remove /Applications, and +# add it back again with the special command to do so. +rm -f Applications + +hfsplus "$hfsfile" addall . +hfsplus "$hfsfile" symlink /Applications /Applications +# Show the volume icon +hfsplus "$hfsfile" attr / C -dmg dmg "$dmg_tmpdir/tbb-uncompressed.dmg" "$dest_file" +dmg dmg "$hfsfile" "$dest_file" echo "Finished: " $(basename $dest_file) ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -35,18 +35,22 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -which genisoimage > /dev/null || \ - exit_error 'genisoimage is missing. You should install the genisoimage package.' test -f $faketime_path || \ exit_error "$faketime_path is missing" test -d $macos_stapled_dir || \ exit_error "The stapled macos zip files should be placed in directory $macos_stapled_dir" -libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-dfd5e5cc3dc1-c9296e.tar.gz" +libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-2ee327795680-aa3810.tar.gz" test -f "$libdmg_file" || \ exit_error "$libdmg_file is missing." \ "You can build it with:" \ " ./rbm/rbm build --target no_containers libdmg-hfsplus" \ "See var/deps in projects/libdmg-hfsplus/config for the list of build dependencies" +# hfsplus-tools needs to be compiled with Clang, so its build id might change +hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-*.tar.gz" +test -f "$hfstools_file" || \ + exit_error "$hfstools_file is missing." \ + "You can build it with:" \ + " ./rbm/rbm build hfsplus-tools --target alpha --target torbrowser-macos-x86_64" test -d "$macos_signed_dir" || mkdir "$macos_signed_dir" tmpdir="$macos_stapled_dir/tmp" @@ -55,7 +59,8 @@ mkdir "$tmpdir" cp -rT "$script_dir/../../projects/browser/Bundle-Data/mac-applications.dmg" "$tmpdir/dmg" tar -C "$tmpdir" -xf "$libdmg_file" -export PATH="$PATH:$tmpdir/libdmg-hfsplus" +tar -C "$tmpdir" -xf "$hfstools_file" +export PATH="$PATH:$tmpdir/libdmg-hfsplus:$tmpdir/hfsplus-tools" for lang in $bundle_locales do View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] Bug 40717: Hide Windows SSO in settings
by Richard Pospesel (＠richard) 16 Jan '23

16 Jan '23

Richard Pospesel pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: dc89a593 by cypherpunks1 at 2023-01-16T18:23:30+00:00 Bug 40717: Hide Windows SSO in settings (cherry picked from commit 1bacd26df8a8ffe481e11ec6b8323150fdf2011d) - - - - - 1 changed file: - browser/themes/shared/preferences/preferences.css Changes: ===================================== browser/themes/shared/preferences/preferences.css ===================================== @@ -583,8 +583,7 @@ richlistitem[selected] .actionsMenu:focus-visible { margin-inline-start: 0; } -@media (-moz-platform: windows-win7), - (-moz-platform: windows-win8) { +@media (-moz-platform: windows) { #windows-sso, #windows-sso-caption { display: none; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc89a59… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc89a59… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] Bug 40717: Hide Windows SSO in settings
by Richard Pospesel (＠richard) 16 Jan '23

16 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1bacd26d by cypherpunks1 at 2023-01-16T18:16:25+00:00 Bug 40717: Hide Windows SSO in settings - - - - - 1 changed file: - browser/themes/shared/preferences/preferences.css Changes: ===================================== browser/themes/shared/preferences/preferences.css ===================================== @@ -583,8 +583,7 @@ richlistitem[selected] .actionsMenu:focus-visible { margin-inline-start: 0; } -@media (-moz-platform: windows-win7), - (-moz-platform: windows-win8) { +@media (-moz-platform: windows) { #windows-sso, #windows-sso-caption { display: none; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1bacd26… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1bacd26… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40739: tor-expert-bundle should include ClientTransportPlugin torrc lines...
by Richard Pospesel (＠richard) 16 Jan '23

16 Jan '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 67b73ad7 by Richard Pospesel at 2023-01-16T17:49:05+00:00 Bug 40739: tor-expert-bundle should include ClientTransportPlugin torrc lines for each pluggable transport - - - - - 3 changed files: - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - + projects/tor-expert-bundle/pt_config.json Changes: ===================================== projects/tor-expert-bundle/build ===================================== @@ -17,6 +17,9 @@ mv $rootdir/bridges_list.obfs4.txt . mv $rootdir/bridges_list.meek-azure.txt . mv $rootdir/bridges_list.snowflake.txt . +# add per-platform pt extension +awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json + cd $distdir [% SET tar_src = [ "tor", "data" ]; ===================================== projects/tor-expert-bundle/config ===================================== @@ -5,6 +5,11 @@ version: '[% c("var/torbrowser_version") %]' container: use_container: 1 +targets: + windows: + var: + pt_extension: .exe + input_files: - project: container-image - name: tor @@ -13,6 +18,7 @@ input_files: project: obfs4 - name: snowflake project: snowflake + - filename: pt_config.json - filename: bridges_list.obfs4.txt - filename: bridges_list.meek-azure.txt - filename: bridges_list.snowflake.txt ===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -0,0 +1,30 @@ +{ + "recommendedDefault" : "obfs4", + "pluggableTransports" : { + "obfs4proxy" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${pt_extension}", + "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}" + }, + "bridges" : { + "meek-azure" : [ + "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + ], + "obfs4" : [ + "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1", + "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0", + "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0", + "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0", + "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0", + "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0", + "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0", + "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0", + "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0", + "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0", + "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" + ], + "snowflake" : [ + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" + ] + } +} + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40739: tor-expert-bundle should include ClientTransportPlugin torrc lines...
by Richard Pospesel (＠richard) 16 Jan '23

16 Jan '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f13e5d4b by Richard Pospesel at 2023-01-16T17:32:44+00:00 Bug 40739: tor-expert-bundle should include ClientTransportPlugin torrc lines for each pluggable transport - - - - - 3 changed files: - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - + projects/tor-expert-bundle/pt_config.json Changes: ===================================== projects/tor-expert-bundle/build ===================================== @@ -18,6 +18,9 @@ mv $rootdir/bridges_list.obfs4.txt . mv $rootdir/bridges_list.meek-azure.txt . mv $rootdir/bridges_list.snowflake.txt . +# add per-platform pt extension +awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json + cd $distdir [% SET tar_src = [ "tor", "data" ]; ===================================== projects/tor-expert-bundle/config ===================================== @@ -5,6 +5,11 @@ version: '[% c("var/torbrowser_version") %]' container: use_container: 1 +targets: + windows: + var: + pt_extension: .exe + input_files: - project: container-image - name: tor @@ -15,6 +20,7 @@ input_files: project: snowflake - project: webtunnel name: webtunnel + - filename: pt_config.json - filename: bridges_list.obfs4.txt - filename: bridges_list.meek-azure.txt - - filename: bridges_list.snowflake.txt \ No newline at end of file + - filename: bridges_list.snowflake.txt ===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -0,0 +1,31 @@ +{ + "recommendedDefault" : "obfs4", + "pluggableTransports" : { + "obfs4proxy" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${pt_extension}", + "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}", + "webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}" + }, + "bridges" : { + "meek-azure" : [ + "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + ], + "obfs4" : [ + "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1", + "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0", + "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0", + "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0", + "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0", + "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0", + "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0", + "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0", + "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0", + "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0", + "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" + ], + "snowflake" : [ + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" + ] + } +} + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 16 Jan '23

16 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 25c9ff8b by Pier Angelo Vendrame at 2023-01-16T15:46:28+01:00 fixup! Base Browser's .mozconfigs. Bug 41577: Disable profile migration - - - - - 1 changed file: - browser/confvars.sh Changes: ===================================== browser/confvars.sh ===================================== @@ -17,7 +17,8 @@ MOZ_BRANDING_DIRECTORY=browser/branding/unofficial MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} -MOZ_PROFILE_MIGRATOR=1 +# tor-browser#41577: Do not enable profile migration +# MOZ_PROFILE_MIGRATOR=1 # Include the DevTools client, not just the server (which is the default) MOZ_DEVTOOLS=all View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/25c9ff8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/25c9ff8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 16 Jan '23

16 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 7ccd1077 by Pier Angelo Vendrame at 2023-01-16T15:20:56+01:00 fixup! Base Browser's .mozconfigs. Bug 41577: Disable profile migration - - - - - 1 changed file: - browser/confvars.sh Changes: ===================================== browser/confvars.sh ===================================== @@ -32,7 +32,8 @@ else MAR_CHANNEL_ID=torbrowser-torproject-release fi -MOZ_PROFILE_MIGRATOR=1 +# tor-browser#41577: Do not enable profile migration +# MOZ_PROFILE_MIGRATOR=1 # Include the DevTools client, not just the server (which is the default) MOZ_DEVTOOLS=all View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7ccd107… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7ccd107… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Add default merge request template
by Richard Pospesel (＠richard) 16 Jan '23

16 Jan '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0ab09cee by Richard Pospesel at 2023-01-16T04:39:44+00:00 Add default merge request template - - - - - 1 changed file: - + .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -0,0 +1,21 @@ +## Merge Info + + + +- ### Related Issues + - tor-browser#xxxxx + - tor-browser-build#xxxxx + - etc + +- ### Backport Timeline + - [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build) + - [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport + - [ ] **Eventually** - patchset that needs to be verified in alpha before backport + - [ ] **No Backport** - patchset for the next major stable + +- ### Issue Tracking + - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation + +## Change Description + + \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] Bug 40283: Workaround for the file upload bug
by Richard Pospesel (＠richard) 14 Jan '23

14 Jan '23

Richard Pospesel pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 8462f81d by p13dz at 2023-01-13T19:43:57+00:00 Bug 40283: Workaround for the file upload bug (cherry picked from commit c23f2f397327ee46a1a4de57acf206fd83e8e170) - - - - - 1 changed file: - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java Changes: ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java ===================================== @@ -4726,12 +4726,19 @@ public class GeckoSession { return super.confirm(); } + private static String normalizePath(String input) { + // For an unclear reason, Android media picker delivers file paths + // starting with double slash. Firefox performs path validation on + // all paths, and double slash is deemed invalid. + return input.startsWith("//") ? input.substring(1) : input; + } + private static String getFile(final @NonNull Context context, final @NonNull Uri uri) { if (uri == null) { return null; } if ("file".equals(uri.getScheme())) { - return uri.getPath(); + return normalizePath(uri.getPath()); } final ContentResolver cr = context.getContentResolver(); final Cursor cur = @@ -4753,7 +4760,7 @@ public class GeckoSession { try { final String path = cur.getString(idx); if (path != null && !path.isEmpty()) { - return path; + return normalizePath(path); } } catch (final Exception e) { } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8462f81… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8462f81… You're receiving this email because of your account on gitlab.torproject.org.

1 0