pyload-ng 0.5.0b3.dev98__tar.gz → 0.5.0b3.dev99__tar.gz

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyload-ng
-Version: 0.5.0b3.dev98
+Version: 0.5.0b3.dev99
 Summary: The free and open-source Download Manager written in pure Python
 Home-page: https://pyload.net
 Download-URL: https://github.com/pyload/pyload/releases
@@ -80,6 +80,11 @@ Requires-Dist: Pillow; extra == "plugins"
 Requires-Dist: pyOpenSSL; extra == "plugins"
 Requires-Dist: slixmpp; extra == "plugins"
 Requires-Dist: Send2Trash; extra == "plugins"
+Provides-Extra: test
+Requires-Dist: tox; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: openapi-spec-validator; extra == "test"
 Dynamic: download-url
 Dynamic: license-file
 
@@ -249,14 +254,18 @@ Invoke `build_locale` before building the package (eg. `bdist_wheel`).
 python3 -m venv .venv
 source .venv/bin/activate
 ```
-* Install pyLoad as editable install
+* Install pyLoad as editable install with main and test dependencies
 ```
-pip install -e .
+pip install -e ".[test]"
 ```
 * Run pyLoad in debug mode
 ```
 pyload -d
 ```
+* To run the tests locally
+```
+pytest tests
+```
 
 ### API specification
 

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/README.md

@@ -164,14 +164,18 @@ Invoke `build_locale` before building the package (eg. `bdist_wheel`).
 python3 -m venv .venv
 source .venv/bin/activate
 ```
-* Install pyLoad as editable install
+* Install pyLoad as editable install with main and test dependencies
 ```
-pip install -e .
+pip install -e ".[test]"
 ```
 * Run pyLoad in debug mode
 ```
 pyload -d
 ```
+* To run the tests locally
+```
+pytest tests
+```
 
 ### API specification
 

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/setup.cfg

@@ -96,6 +96,11 @@ plugins =
 	pyOpenSSL
 	slixmpp
 	Send2Trash
+test = 
+	tox
+	pytest
+	pytest-cov
+	openapi-spec-validator
 
 [options.entry_points]
 console_scripts = 
@@ -106,7 +111,6 @@ extras = True
 
 [tool:pytest]
 addopts = 
-	--cov pyload --cov-report term-missing
 	--verbose
 norecursedirs = 
 	dist

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload/core/utils/web/parse.py

@@ -118,6 +118,8 @@ def name(url, safe_name=True):
         name = us.query.split("=", 1)[::-1][0].split("&", 1)[0]
     if not name:
         name = ".".join(us.netloc.split(".")[:-1])
+    if us.fragment:
+        name += f"#{us.fragment}"
 
     return safe_nm(name) if safe_name else name
 

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload/locale/en/LC_MESSAGES/pyload.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pyload-ng 0.5.0b3.dev98\n"
+"Project-Id-Version: pyload-ng 0.5.0b3.dev99\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2026-04-15 22:37+0000\n"
-"PO-Revision-Date: 2026-04-15 22:37+0000\n"
+"POT-Creation-Date: 2026-04-20 21:00+0000\n"
+"PO-Revision-Date: 2026-04-20 21:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
 "Language-Team: en <LL@li.org>\n"
@@ -752,47 +752,47 @@ msgstr ""
 msgid "Waiting {}..."
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:66
+#: src/pyload/plugins/addons/ClickNLoad.py:65
 msgid "Could not resolve backend server, ClickNLoad cannot start"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:88
+#: src/pyload/plugins/addons/ClickNLoad.py:87
 #, python-brace-format
 msgid "Backend found on {}://{}:{}"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:99
+#: src/pyload/plugins/addons/ClickNLoad.py:98
 msgid "Could not connect to backend server, ClickNLoad cannot start"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:111
+#: src/pyload/plugins/addons/ClickNLoad.py:110
 msgid "pyLoad's Web interface is not active, ClickNLoad cannot start"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:119
+#: src/pyload/plugins/addons/ClickNLoad.py:118
 msgid "Shutting down proxy..."
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:142
+#: src/pyload/plugins/addons/ClickNLoad.py:141
 msgid "Server was not exited gracefully, shutdown forced"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:165
+#: src/pyload/plugins/addons/ClickNLoad.py:203
 #, python-brace-format
 msgid "Proxy listening on {}:{}"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:194
+#: src/pyload/plugins/addons/ClickNLoad.py:232
 #, python-brace-format
 msgid "Connection from invalid/unsupported host {} ignored"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:221
+#: src/pyload/plugins/addons/ClickNLoad.py:259
 #, python-brace-format
 msgid "Connection from unauthorized host {} ignored"
 msgstr ""
 
-#: src/pyload/plugins/addons/ClickNLoad.py:239
+#: src/pyload/plugins/addons/ClickNLoad.py:277
 #, python-brace-format
 msgid "SSL error: {}"
 msgstr ""

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload/plugins/addons/ClickNLoad.py

@@ -9,14 +9,13 @@ from pyload.core.utils.struct.lock import lock
 from pyload.core.utils.web.convert import host_to_ip
 
 from ..base.addon import BaseAddon, threaded
-from ..helpers import forward
 
 
 # TODO: IPv6 support
 class ClickNLoad(BaseAddon):
     __name__ = "ClickNLoad"
     __type__ = "addon"
-    __version__ = "0.65"
+    __version__ = "0.66"
     __status__ = "testing"
 
     __config__ = [
@@ -142,14 +141,53 @@ class ClickNLoad(BaseAddon):
                     self._("Server was not exited gracefully, shutdown forced")
                 )
 
+    @threaded
+    def _forward(self, source, destination, finished_event=None, recv_timeout=None, buffering=1024):
+        """
+        Forward data from one socket to another
+        """
+        source.settimeout(recv_timeout)
+        try:
+            while True:
+                try:
+                    data = source.recv(buffering)
+                    if not data:  # Peer closed the connection cleanly
+                        break
+
+                    try:
+                        destination.sendall(data)
+                    except (ConnectionResetError, BrokenPipeError, OSError) as e:
+                        break
+
+                except (ConnectionResetError, BrokenPipeError, OSError) as e:
+                    break
+
+        finally:
+            for sock in (source, destination):
+                if sock:
+                    #  Graceful shutdown
+                    try:
+                        sock.shutdown(socket.SHUT_RDWR)
+                    except OSError:
+                        pass  # Socket may already be closed
+
+        if finished_event:
+            finished_event.set()
+
     @lock
     @threaded
-    def forward(self, client_socket, backend_socket, queue=False):
+    def forward_request(self, client_socket, backend_socket, queue=False):
         if queue:
             old_ids = set(pack.pid for pack in self.pyload.api.get_collector())
 
-        forward(client_socket, backend_socket, recv_timeout=0.5)
-        forward(backend_socket, client_socket)
+        e1 = threading.Event()
+        e2 = threading.Event()
+        self._forward(client_socket, backend_socket, recv_timeout=0.75, finished_event=e1)
+        self._forward(backend_socket, client_socket, recv_timeout=0.75, finished_event=e2)
+
+        # Wait for both directions to finish
+        e1.wait()
+        e2.wait()
 
         if queue:
             new_ids = set(pack.pid for pack in self.pyload.api.get_collector())
@@ -235,14 +273,14 @@ class ClickNLoad(BaseAddon):
                                 context.verify_mode = ssl.CERT_NONE
                                 backend_socket = context.wrap_socket(backend_socket, server_hostname=self.web_addr[0])
 
-                            except Exception as exc:
+                            except ssl.SSLError as exc:
                                 self.log_error(self._("SSL error: {}").format(exc))
                                 client_socket.close()
                                 continue
 
                         backend_socket.connect(self.web_addr)
 
-                        self.forward(
+                        self.forward_request(
                             client_socket,
                             backend_socket,
                             self.config.get("dest") == "queue",

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload/plugins/helpers.py

@@ -524,27 +524,6 @@ def renice(pid, value):
         pass
 
 
-def forward(source, destination, recv_timeout=None, buffering=1024):
-    """
-    Forward data from one socket to another
-    """
-    timeout = source.gettimeout()
-    source.settimeout(recv_timeout)
-    try:
-        raw_data = source.recv(buffering)
-    except socket.timeout:
-        pass
-    else:
-        while raw_data:
-            destination.sendall(raw_data)
-            try:
-                raw_data = source.recv(buffering)
-            except socket.timeout:
-                break
-
-    source.settimeout(timeout)
-
-
 def compute_checksum(filename, hashtype):
     file = os.fsdecode(filename)
 
@@ -664,3 +643,17 @@ def ttl_cache(maxsize=128, typed=False, ttl=-1):
             return ttl_func(ttl_hash, *args, **kwargs)
         return functools.update_wrapper(wrapped, func)
     return wrapper
+
+
+def hexdump(data: bytes, prefix: str = ""):
+    res = ""
+    if data:
+        res += f"{prefix} [{len(data)} bytes]\n"
+        for i in range(0, len(data), 16):
+            chunk = data[i:i+16]
+            hex_part = " ".join(f"{b:02x}" for b in chunk)
+            ascii_part = "".join(chr(b) if 32 <= b <= 126 else "." for b in chunk)
+            res += f"{prefix}  {i:04x}  {hex_part:<48}  {ascii_part}\n"
+        res += "\n"
+
+    return res

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload/webui/app/helpers.py

@@ -356,8 +356,9 @@ def apikey_auth(func):
         client_ip = flask.request.headers.get("X-Forwarded-For", "").split(",")[0].strip() or flask.request.remote_addr
 
         # Check for API key in header
-        api_key = flask.request.headers.get("X-API-Key")
-        if api_key:
+        api_key = flask.request.headers.get("X-API-Key", None)
+        if api_key is not None:
+            error = "Invalid API key"
             if api_key.startswith("pl_"):
                 # Look up the API key in the database
                 key_info = api.check_apikey(api_key)
@@ -382,8 +383,6 @@ def apikey_auth(func):
                         return decorated(*args, **kwargs)
                 else:
                     error = key_info["error"]
-            else:
-                error = "Invalid API key"
 
             # Log failed API key authentication
             log_api_key = f"{api_key[:4]}********{api_key[-4:]}" if len(api_key) > 8 else "*" * 8
@@ -392,9 +391,9 @@ def apikey_auth(func):
 
         else:
             # No API auth - still use the decorated function but rely on session auth
-            csrf.protect()
             s = flask.session
             if is_authenticated(s):
+                csrf.protect()
                 user_info = {
                     "id": s["id"],
                     "name": s["name"],
@@ -404,9 +403,9 @@ def apikey_auth(func):
                 flask.g.user_info = user_info
                 return decorated(*args, **kwargs)
             else:
-                user = s.get("name")
+                user = s.get("name", "unknown")
                 # Sanitize username for logging
-                sanitized_user = user.replace("\n", "\\n").replace("\r", "\\r") if user else "unknown"
+                sanitized_user = user.replace("\n", "\\n").replace("\r", "\\r")
                 log.error(f"API authentication failed for user '{sanitized_user}' using session [CLIENT: {client_ip}]")
                 return flask.json.jsonify({"error": "Invalid API credentials"}), 401
 

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload_ng.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyload-ng
-Version: 0.5.0b3.dev98
+Version: 0.5.0b3.dev99
 Summary: The free and open-source Download Manager written in pure Python
 Home-page: https://pyload.net
 Download-URL: https://github.com/pyload/pyload/releases
@@ -80,6 +80,11 @@ Requires-Dist: Pillow; extra == "plugins"
 Requires-Dist: pyOpenSSL; extra == "plugins"
 Requires-Dist: slixmpp; extra == "plugins"
 Requires-Dist: Send2Trash; extra == "plugins"
+Provides-Extra: test
+Requires-Dist: tox; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: openapi-spec-validator; extra == "test"
 Dynamic: download-url
 Dynamic: license-file
 
@@ -249,14 +254,18 @@ Invoke `build_locale` before building the package (eg. `bdist_wheel`).
 python3 -m venv .venv
 source .venv/bin/activate
 ```
-* Install pyLoad as editable install
+* Install pyLoad as editable install with main and test dependencies
 ```
-pip install -e .
+pip install -e ".[test]"
 ```
 * Run pyLoad in debug mode
 ```
 pyload -d
 ```
+* To run the tests locally
+```
+pytest tests
+```
 
 ### API specification
 

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload_ng.egg-info/SOURCES.txt

@@ -692,13 +692,10 @@ src/pyload_ng.egg-info/entry_points.txt
 src/pyload_ng.egg-info/not-zip-safe
 src/pyload_ng.egg-info/requires.txt
 src/pyload_ng.egg-info/top_level.txt
-tests/__init__.py
-tests/api_exerciser.py
-tests/conftest.py
-tests/system_check.py
-tests/test_account_fixes.py
-tests/test_api.py
-tests/test_json.py
-tests/test_mega_nz_folder.py
-tests/test_parse.py
-tests/test_skeleton.py
+tests/integration/conftest.py
+tests/integration/test_api.py
+tests/integration/test_cnl.py
+tests/integration/test_openapi_spec.py
+tests/unit/test_account_fixes.py
+tests/unit/test_mega_nz_folder.py
+tests/unit/test_parse.py

{pyload_ng-0.5.0b3.dev98 → pyload_ng-0.5.0b3.dev99}/src/pyload_ng.egg-info/requires.txt

@@ -40,3 +40,9 @@ Pillow
 pyOpenSSL
 slixmpp
 Send2Trash
+
+[test]
+tox
+pytest
+pytest-cov
+openapi-spec-validator

pyload_ng-0.5.0b3.dev99/tests/integration/conftest.py

@@ -0,0 +1,38 @@
+"""
+Read more about conftest.py under: https://docs.pytest.org/en/stable/reference/fixtures.html
+"""
+import os
+import pytest
+import shutil
+
+from pyload.core import Core
+
+
+@pytest.fixture(scope="session")
+def pyload_core():
+    test_dir = os.path.dirname(__file__)
+    test_data_dir = os.path.join(test_dir, ".pyload_test_data")
+    try:
+        # Return to clean state before running tests
+        shutil.rmtree(test_data_dir)
+    except FileNotFoundError:
+        pass
+
+    core = Core(userdir=test_data_dir, tempdir=f"{test_data_dir}/tmp", storagedir=None, debug=True, reset=None, dry=False, api_spec=False)
+    yield core
+
+@pytest.fixture(scope="session")
+def api_key(pyload_core):
+    return pyload_core.api.generate_apikey("pyload", "pyload")["data"]["key"]
+
+@pytest.fixture(scope="session")
+def app(pyload_core):
+    app = pyload_core.webserver.app
+    app.config.update({
+        "TESTING": True,
+    })
+    yield app
+
+@pytest.fixture(scope="session")
+def client(app):
+    return app.test_client()

pyload_ng-0.5.0b3.dev99/tests/integration/test_api.py

@@ -0,0 +1,172 @@
+import time
+import pytest
+
+
+API_KEY_HEADER = "X-API-KEY"
+
+
+class TestAuthorization:
+    def test_error_when_missing_auth(self, client):
+        response = client.get("/api/status_server")
+
+        assert response.status_code == 401
+
+        response = client.post("/api/restart")
+
+        assert response.status_code == 401
+
+    @pytest.mark.parametrize(
+        "invalid_api_key",
+        [
+            None, "", "x", "pl_123456",
+        ]
+    )
+    def test_error_when_invalid_auth(self, client, invalid_api_key):
+        response = client.get("/api/status_server", headers={API_KEY_HEADER: invalid_api_key})
+
+        assert response.status_code == 401
+
+        response = client.post("/api/restart", headers={API_KEY_HEADER: invalid_api_key})
+
+        assert response.status_code == 401
+
+    def test_error_when_auth_expired(self, pyload_core, client):
+        expired_api_key = pyload_core.api.generate_apikey("pyload", "pyload", expires=int(time.time() * 1000))["data"]["key"]
+
+        response = client.get("/api/status_server", headers={API_KEY_HEADER: expired_api_key})
+
+        assert response.status_code == 401
+
+        response = client.post("/api/restart", headers={API_KEY_HEADER: expired_api_key})
+
+        assert response.status_code == 401
+
+    def test_success_with_valid_auth_without_expiry(self, api_key, client):
+        response = client.get("/api/status_server", headers={API_KEY_HEADER: api_key})
+
+        assert response.status_code == 200
+        assert response.json["active"] == 0
+
+        response = client.post("/api/restart", headers={API_KEY_HEADER: api_key})
+
+        assert response.status_code == 200
+
+    def test_success_with_valid_auth_with_expiry(self, pyload_core, client):
+        expiry_date = int(time.time() * 1000) + 1000
+        valid_api_key = pyload_core.api.generate_apikey("pyload", "pyload", expires=expiry_date)["data"]["key"]
+
+        response = client.get("/api/status_server", headers={API_KEY_HEADER: valid_api_key})
+
+        assert response.status_code == 200
+        assert response.json["active"] == 0
+
+        response = client.post("/api/restart", headers={API_KEY_HEADER: valid_api_key})
+
+        assert response.status_code == 200
+
+
+class TestPackages:
+    @pytest.mark.parametrize(
+        ("destination", "destination_id"),
+        [
+            ("collector", 0),
+            ("queue", 1),
+        ]
+    )
+    def test_add_and_remove_package(self, api_key, client, destination, destination_id):
+        # Assert no packages in destination at the start
+        response = client.get(f"api/get_{destination}", headers={API_KEY_HEADER: api_key})
+
+        assert response.status_code == 200
+        assert len(response.json) == 0
+
+        # Add a dummy package to the destination
+        response = client.post(
+            "/api/add_package",
+            json={
+                "name": "test_package",
+                "links": [
+                    "https://localhost/non-existent-file.zip"
+                ],
+                "dest": destination_id
+            },
+            headers={API_KEY_HEADER: api_key}
+        )
+
+        assert response.status_code == 200
+        package_id = response.text
+
+        # Assert destination contains dummy package
+        response = client.get(f"api/get_{destination}", headers={API_KEY_HEADER: api_key})
+
+        assert response.status_code == 200
+        assert len(response.json) == 1
+        assert response.json[0]["name"] == "test_package"
+        assert response.json[0]["pid"] == int(package_id)
+
+        # Delete package
+        response = client.post(
+            "/api/delete_packages",
+            json={
+                "package_ids": [package_id]
+            },
+            headers={API_KEY_HEADER: api_key}
+        )
+
+        assert response.status_code == 200
+
+        # Assert destination is empty again
+        response = client.get(f"api/get_{destination}", headers={API_KEY_HEADER: api_key})
+
+        assert response.status_code == 200
+        assert len(response.json) == 0
+
+    def test_move_package(self, api_key, client):
+        # Add a dummy package to the collector
+        response = client.post(
+            "/api/add_package",
+            json={
+                "name": "test_package",
+                "links": [
+                    "https://localhost/non-existent-file.zip"
+                ],
+                "dest": 0
+            },
+            headers={API_KEY_HEADER: api_key}
+        )
+
+        assert response.status_code == 200
+        package_id = response.text
+
+        # Move package to queue
+        response = client.post(
+            "/api/move_package",
+            query_string={"destination": 1, "package_id": package_id},
+            headers={API_KEY_HEADER: api_key}
+        )
+
+        assert response.status_code == 200
+
+        # Assert package is now in queue and no longer in collector
+        response = client.get("api/get_queue", headers={API_KEY_HEADER: api_key})
+
+        assert response.status_code == 200
+        assert len(response.json) == 1
+        assert response.json[0]["name"] == "test_package"
+        assert response.json[0]["pid"] == int(package_id)
+
+        response = client.get("api/get_collector", headers={API_KEY_HEADER: api_key})
+
+        assert response.status_code == 200
+        assert len(response.json) == 0
+
+        # Delete package again
+        response = client.post(
+            "/api/delete_packages",
+            json={
+                "package_ids": [package_id]
+            },
+            headers={API_KEY_HEADER: api_key}
+        )
+
+        assert response.status_code == 200

pyload_ng-0.5.0b3.dev99/tests/integration/test_cnl.py

@@ -0,0 +1,31 @@
+import pytest
+
+
+class TestClickNLoad:
+    def test_cnl_disabled_by_default(self, client):
+        response = client.get("http://localhost:9666/jdcheck.js")
+
+        assert response.status_code == 404
+
+    def test_jdcheck_successful_when_cnl_activated(self, pyload_core, client):
+        pyload_core.config.set_plugin("ClickNLoad", "enabled", True)
+
+        response = client.get("http://localhost:9666/jdcheck.js")
+
+        assert response.status_code == 200
+
+    @pytest.mark.parametrize("http_host", ["localhost", "127.0.0.1", "[::1]"])
+    def test_valid_hosts(self, pyload_core, client, http_host):
+        pyload_core.config.set_plugin("ClickNLoad", "enabled", True)
+
+        response = client.get(f"http://{http_host}:9666/jdcheck.js")
+
+        assert response.status_code == 200
+
+    @pytest.mark.parametrize("http_host", ["192.168.0.1", "0.0.0.0"])
+    def test_invalid_host_headers(self, pyload_core, client, http_host):
+        pyload_core.config.set_plugin("ClickNLoad", "enabled", True)
+
+        response = client.get(f"http://localhost:9666/jdcheck.js", headers={"Host": f"{http_host}:9666"})
+
+        assert response.status_code == 403

pyload_ng-0.5.0b3.dev99/tests/integration/test_openapi_spec.py

@@ -0,0 +1,10 @@
+from openapi_spec_validator import validate
+
+
+class TestOpenAPISpec:
+    def test_openapi_spec_is_valid(self, client):
+        response = client.get("/api/openapi.json", auth=("pyload", "pyload"))
+
+        assert response.status_code == 200
+        # If no exception is raised by validate(), the spec is valid.
+        validate(response.json)