Merge pull request #1629 from mig5/prep_2.6.1

Update obfs4proxy, meek and tor versions. Try building 32-bit snapcraft. Bump Onionshare version to 2.6.1

15 files changed, 60 insertions, 57 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0420b288..46add218 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -348,6 +348,7 @@ jobs:
         run: |
           sudo lxd init --auto
           sudo snap install snapcraft --classic
+          sudo ufw disable
 
       - name: Build snap
         run: sudo snapcraft --use-lxd
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91a8756d..794e7ff0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # OnionShare Changelog
 
+## 2.6.1
+
+* Upgrade Tor, Meek, and obfs4proxy versions
+* Bug fix: Restore the primary_action mode settings in a tab after OnionShare reconnects to Tor
+
 ## 2.6
 
 * Major feature: a new 'Quickstart' screen, which enables toggling on or off an animated automatic connection to Tor. This allows configuring network settings prior to automatic connection.
diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt
index c20c8ac5..6a6a3d8e 100644
--- a/cli/onionshare_cli/resources/version.txt
+++ b/cli/onionshare_cli/resources/version.txt
@@ -1 +1 @@
-2.6
\ No newline at end of file
+2.6.1
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
index 80f8796c..cb2cde53 100644
--- a/cli/pyproject.toml
+++ b/cli/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onionshare_cli"
-version = "2.6"
+version = "2.6.1"
 description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service."
 authors = ["Micah Lee <micah@micahflee.com>"]
 license = "GPLv3+"
diff --git a/desktop/org.onionshare.OnionShare.appdata.xml b/desktop/org.onionshare.OnionShare.appdata.xml
index 9aa5474e..3134f74f 100644
--- a/desktop/org.onionshare.OnionShare.appdata.xml
+++ b/desktop/org.onionshare.OnionShare.appdata.xml
@@ -24,6 +24,6 @@
     <update_contact>micah@micahflee.com</update_contact>
     <content_rating type="oars-1.1" />
     <releases>
-        <release type="development" date="2022-10-09" version="2.6" />
+        <release type="development" date="2022-10-18" version="2.6.1" />
     </releases>
 </component>
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml
index bb4ae5f6..d1886212 100644
--- a/desktop/pyproject.toml
+++ b/desktop/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onionshare"
-version = "2.6"
+version = "2.6.1"
 description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service."
 authors = ["Micah Lee <micah@micahflee.com>"]
 license = "GPLv3+"
diff --git a/desktop/scripts/build-pt-obfs4proxy.ps1 b/desktop/scripts/build-pt-obfs4proxy.ps1
index fa760b85..5b709812 100644
--- a/desktop/scripts/build-pt-obfs4proxy.ps1
+++ b/desktop/scripts/build-pt-obfs4proxy.ps1
@@ -1,4 +1,4 @@
-$env:OBFS4PROXY_TAG = 'obfs4proxy-0.0.13'
+$env:OBFS4PROXY_TAG = 'obfs4proxy-0.0.14'
 
 New-Item -ItemType Directory -Force -Path .\build\obfs4proxy
 cd .\build\obfs4proxy
diff --git a/desktop/scripts/build-pt-obfs4proxy.sh b/desktop/scripts/build-pt-obfs4proxy.sh
index 15b317a3..7fdebd01 100755
--- a/desktop/scripts/build-pt-obfs4proxy.sh
+++ b/desktop/scripts/build-pt-obfs4proxy.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-OBFS4PROXY_TAG=obfs4proxy-0.0.13
+OBFS4PROXY_TAG=obfs4proxy-0.0.14
 
 mkdir -p ./build/obfs4proxy
 cd ./build/obfs4proxy
 git clone https://gitlab.com/yawning/obfs4 || echo "already cloned"
 cd obfs4
 git checkout $OBFS4PROXY_TAG
-go build -o ../../../onionshare/resources/tor/obfs4proxy ./obfs4proxy
\ No newline at end of file
+go build -o ../../../onionshare/resources/tor/obfs4proxy ./obfs4proxy
diff --git a/desktop/scripts/build-pt-snowflake.ps1 b/desktop/scripts/build-pt-snowflake.ps1
index 51a127c9..0c30133c 100644
--- a/desktop/scripts/build-pt-snowflake.ps1
+++ b/desktop/scripts/build-pt-snowflake.ps1
@@ -1,4 +1,4 @@
-$env:SNOWFLAKE_TAG = 'v2.2.0'
+$env:SNOWFLAKE_TAG = 'v2.3.1'
 
 New-Item -ItemType Directory -Force -Path .\build\snowflake
 cd .\build\snowflake
diff --git a/desktop/scripts/build-pt-snowflake.sh b/desktop/scripts/build-pt-snowflake.sh
index 24a7ce74..94300491 100755
--- a/desktop/scripts/build-pt-snowflake.sh
+++ b/desktop/scripts/build-pt-snowflake.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SNOWFLAKE_TAG=v2.2.0
+SNOWFLAKE_TAG=v2.3.1
 
 mkdir -p ./build/snowflake
 cd ./build/snowflake
diff --git a/desktop/scripts/get-tor.py b/desktop/scripts/get-tor.py
index f39558be..b7f031ac 100644
--- a/desktop/scripts/get-tor.py
+++ b/desktop/scripts/get-tor.py
@@ -9,28 +9,28 @@ import subprocess
 import requests
 import click
 
-torbrowser_version = "11.5.2"
+torbrowser_version = "12.0"
 expected_win32_sha256 = (
-    "07e721ae76bc7eefe25f20792091009238e9568d500331fc64bdd8796fec8c0f"
+    "a9cc0f0af2ce8ca0d7a27d65c7efa37f6419cfc793fa80371e7db73d44b4cc02"
 )
 expected_win64_sha256 = (
-    "8237bca22b5fa545de21f84ba8c9270c84442d0fc50a2e626f757d069e4bc7a8"
+    "f496cc0219c8b73f1f100124d6514bad55f503ff76202747f23620a6677e83c2"
 )
 expected_macos_sha256 = (
-    "b80d3dba83b343fab7a6c8fc08440b2751da1ac12f86fe593da8e74069e4d7f6"
+    "11c8360187356e6c0837612a320f1a117303fc449602c9fd73f4faf9f9bbcfc9"
 )
 expected_linux64_sha256 = (
-    "90cdce3854e9114ee7232aaa74672a2d9f3a40b6fa8ac33971f586ee3a3cf75a"
+    "850ce601d815bac63e4f5937646d2b497173be28b27b30a7526ebb946a459874"
 )
 
-win32_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/torbrowser-install-{torbrowser_version}_en-US.exe"
-win32_filename = f"torbrowser-install-{torbrowser_version}_en-US.exe"
-win64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/torbrowser-install-win64-{torbrowser_version}_en-US.exe"
-win64_filename = f"torbrowser-install-win64-{torbrowser_version}_en-US.exe"
-macos_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/TorBrowser-{torbrowser_version}-osx64_en-US.dmg"
-macos_filename = f"TorBrowser-{torbrowser_version}-osx64_en-US.dmg"
-linux64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/tor-browser-linux64-{torbrowser_version}_en-US.tar.xz"
-linux64_filename = f"tor-browser-linux64-{torbrowser_version}_en-US.tar.xz"
+win32_filename = f"torbrowser-install-{torbrowser_version}_ALL.exe"
+win32_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{win32_filename}"
+win64_filename = f"torbrowser-install-win64-{torbrowser_version}_ALL.exe"
+win64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{win64_filename}"
+macos_filename = f"TorBrowser-{torbrowser_version}-macos_ALL.dmg"
+macos_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{macos_filename}"
+linux64_filename = f"tor-browser-linux64-{torbrowser_version}_ALL.tar.xz"
+linux64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{linux64_filename}"
 
 
 # Common paths
@@ -46,32 +46,14 @@ def get_tor_windows(platform):
         win_filename = win32_filename
         expected_win_sha256 = expected_win32_sha256
         bin_filenames = [
-            "libcrypto-1_1.dll",
-            "libevent-2-1-7.dll",
-            "libevent_core-2-1-7.dll",
-            "libevent_extra-2-1-7.dll",
-            "libgcc_s_dw2-1.dll",
-            "libssl-1_1.dll",
-            "libssp-0.dll",
-            "libwinpthread-1.dll",
-            "tor.exe",
-            "zlib1.dll",
+            "tor.exe"
         ]
     elif platform == "win64":
         win_url = win64_url
         win_filename = win64_filename
         expected_win_sha256 = expected_win64_sha256
         bin_filenames = [
-            "libcrypto-1_1-x64.dll",
-            "libevent-2-1-7.dll",
-            "libevent_core-2-1-7.dll",
-            "libevent_extra-2-1-7.dll",
-            "libgcc_s_seh-1.dll",
-            "libssl-1_1-x64.dll",
-            "libssp-0.dll",
-            "libwinpthread-1.dll",
-            "tor.exe",
-            "zlib1.dll",
+            "tor.exe"
         ]
     else:
         click.echo("invalid platform")
diff --git a/desktop/setup.py b/desktop/setup.py
index 12a6cda4..7e947f51 100644
--- a/desktop/setup.py
+++ b/desktop/setup.py
@@ -3,7 +3,7 @@
 import setuptools
 
 # The version must be hard-coded because Snapcraft won't have access to ../cli
-version = "2.6"
+version = "2.6.1"
 
 setuptools.setup(
     name="onionshare",
diff --git a/docs/source/conf.py b/docs/source/conf.py
index c3f26ba3..5b1cd57a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,6 +1,6 @@
 project = "OnionShare"
 author = copyright = "Micah Lee, et al."
-version = release = "2.6"
+version = release = "2.6.1"
 
 extensions = ["sphinx_rtd_theme"]
 templates_path = ["_templates"]
@@ -24,7 +24,7 @@ languages = [
     ("Українська", "uk"),  # Ukrainian
 ]
 
-versions = ["2.3", "2.3.1", "2.3.2", "2.3.3", "2.4", "2.5", "2.6"]
+versions = ["2.3", "2.3.1", "2.3.2", "2.3.3", "2.4", "2.5", "2.6", "2.6.1"]
 
 html_theme = "sphinx_rtd_theme"
 html_logo = "_static/logo.png"
diff --git a/flatpak/org.onionshare.OnionShare.yaml b/flatpak/org.onionshare.OnionShare.yaml
index e5946bd8..5796d6a3 100644
--- a/flatpak/org.onionshare.OnionShare.yaml
+++ b/flatpak/org.onionshare.OnionShare.yaml
@@ -35,18 +35,20 @@ modules:
       - /bin
     sources:
       - type: archive
-        sha256: 7ff5f1cc4291fffb6d5a3098b3090abe4d415da2adec740b4e901893d95d7137
-        url: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.3-src/pyside-setup-opensource-src-5.15.3.tar.xz
+        sha256: f61210ae24e6882d5d0ca0059229e5dc4f35e2bca92dd6caf96c0f41943a8294
+        url: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.7-src/pyside-setup-opensource-src-5.15.7.tar.xz
       - type: shell
         commands:
           - mkdir -p /app/include/qt5tmp && cp -R /usr/include/Qt* /app/include/qt5tmp # https://bugreports.qt.io/browse/PYSIDE-787
           - sed -i 's|\(--include-paths=\)|\1/app/include/qt5tmp:|' sources/pyside2/cmake/Macros/PySideModules.cmake
+          - sed -i s/'<private\/qaccessiblequickview_p.h>'/'\"private\/qaccessiblequickview_p.h\"'/ /app/include/qt5tmp/QtQuickWidgets/qaccessiblequickwidget.h
+          - mkdir -p /app/include/qt5tmp/QtQuickWidgets/private && cp /app/include/qt5tmp/QtQuick/5.15.7/QtQuick/private/qaccessiblequickview_p.h /app/include/qt5tmp/QtQuickWidgets/private/qaccessiblequickview_p.h
   - name: tor
     buildsystem: autotools
     sources:
       - type: archive
-        sha256: d39d38598208f4d6201d7edc6ad573b3a898a932a5c68d3074016a9525519b22
-        url: https://dist.torproject.org/tor-0.4.7.9.tar.gz
+        sha256: 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395
+        url: https://dist.torproject.org/tor-0.4.7.12.tar.gz
     modules:
       - name: libevent
         buildsystem: autotools
@@ -80,7 +82,7 @@ modules:
         dest: src/golang.org/x/sys
       - type: git
         url: https://gitlab.com/yawning/obfs4
-        commit: e330d1b7024b4ab04f7d96cc1afc61325744fafc
+        commit: 336a71d6e4cfd2d33e9c57797828007ad74975e9
         dest: src/gitlab.com/yawning/obfs4.git
       - type: git
         url: https://gitlab.com/yawning/utls
@@ -91,6 +93,14 @@ modules:
         commit: 0a714cd429ec754482b4001e918db30cd2094405
         dest: src/gitlab.com/yawning/bsaes.git
       - type: git
+        url: https://gitlab.com/yawning/edwards25519-extra
+        commit: def713fd18e464864613d2b55ef41a21df2c9493
+        dest: src/gitlab.com/yawning/edwards25519-extra.git
+      - type: git
+        url: https://github.com/FiloSottile/edwards25519
+        commit: 8c58ed0e35502a485538e4c5ec086070840f3410
+        dest: src/filippo.io/edwards25519
+      - type: git
         url: https://git.torproject.org/pluggable-transports/goptlib
         commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09
         dest: src/git.torproject.org/pluggable-transports/goptlib.git
@@ -173,9 +183,13 @@ modules:
         dest: src/git.torproject.org/pluggable-transports/goptlib.git
       - type: git
         url: https://git.torproject.org/pluggable-transports/snowflake
-        commit: ead5a960d7fa19dc890ccbfc0765c5ab6629eaa9
+        commit: 36f03dfd4483922b3e7400dedc71df9cf2f30b6b
         dest: src/git.torproject.org/pluggable-transports/snowflake.git
       - type: git
+        url: https://github.com/refraction-networking/utls
+        commit: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0
+        dest: src/github.com/refraction-networking/utls
+      - type: git
         url: https://github.com/templexxx/xorsimd
         commit: e2f34adfb57b524164fc712df2fcfd991ed0ccad
         dest: src/github.com/templexxx/xorsimd
@@ -469,4 +483,4 @@ modules:
                 sha256: 4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a
               - type: file
                 url: https://files.pythonhosted.org/packages/2e/a7/f20fa91d9de799f8e19bacf225bc993b8a53b5fc6f41ffa20d64f0850579/Cython-3.0.0a11.tar.gz
-                sha256: e4672491fb31546b9abb63677f638e738085dc9321398170956ef6fbfc0e1726
\ No newline at end of file
+                sha256: e4672491fb31546b9abb63677f638e738085dc9321398170956ef6fbfc0e1726
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index fb1e419d..d7f798fb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: onionshare
 base: core20
-version: "2.6"
+version: "2.6.1"
 summary: Securely and anonymously share files, host websites, and chat using Tor
 description: |
   OnionShare lets you securely and anonymously send and receive files. It works by starting
@@ -12,6 +12,7 @@ grade: stable # stable or devel
 confinement: strict
 
 architectures:
+  - build-on: i386
   - build-on: amd64
   - build-on: arm64
   - build-on: armhf
@@ -193,8 +194,8 @@ parts:
     after: [onionshare-cli]
 
   tor:
-    source: https://dist.torproject.org/tor-0.4.7.9.tar.gz
-    source-checksum: sha256/d39d38598208f4d6201d7edc6ad573b3a898a932a5c68d3074016a9525519b22
+    source: https://dist.torproject.org/tor-0.4.7.12.tar.gz
+    source-checksum: sha256/3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395
     source-type: tar
     plugin: autotools
     autotools-configure-parameters:
@@ -216,7 +217,7 @@ parts:
       - go/latest/stable
     source: https://gitlab.com/yawning/obfs4.git
     source-type: git
-    source-tag: obfs4proxy-0.0.13
+    source-tag: obfs4proxy-0.0.14
 
   snowflake-client:
     plugin: go
@@ -224,7 +225,7 @@ parts:
       - go/latest/stable
     source: https://git.torproject.org/pluggable-transports/snowflake.git
     source-type: git
-    source-tag: v2.2.0
+    source-tag: v2.3.1
     organize:
       bin/client: bin/snowflake-client