onionshare_cli 2.7__tar.gz → 2.7.1__tar.gz

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: onionshare_cli
-Version: 2.7
+Version: 2.7.1
 Summary: Securely and anonymously share files, host websites, and chat with friends using the Tor network
 License: GPL-3.0-or-later
 Keywords: onion,share,onionshare,tor,anonymous,web server

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/onionshare_cli/__init__.py

@@ -470,8 +470,12 @@ def main(cwd=None):
             sys.exit(1)
 
     if mode == "share":
-        # Prepare files to share
-        print("Compressing files.")
+        # Prepare files to share. A single file is served as-is; only multiple
+        # files or folders are compressed into a zip file.
+        if len(filenames) == 1 and os.path.isfile(filenames[0]):
+            print("Preparing file.")
+        else:
+            print("Compressing files.")
         try:
             web.share_mode.set_file_info(filenames)
         except OSError as e:

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/onionshare_cli/censorship.py

@@ -53,8 +53,10 @@ class CensorshipCircumvention(object):
             self.api_proxies = self.meek.meek_proxies
         if onion:
             self.onion = onion
-            if not self.onion.is_authenticated:
-                return False
+            if not self.onion.is_authenticated():
+                # Tor isn't connected, so leave api_proxies empty. The request_*
+                # methods refuse to run without a proxy, so nothing is sent.
+                return
             else:
                 self.common.log(
                     "CensorshipCircumvention",

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/onionshare_cli/common.py

@@ -673,6 +673,34 @@ class Common:
         eta = remaining_bytes / download_rate
         return Common.format_seconds(eta)
 
+    def drain_subprocess_output(self, stream, module):
+        """
+        Continuously read a subprocess's output pipe on a daemon thread, logging
+        each line, until the subprocess closes it.
+
+        A subprocess that writes to a pipe nobody reads will block as soon as the
+        pipe's buffer fills up. For tor this freezes the whole process, including
+        its control port, so every stem call against it hangs. The buffer is only
+        about 4 KiB on Windows (64 KiB on Linux), small enough that tor's log
+        output while trying several obfs4 bridges is enough to fill it.
+        """
+
+        def drain():
+            try:
+                for line in stream:
+                    if isinstance(line, bytes):
+                        line = line.decode("utf-8", errors="replace")
+                    line = line.rstrip()
+                    if line:
+                        self.log(module, "output", line)
+            except (OSError, ValueError):
+                # The pipe was closed underneath us, e.g. during cleanup
+                pass
+
+        t = threading.Thread(target=drain, daemon=True)
+        t.start()
+        return t
+
     @staticmethod
     def get_available_port(min_port, max_port):
         """

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/onionshare_cli/meek.py

@@ -120,8 +120,16 @@ class Meek(object):
                 universal_newlines=True,
             )
 
-        # Obtain the host and port that meek is running on
-        for line in iter(self.meek_proc.stdout.readline, b""):
+        # meek-client logs to stderr. Keep reading it so it can never fill the
+        # pipe and block meek-client (the buffer is only ~4 KiB on Windows).
+        self.common.drain_subprocess_output(self.meek_proc.stderr, "Meek")
+
+        # Obtain the host and port that meek is running on. Iterating the pipe
+        # ends at EOF, so if meek-client exits without reporting a port we fall
+        # through to MeekNotRunning below. (The pipe is in text mode, so the
+        # previous iter(readline, b"") sentinel never matched "" at EOF, and
+        # this loop spun forever.)
+        for line in self.meek_proc.stdout:
             if "CMETHOD meek socks5" in line:
                 self.meek_host = line.split(" ")[3].split(":")[0]
                 self.meek_port = line.split(" ")[3].split(":")[1].strip()
@@ -138,6 +146,8 @@ class Meek(object):
                 break
 
         if self.meek_port:
+            # Keep draining stdout too, now that we've read the port from it
+            self.common.drain_subprocess_output(self.meek_proc.stdout, "Meek")
             self.meek_proxies = {
                 "http": f"socks5h://{self.meek_host}:{self.meek_port}",
                 "https": f"socks5h://{self.meek_host}:{self.meek_port}",

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/onionshare_cli/onion.py

@@ -428,7 +428,7 @@ class Onion(object):
                 self.tor_proc = subprocess.Popen(
                     [self.tor_path, "-f", self.tor_torrc],
                     stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE,
+                    stderr=subprocess.STDOUT,
                     startupinfo=startupinfo,
                 )
             else:
@@ -440,10 +440,16 @@ class Onion(object):
                 self.tor_proc = subprocess.Popen(
                     [self.tor_path, "-f", self.tor_torrc],
                     stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE,
+                    stderr=subprocess.STDOUT,
                     env=env,
                 )
 
+            # tor logs to stdout. If nothing reads it, tor blocks once the pipe's
+            # buffer is full, and then stops answering on its control port too.
+            # On Windows that buffer is only ~4 KiB, which the log output from
+            # trying the built-in obfs4 bridges fills within seconds.
+            self.common.drain_subprocess_output(self.tor_proc.stdout, "Tor")
+
             # Wait for the tor controller to start
             self.common.log("Onion", "connect", f"tor pid: {self.tor_proc.pid}")
             time.sleep(2)
@@ -992,7 +998,7 @@ class Onion(object):
         builtin_bridges = False
         meek = None
         # Try obtaining bridges over Tor, if we're connected to it.
-        if self.is_authenticated:
+        if self.is_authenticated():
             self.common.log(
                 "Onion",
                 "update_builtin_bridges",

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/onionshare_cli/settings.py

@@ -57,7 +57,7 @@ class Settings(object):
         self.available_locales = {
             #"af": "Afrikaans",  # Afrikaans
             #"sq": "Shqip",  # Albanian
-            #"ar": "العربية",  # Arabic
+            "ar": "العربية",  # Arabic
             #"be": "Беларуская",  # Belarusian
             #"bn": "বাংলা",  # Bengali
             #"bg": "Български",  #Bulgarian
@@ -94,7 +94,7 @@ class Settings(object):
             #"sk": "Slovenčina",  # Slovak
             #"es": "Español",  # Spanish
             #"sw": "Kiswahili",  # Swahili
-            #"sv": "Svenska",  # Swedish
+            "sv": "Svenska",  # Swedish
             #"ta": "Tamil",    # Tamil
             # "te": "తెలుగు",  # Telugu
             "tr": "Türkçe",  # Turkish

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/onionshare_cli/web/share_mode.py

@@ -126,13 +126,15 @@ class ShareModeWeb(SendBaseModeWeb):
         )
 
         self.download_etag = None
-        self.gzip_etag = None
         self.last_modified = datetime.now(tz=timezone.utc)
 
     def define_routes(self):
         """
         The web app routes for sharing files
         """
+        # Range offsets must refer to the original file, including when a browser
+        # resumes a download. Do not let Flask-Compress transform streamed files.
+        self.web.app.config["COMPRESS_STREAMS"] = False
 
         @self.web.app.route(
             "/", defaults={"path": ""}, methods=["GET"], provide_automatic_options=False
@@ -156,10 +158,7 @@ class ShareModeWeb(SendBaseModeWeb):
                 return render_template("denied.html")
 
             # If download is allowed to continue, serve download page
-            if self.should_use_gzip():
-                self.filesize = self.gzip_filesize
-            else:
-                self.filesize = self.download_filesize
+            self.filesize = self.download_filesize
 
             return self.render_logic(path)
 
@@ -183,18 +182,11 @@ class ShareModeWeb(SendBaseModeWeb):
             # which is outside of the request context
             request_path = request.path
 
-            # If this is a zipped file, then serve as-is. If it's not zipped, then,
-            # if the http client supports gzip compression, gzip the file first
-            # and serve that
-            use_gzip = self.should_use_gzip()
-            if use_gzip:
-                file_to_download = self.gzip_filename
-                self.filesize = self.gzip_filesize
-                etag = self.gzip_etag
-            else:
-                file_to_download = self.download_filename
-                self.filesize = self.download_filesize
-                etag = self.download_etag
+            # Serve the same bytes on initial and resumed downloads. Browsers
+            # resume using offsets in the decoded file, not a gzip representation.
+            file_to_download = self.download_filename
+            self.filesize = self.download_filesize
+            etag = self.download_etag
 
             # for range requests
             range_, status_code = self.get_range_and_status_code(
@@ -207,7 +199,7 @@ class ShareModeWeb(SendBaseModeWeb):
             self.web.add_request(
                 self.web.REQUEST_STARTED,
                 request_path,
-                {"id": history_id, "use_gzip": use_gzip},
+                {"id": history_id},
             )
 
             basename = os.path.basename(self.download_filename)
@@ -225,9 +217,6 @@ class ShareModeWeb(SendBaseModeWeb):
                     )
                 )
 
-            if use_gzip:
-                r.headers.set("Content-Encoding", "gzip")
-
             r.headers.set("Content-Length", range_[1] - range_[0] + 1)
             filename_dict = {
                 "filename": unidecode(basename),
@@ -498,23 +487,15 @@ class ShareModeWeb(SendBaseModeWeb):
             with open(self.download_filename, "rb") as f:
                 self.download_etag = make_etag(f)
 
-            # Compress the file with gzip now, so we don't have to do it on each request
+            # Individual-file views store gzipped copies of shared files here.
+            # Delete the directory when the share stops.
             self.gzip_tmp_dir = tempfile.TemporaryDirectory(
                 dir=self.common.build_tmp_dir()
             )
-            self.gzip_filename = os.path.join(self.gzip_tmp_dir.name, "file.gz")
-            self._gzip_compress(
-                self.download_filename, self.gzip_filename, 6, processed_size_callback
-            )
-            self.gzip_filesize = os.path.getsize(self.gzip_filename)
-            with open(self.gzip_filename, "rb") as f:
-                self.gzip_etag = make_etag(f)
+            self.web.cleanup_tempdirs.append(self.gzip_tmp_dir)
 
             self.is_zipped = False
 
-            # Cleanup this tempfile
-            self.web.cleanup_tempdirs.append(self.gzip_tmp_dir)
-
         else:
             # Zip up the files and folders
             self.zip_writer = ZipWriter(

{onionshare_cli-2.7 → onionshare_cli-2.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "onionshare_cli"
-version = "2.7"
+version = "2.7.1"
 description = "Securely and anonymously share files, host websites, and chat with friends using the Tor network"
 requires-python = ">=3.10,<4.0"
 authors = [