txhttputil 1.4.8__tar.gz → 1.4.9__tar.gz

{txhttputil-1.4.8 → txhttputil-1.4.9}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 
+Copyright (c) 2016-2026 Flying Ion Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+

txhttputil-1.4.9/PKG-INFO

@@ -0,0 +1,82 @@
+Metadata-Version: 2.1
+Name: txhttputil
+Version: 1.4.9
+Summary: Flying Ion utility classes for serving a static site with twisted.web with user permissions.
+Author-email: Flying Ion Pty Ltd <contact@flyingion.com>
+License: MIT License
+        
+        Copyright (c) 2016-2026 Flying Ion Pty Ltd
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+        
+Project-URL: Homepage, https://flyingion.com
+Project-URL: Repository, https://gitlab.com/flyingion/txhttputil
+Project-URL: Issues, https://gitlab.com/flyingion/txhttputil/-/issues
+Keywords: twisted,resource,file,download,flying-ion
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pytz
+Requires-Dist: txwebsocket>=1.0.1
+Requires-Dist: filetype
+Requires-Dist: pem
+Requires-Dist: pytmpdir
+Requires-Dist: treelib>=1.6.4
+Requires-Dist: cryptography
+Requires-Dist: pyOpenSSL
+Provides-Extra: dev
+Requires-Dist: mypy>=1.0; extra == "dev"
+Requires-Dist: ruff>=0.15; extra == "dev"
+Requires-Dist: vulture>=2.14; extra == "dev"
+Requires-Dist: basedpyright>=1.20; extra == "dev"
+
+# TxHttpUtil
+Flying Ion utility classes for serving a static site with twisted.web with user permissions.
+
+Whats of interest?
+
+* Protected resource with simple form login - Not suitable for public networks at this
+stage
+* A resource that underlays a multi level file system search under a standard twisted
+Resource.putChild type resource tree.
+* Twisted HTTP File Downloader
+* Consistent request data, providing a Bytes IO like oboject and switching to a
+NamedTemporaryFile if fileno, or name is called, or the data exceeds 5mb.
+* Support for single page applications
+
+# TODO
+
+Unit tests for :
+* Creating resource trees
+* Getting resources from the resource tree
+* Getting files from an underlay resource with two underlays
+* Downloading files with the 
+* Logging into the test site (Using Seleneium/Chrome WebDriver)
+* Test uploading data under 5mb and over 5mb to and auto switching to NamedTemporaryFile
+from BytesIO
+
+## License
+
+Copyright (c) 2016-2026 [Flying Ion Pty Ltd](https://flyingion.com). Released under the [MIT License](LICENSE).

{txhttputil-1.4.8 → txhttputil-1.4.9}/README.md

@@ -1,5 +1,5 @@
 # TxHttpUtil
-Synerty utility classes for serving a static site with twisted.web with user permissions.
+Flying Ion utility classes for serving a static site with twisted.web with user permissions.
 
 Whats of interest?
 
@@ -22,3 +22,7 @@ Unit tests for :
 * Logging into the test site (Using Seleneium/Chrome WebDriver)
 * Test uploading data under 5mb and over 5mb to and auto switching to NamedTemporaryFile
 from BytesIO
+
+## License
+
+Copyright (c) 2016-2026 [Flying Ion Pty Ltd](https://flyingion.com). Released under the [MIT License](LICENSE).

txhttputil-1.4.9/pyproject.toml

@@ -0,0 +1,97 @@
+[build-system]
+requires = ["setuptools<70.0.0", "wheel"]
+build-backend = "setuptools.build_meta:__legacy__"
+
+[project]
+name = "txhttputil"
+version = "1.4.9"
+description = "Flying Ion utility classes for serving a static site with twisted.web with user permissions."
+readme = "README.md"
+requires-python = ">=3.9"
+license = {file = "LICENSE"}
+keywords = ["twisted", "resource", "file", "download", "flying-ion"]
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+dependencies = [
+    "pytz",
+    "txwebsocket>=1.0.1",
+    "filetype",
+    "pem",
+    "pytmpdir",
+    "treelib>=1.6.4",
+    "cryptography",
+    "pyOpenSSL",
+]
+authors = [
+    {name = "Flying Ion Pty Ltd", email = "contact@flyingion.com"}
+]
+
+[project.urls]
+Homepage = "https://flyingion.com"
+Repository = "https://gitlab.com/flyingion/txhttputil"
+Issues = "https://gitlab.com/flyingion/txhttputil/-/issues"
+
+[project.optional-dependencies]
+dev = [
+    "mypy>=1.0",
+    "ruff>=0.15",
+    "vulture>=2.14",
+    "basedpyright>=1.20",
+]
+
+[tool.mypy]
+python_version = "3.12"
+explicit_package_bases = true
+strict = false
+warn_unused_ignores = true
+warn_return_any = true
+disallow_untyped_defs = false
+ignore_missing_imports = true
+follow_imports = "skip"
+
+[tool.ruff]
+line-length = 80
+exclude = [
+    "build",
+    "txhttputil.egg-info",
+]
+
+[tool.ruff.lint]
+select = ["E", "W", "F", "B", "C4", "RET", "SIM102"]
+ignore = ["E402", "E501", "SIM105", "C408"]
+
+[tool.ruff.lint.per-file-ignores]
+"txhttputil/site/RootResource.py" = ["F821"]
+"txhttputil/site/SiteUtil.py" = ["B008"]
+"txhttputil/site/FileUnderlayResourceTest.py" = ["RET504"]
+"txhttputil/util/PemUtil.py" = ["RET503", "C405"]
+"txhttputil/util/SslUtil.py" = ["C405"]
+
+[tool.vulture]
+paths = ["txhttputil"]
+min_confidence = 80
+exclude = [
+    "AuthCredentials.py",
+    "AuthUserDetails.py",
+    "PemUtil.py",
+    "SslUtil.py",
+]
+
+[tool.basedpyright]
+pythonVersion = "3.12"
+typeCheckingMode = "basic"
+reportMissingImports = true
+reportMissingTypeStubs = false
+exclude = ["**/*Test.py"]
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["txhttputil*"]
+
+[tool.setuptools.package-data]
+"txhttputil.login_page" = ["*.xml"]

txhttputil-1.4.9/txhttputil/__init__.py

@@ -0,0 +1,9 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
+__version__ = '1.4.9'

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/downloader/HttpFileDownloader.py

@@ -1,11 +1,10 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
 
 import logging
 from typing import Union
@@ -35,7 +34,7 @@ class HttpFileDownloader:
         d = agent.request(
             b"GET",
             self._url,
-            Headers({b"User-Agent": [b"Synerty File Downloader"]}),
+            Headers({b"User-Agent": [b"Flying Ion File Downloader"]}),
             None,
         )
 

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/downloader/HttpResourceProxy.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 from typing import Optional
 from urllib.parse import urlencode

txhttputil-1.4.9/txhttputil/downloader/__init__.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/login_page/LoginElement.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 '''
 Created on 17/06/2013
 
@@ -9,7 +17,6 @@ from twisted.python.filepath import FilePath
 from twisted.web._element import renderer, Element
 from twisted.web.template import XMLFile
 
-import txhttputil
 
 
 class LoginElement(Element):

txhttputil-1.4.9/txhttputil/login_page/__init__.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/AuthCredentials.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 from txhttputil.site.AuthUserDetails import UserDetails, everyoneGroup
 from txhttputil.util.DeferUtil import maybeDeferredWrap
 

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/AuthResource.py

@@ -1,15 +1,11 @@
-""" 
- * view.common.uiobj.Style.py
- *
- *  Copyright Synerty Pty Ltd 2013
- *
- *  This software is proprietary, you are not free to copy
- *  or redistribute this code in any format.
- *
- *  All rights to this software are reserved by 
- *  Synerty Pty Ltd
- *
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 from twisted.web._flatten import flattenString
 from twisted.web.resource import Resource
 from twisted.web.server import NOT_DONE_YET

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/AuthSessionWrapper.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 from datetime import datetime
 
@@ -13,7 +21,7 @@ from .AuthResource import LoginResource, LoginSucceededResource
 
 logger = logging.getLogger(name=__name__)
 
-__author__ = "synerty"
+__author__ = "Flying Ion Pty Ltd"
 
 
 @implementer(IResource)

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/AuthUserDetails.py

@@ -1,11 +1,11 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 from twisted.python.components import registerAdapter
 from twisted.web.server import Session
 from zope.interface import Attribute

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/BasicResource.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 
 from twisted.python.compat import nativeString

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/BasicResourceTest.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 
 from twisted.trial import unittest

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/FileUnderlayResource.py

@@ -1,6 +1,14 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 import os
-from typing import Union
+from typing import Optional, Union
 
 from twisted.web.resource import NoResource
 from twisted.web.util import Redirect
@@ -60,7 +68,7 @@ class FileUnderlayResource(BasicResource):
         self._singlePageAppConfig = None
         self._redirections = {}
 
-    def addRedirectionRule(self, redirection: RedirectionRule = None):
+    def addRedirectionRule(self, redirection: Optional[RedirectionRule] = None):
         if redirection is not None:
             self._redirections[redirection.origin] = redirection.destination
 
@@ -73,7 +81,7 @@ class FileUnderlayResource(BasicResource):
         if filePath:
             return self._gzipIfRequired(StaticFileResource(filePath))
 
-        if not resourcePath or not "." in os.path.basename(resourcePath):
+        if not resourcePath or "." not in os.path.basename(resourcePath):
             singlePageResource = self._getSinglePageAppResource()
             if singlePageResource:
                 return singlePageResource
@@ -91,12 +99,45 @@ class FileUnderlayResource(BasicResource):
             indexHtmlPath=indexHtmlPath
         )
 
+    def _resolveFilePathUnderRoot(
+        self, rootDir: str, resourcePath: str
+    ) -> Union[str, None]:
+        if os.path.isabs(resourcePath):
+            logger.debug(
+                "Resource path %s is absolute and not allowed",
+                resourcePath,
+            )
+            return None
+
+        rootRealPath = os.path.realpath(rootDir)
+        candidatePath = os.path.realpath(os.path.join(rootDir, resourcePath))
+
+        try:
+            withinRoot = (
+                os.path.commonpath([rootRealPath, candidatePath])
+                == rootRealPath
+            )
+        except ValueError:
+            withinRoot = False
+
+        if not withinRoot:
+            logger.debug(
+                "Resource path %s escapes root %s",
+                resourcePath,
+                rootDir,
+            )
+            return None
+
+        return candidatePath
+
     def getRealFilePath(self, resourcePath: str) -> Union[str, None]:
         if not resourcePath:
             return None
 
         for rootDir in self._fileSystemRoots[::-1]:
-            realFilePath = os.path.join(rootDir, resourcePath)
+            realFilePath = self._resolveFilePathUnderRoot(rootDir, resourcePath)
+            if realFilePath is None:
+                continue
 
             if os.path.isdir(realFilePath):
                 logger.debug(
@@ -109,17 +150,23 @@ class FileUnderlayResource(BasicResource):
             if os.path.isfile(realFilePath):
                 return realFilePath
 
+        return None
+
     def _getSinglePageAppResource(self):
         if not self._singlePageAppConfig:
             return None
 
         # Try to serve a single page app
-        filePath = self.getRealFilePath(self._singlePageAppConfig.indexHtmlPath)
+        indexHtmlPath = self._singlePageAppConfig.indexHtmlPath
+        assert indexHtmlPath is not None, "indexHtmlPath must be set for SPA"
+        filePath = self.getRealFilePath(indexHtmlPath)
         if filePath:
             from txhttputil.site.StaticFileResource import StaticFileResource
 
             return self._gzipIfRequired(StaticFileResource(filePath))
 
+        return None
+
     def render_GET(self, request):
         """Render Get
 
@@ -130,7 +177,7 @@ class FileUnderlayResource(BasicResource):
 
         singlePageAppResource = self._getSinglePageAppResource()
         if singlePageAppResource:
-            return singlePageAppResource.render_GET(request)
+            return singlePageAppResource.render_GET(request)  # pyright: ignore[reportAttributeAccessIssue]
 
         # Else, render no resource
         return NoResource().render(request)

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/FileUnderlayResourceTest.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 import os
 
@@ -73,6 +81,22 @@ class FileUnderlayResourceTest(unittest.TestCase):
         d.addCallback(self._checkDownloadedResource, fileName=realPath)
         return d
 
+    def testDirectoryTraversalBlocked(self):
+        traversalPath = "/".join([".."] * 10) + "/etc/passwd"
+        d = HttpFileDownloader(self.sitePath + "/" + traversalPath).run()
+
+        def assertNotSuccessful(_result):
+            self.fail("Directory traversal request must not succeed")
+
+        def assertNotFound(failure):
+            self.assertIn("404", str(failure.value))
+
+        d.addCallbacks(
+            callback=assertNotSuccessful,
+            errback=assertNotFound,
+        )
+        return d
+
 
 if __name__ == "__main__":
     from twisted.trial import runner, reporter

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/FileUploadRequest.py

@@ -1,11 +1,10 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
 
 import logging
 import os
@@ -120,9 +119,8 @@ class FileUploadRequest(server.Request):
                     self.channel._respondToBadRequestAndDisconnect()
                     if isinstance(e, (TypeError, ValueError, KeyError)):
                         return
-                    else:
-                        # If it's not a userspace error from CGI, reraise
-                        raise
+                    # If it's not a userspace error from CGI, reraise
+                    raise
 
             self.content.seek(0, 0)
 

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/RedirectToHttpsResource.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 from twisted.web import resource
 from twisted.web.server import NOT_DONE_YET
 

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/RedirectionRule.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 class RedirectionRule:
     def __init__(self, origin: str = "", destination: str = ""):
         """A definition of Resource redirection rule
@@ -13,4 +21,4 @@ class RedirectionRule:
 
     @property
     def destination(self) -> bytes:
-        return self._destination.encode()
+        return self._destination.encode()

txhttputil-1.4.9/txhttputil/site/ResourceCreator.py

@@ -0,0 +1,12 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
+import logging
+
+logger = logging.getLogger(__name__)
+

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/RootResource.py

@@ -1,11 +1,10 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
 
 from txhttputil.site.AuthUserDetails import AuthUserDetails
 from txhttputil.site.ResourceUtil import RESOURCES

txhttputil-1.4.9/txhttputil/site/RootSiteTest.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/SiteUtil.py

@@ -1,11 +1,10 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
 
 import logging
 import platform
@@ -23,7 +22,6 @@ from txhttputil.site.AuthSessionWrapper import FormBasedAuthSessionWrapper
 from txhttputil.site.FileUploadRequest import FileUploadRequest
 from txhttputil.site.RedirectToHttpsResource import RedirectToHttpsResource
 from txhttputil.util.PemUtil import (
-    PEM_CHECK_TYPE,
     parseTrustRootFromBundle,
     parsePemBundleForServer,
     parsePemBundleForTrustedPeers,
@@ -140,7 +138,7 @@ def setupSite(
         proto = "http"
         sitePort = reactor.listenTCP(portNum, site)
 
-    if platform.system() is "Linux":
+    if platform.system() == "Linux":
         import subprocess
 
         ip = (

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/site/StaticFileResource.py

@@ -1,11 +1,10 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
 
 import logging
 import mimetypes

txhttputil-1.4.9/txhttputil/site/__init__.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/util/DeferUtil.py

@@ -1,11 +1,10 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
 
 import logging
 
@@ -14,7 +13,7 @@ from twisted.internet.threads import deferToThread
 
 logger = logging.getLogger()
 
-__author__ = 'synerty'
+__author__ = 'Flying Ion Pty Ltd'
 
 
 def vortexLogFailure(failure, loggerArg, consumeError=False, successValue=True):

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/util/ModuleUtil.py

@@ -1,12 +1,10 @@
-"""
- * Created by Synerty Pty Ltd
- *
- * This software is open source, the MIT license applies.
- *
- * Website : http://www.synerty.com
- * Support : support@synerty.com
-"""
-
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
 
 def filterModules(name_:str, file_: str) -> [str]:
     import os.path

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/util/PemUtil.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 import textwrap
 from collections import namedtuple
@@ -5,7 +13,7 @@ from datetime import datetime
 from functools import partial
 from itertools import chain
 from pathlib import Path
-from typing import List, Dict, NamedTuple, Union, Tuple, Literal
+from typing import List, Dict, Literal
 
 import pem
 from OpenSSL.crypto import (
@@ -31,7 +39,6 @@ from cryptography.x509 import (
     BasicConstraints,
     ExtensionNotFound,
     Extension,
-    KeyUsage,
     ExtendedKeyUsage,
 )
 from pem import AbstractPEMObject

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil/util/SslUtil.py

@@ -1,3 +1,11 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+
 import logging
 from binascii import hexlify
 from typing import List, Set, Optional

txhttputil-1.4.9/txhttputil/util/__init__.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2016-2026 Flying Ion Pty Ltd
+#
+# This software is open source; the MIT license applies.
+# See LICENSE for the full license text.
+#
+# Website : https://flyingion.com
+# Support : contact@flyingion.com
+

txhttputil-1.4.9/txhttputil.egg-info/PKG-INFO

@@ -0,0 +1,82 @@
+Metadata-Version: 2.1
+Name: txhttputil
+Version: 1.4.9
+Summary: Flying Ion utility classes for serving a static site with twisted.web with user permissions.
+Author-email: Flying Ion Pty Ltd <contact@flyingion.com>
+License: MIT License
+        
+        Copyright (c) 2016-2026 Flying Ion Pty Ltd
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+        
+Project-URL: Homepage, https://flyingion.com
+Project-URL: Repository, https://gitlab.com/flyingion/txhttputil
+Project-URL: Issues, https://gitlab.com/flyingion/txhttputil/-/issues
+Keywords: twisted,resource,file,download,flying-ion
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pytz
+Requires-Dist: txwebsocket>=1.0.1
+Requires-Dist: filetype
+Requires-Dist: pem
+Requires-Dist: pytmpdir
+Requires-Dist: treelib>=1.6.4
+Requires-Dist: cryptography
+Requires-Dist: pyOpenSSL
+Provides-Extra: dev
+Requires-Dist: mypy>=1.0; extra == "dev"
+Requires-Dist: ruff>=0.15; extra == "dev"
+Requires-Dist: vulture>=2.14; extra == "dev"
+Requires-Dist: basedpyright>=1.20; extra == "dev"
+
+# TxHttpUtil
+Flying Ion utility classes for serving a static site with twisted.web with user permissions.
+
+Whats of interest?
+
+* Protected resource with simple form login - Not suitable for public networks at this
+stage
+* A resource that underlays a multi level file system search under a standard twisted
+Resource.putChild type resource tree.
+* Twisted HTTP File Downloader
+* Consistent request data, providing a Bytes IO like oboject and switching to a
+NamedTemporaryFile if fileno, or name is called, or the data exceeds 5mb.
+* Support for single page applications
+
+# TODO
+
+Unit tests for :
+* Creating resource trees
+* Getting resources from the resource tree
+* Getting files from an underlay resource with two underlays
+* Downloading files with the 
+* Logging into the test site (Using Seleneium/Chrome WebDriver)
+* Test uploading data under 5mb and over 5mb to and auto switching to NamedTemporaryFile
+from BytesIO
+
+## License
+
+Copyright (c) 2016-2026 [Flying Ion Pty Ltd](https://flyingion.com). Released under the [MIT License](LICENSE).

{txhttputil-1.4.8 → txhttputil-1.4.9}/txhttputil.egg-info/requires.txt

@@ -6,3 +6,9 @@ pytmpdir
 treelib>=1.6.4
 cryptography
 pyOpenSSL
+
+[dev]
+mypy>=1.0
+ruff>=0.15
+vulture>=2.14
+basedpyright>=1.20

txhttputil-1.4.8/PKG-INFO

@@ -1,47 +0,0 @@
-Metadata-Version: 2.1
-Name: txhttputil
-Version: 1.4.8
-Summary: Synerty utility classes for serving a static site with twisted.web with user permissions.
-Author-email: Synerty <contact@synerty.com>
-Project-URL: Homepage, https://gitlab.synerty.com/peek/util/txhttputil
-Keywords: twisted,resource,file,download,synerty
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: pytz
-Requires-Dist: txwebsocket>=1.0.1
-Requires-Dist: filetype
-Requires-Dist: pem
-Requires-Dist: pytmpdir
-Requires-Dist: treelib>=1.6.4
-Requires-Dist: cryptography
-Requires-Dist: pyOpenSSL
-
-# TxHttpUtil
-Synerty utility classes for serving a static site with twisted.web with user permissions.
-
-Whats of interest?
-
-* Protected resource with simple form login - Not suitable for public networks at this
-stage
-* A resource that underlays a multi level file system search under a standard twisted
-Resource.putChild type resource tree.
-* Twisted HTTP File Downloader
-* Consistent request data, providing a Bytes IO like oboject and switching to a
-NamedTemporaryFile if fileno, or name is called, or the data exceeds 5mb.
-* Support for single page applications
-
-# TODO
-
-Unit tests for :
-* Creating resource trees
-* Getting resources from the resource tree
-* Getting files from an underlay resource with two underlays
-* Downloading files with the 
-* Logging into the test site (Using Seleneium/Chrome WebDriver)
-* Test uploading data under 5mb and over 5mb to and auto switching to NamedTemporaryFile
-from BytesIO

txhttputil-1.4.8/pyproject.toml

@@ -1,40 +0,0 @@
-[build-system]
-requires = ["setuptools<70.0.0", "wheel"]
-build-backend = "setuptools.build_meta:__legacy__"
-
-[project]
-name = "txhttputil"
-version = "1.4.8"
-description = "Synerty utility classes for serving a static site with twisted.web with user permissions."
-readme = "README.md"
-requires-python = ">=3.9"
-keywords = ["twisted", "resource", "file", "download", "synerty"]
-classifiers = [
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12"
-]
-dependencies = [
-    "pytz",
-    "txwebsocket>=1.0.1",
-    "filetype",
-    "pem",
-    "pytmpdir",
-    "treelib>=1.6.4",
-    "cryptography",
-    "pyOpenSSL",
-]
-authors = [
-    {name = "Synerty", email = "contact@synerty.com"}
-]
-
-[project.urls]
-Homepage = "https://gitlab.synerty.com/peek/util/txhttputil"
-
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["txhttputil*"]
-
-[tool.setuptools.package-data]
-"txhttputil.login_page" = ["*.xml"]

txhttputil-1.4.8/txhttputil/__init__.py

@@ -1,3 +0,0 @@
-
-
-__version__ = '1.4.8'

txhttputil-1.4.8/txhttputil/site/ResourceCreator.py

@@ -1,4 +0,0 @@
-import logging
-
-logger = logging.getLogger(__name__)
-

txhttputil-1.4.8/txhttputil/site/__init__.py

@@ -1 +0,0 @@
-

txhttputil-1.4.8/txhttputil.egg-info/PKG-INFO

@@ -1,47 +0,0 @@
-Metadata-Version: 2.1
-Name: txhttputil
-Version: 1.4.8
-Summary: Synerty utility classes for serving a static site with twisted.web with user permissions.
-Author-email: Synerty <contact@synerty.com>
-Project-URL: Homepage, https://gitlab.synerty.com/peek/util/txhttputil
-Keywords: twisted,resource,file,download,synerty
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: pytz
-Requires-Dist: txwebsocket>=1.0.1
-Requires-Dist: filetype
-Requires-Dist: pem
-Requires-Dist: pytmpdir
-Requires-Dist: treelib>=1.6.4
-Requires-Dist: cryptography
-Requires-Dist: pyOpenSSL
-
-# TxHttpUtil
-Synerty utility classes for serving a static site with twisted.web with user permissions.
-
-Whats of interest?
-
-* Protected resource with simple form login - Not suitable for public networks at this
-stage
-* A resource that underlays a multi level file system search under a standard twisted
-Resource.putChild type resource tree.
-* Twisted HTTP File Downloader
-* Consistent request data, providing a Bytes IO like oboject and switching to a
-NamedTemporaryFile if fileno, or name is called, or the data exceeds 5mb.
-* Support for single page applications
-
-# TODO
-
-Unit tests for :
-* Creating resource trees
-* Getting resources from the resource tree
-* Getting files from an underlay resource with two underlays
-* Downloading files with the 
-* Logging into the test site (Using Seleneium/Chrome WebDriver)
-* Test uploading data under 5mb and over 5mb to and auto switching to NamedTemporaryFile
-from BytesIO