python-bareos 25.0.2__py3-none-any.whl → 25.0.4__py3-none-any.whl

bareos/VERSION.txt

@@ -1 +1 @@
-25.0.2
+25.0.4

bareos/bsock/__init__.py

@@ -1,6 +1,6 @@
 #   BAREOS - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2016-2024 Bareos GmbH & Co. KG
+#   Copyright (C) 2016-2026 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -146,7 +146,11 @@ Since Bareos >= 18.2.4, Bareos supports TLS-PSK (Transport-Layer-Security Pre-Sh
 
 Unfortunately the Python core module ``ssl`` does support TLS-PSK only with Python >= 3.13.
 For some older versions of Python,
-the extra module ``sslpsk`` (see https://github.com/drbild/sslpsk) offers limited support.
+the extra modules
+``sslpsk3`` (Python >= 3.7, see https://github.com/kuba2k2/sslpsk3)
+or
+``sslpsk`` (Python <= 3.9, see https://github.com/drbild/sslpsk)
+offers limited support.
 
 Fallback To Unencrypted Connections
 -----------------------------------
@@ -182,6 +186,15 @@ To enforce a encrypted connection, use the ``tls_psk_require=True`` parameter:
 
 In this case, an exception is raised, if the connection can not be established via TLS-PSK.
 
+sslpsk3
+-------
+
+The extra module `sslpsk3` (see https://github.com/kuba2k2/sslpsk3)
+is an extended fork of `sslpsk`
+and extends the core module `ssl` by TLS-PSK.
+
+It is installable via **pip**, see https://pypi.org/project/sslpsk3.
+
 sslpsk
 ------
 

bareos/bsock/lowlevel.py

@@ -1,6 +1,6 @@
 #   BAREOS - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2015-2024 Bareos GmbH & Co. KG
+#   Copyright (C) 2015-2026 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -60,12 +60,15 @@ if not getattr(ssl, "HAS_PSK", False):
 
     warnings.formatwarning = format_warning_short
     try:
-        import sslpsk
+        import sslpsk3
     except ImportError:
-        warnings.warn(
-            "Connection encryption via TLS-PSK is not available "
-            "(not available in 'ssl' and extra module 'sslpsk' is not installed)."
-        )
+        try:
+            import sslpsk
+        except ImportError:
+            warnings.warn(
+                "Connection encryption via TLS-PSK is not available "
+                "(not available in 'ssl' and neither extra module 'sslpsk3' nor 'sslpsk' is installed)."
+            )
 
 
 class LowLevel(object):
@@ -285,19 +288,28 @@ class LowLevel(object):
             context.set_psk_client_callback(lambda hint: (identity, password))
             self.socket = context.wrap_socket(client_socket, server_side=False)
         else:
-            try:
-                self.socket = sslpsk.wrap_socket(
-                    client_socket,
-                    ssl_version=self.tls_version,
-                    ciphers=ciphers,
-                    psk=(password, identity),
-                    server_side=False,
-                )
-            except ssl.SSLError as e:
-                # raise ConnectionError(
-                #     "failed to connect to host {0}, port {1}: {2}".format(self.address, self.port, str(e)))
-                # Using a general raise to keep more information about the type of error.
-                raise
+            if "sslpsk3" in sys.modules:
+                context = sslpsk3.SSLPSKContext(ssl.PROTOCOL_TLS_CLIENT)
+                # TLS1.3 only works using Python >= 3.13
+                context.maximum_version = ssl.TLSVersion.TLSv1_2
+                context.check_hostname = False
+                context.set_ciphers(ciphers)
+                context.set_psk_client_callback(lambda hint: (identity, password))
+                self.socket = context.wrap_socket(client_socket, server_side=False)
+            else:
+                try:
+                    self.socket = sslpsk.wrap_socket(
+                        client_socket,
+                        ssl_version=self.tls_version,
+                        ciphers=ciphers,
+                        psk=(password, identity),
+                        server_side=False,
+                    )
+                except ssl.SSLError as e:
+                    # raise ConnectionError(
+                    #     "failed to connect to host {0}, port {1}: {2}".format(self.address, self.port, str(e)))
+                    # Using a general raise to keep more information about the type of error.
+                    raise
         return True
 
     def get_tls_psk_identity(self):
@@ -313,7 +325,11 @@ class LowLevel(object):
     @staticmethod
     def is_tls_psk_available():
         """Checks if TLS-PSK is available."""
-        return getattr(ssl, "HAS_PSK", False) or ("sslpsk" in sys.modules)
+        return (
+            getattr(ssl, "HAS_PSK", False)
+            or ("sslpsk3" in sys.modules)
+            or ("sslpsk" in sys.modules)
+        )
 
     def get_protocol_version(self):
         """Get the Bareos Console protocol version that is used.

{python_bareos-25.0.2.dist-info → python_bareos-25.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-bareos
-Version: 25.0.2
+Version: 25.0.4
 Summary: Client library and tools for Bareos console access.
 Home-page: https://github.com/bareos/bareos/
 Author: Bareos Team
@@ -167,7 +167,11 @@ Since Bareos >= 18.2.4, Bareos supports TLS-PSK (Transport-Layer-Security Pre-Sh
 
 Unfortunately the Python core module ``ssl`` does support TLS-PSK only with Python >= 3.13.
 For some older versions of Python,
-the extra module ``sslpsk`` (see https://github.com/drbild/sslpsk) offers limited support.
+the extra modules
+``sslpsk3`` (Python >= 3.7, see https://github.com/kuba2k2/sslpsk3)
+or
+``sslpsk`` (Python <= 3.9, see https://github.com/drbild/sslpsk)
+offers limited support.
 
 Fallback To Unencrypted Connections
 -----------------------------------
@@ -203,6 +207,15 @@ To enforce a encrypted connection, use the ``tls_psk_require=True`` parameter:
 
 In this case, an exception is raised, if the connection can not be established via TLS-PSK.
 
+sslpsk3
+-------
+
+The extra module `sslpsk3` (see https://github.com/kuba2k2/sslpsk3)
+is an extended fork of `sslpsk`
+and extends the core module `ssl` by TLS-PSK.
+
+It is installable via **pip**, see https://pypi.org/project/sslpsk3.
+
 sslpsk
 ------
 

{python_bareos-25.0.2.dist-info → python_bareos-25.0.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-bareos/VERSION.txt,sha256=lxViFsrFPYekjQsaiCeDs04eLqle-P1knTBUKqhi-lk,7
+bareos/VERSION.txt,sha256=a9sRw4SjTFGB0vx4IJGtUit2LnwI95xnO7sSpet0yK0,7
 bareos/__init__.py,sha256=WPq-fXxGDZSIwfkXZkwJAZdGcVSeVBcLsTum5qOmX2I,1423
 bareos/exceptions.py,sha256=3oeC_jXq2imzPxiqJmGTq4TsgFRtDlzwnAwumzYsB5M,4071
-bareos/bsock/__init__.py,sha256=lXn5TYH3-UvwneHfLHWEzQYRSvUmUzRq5c6iSAqcnuo,8658
+bareos/bsock/__init__.py,sha256=r5UtyEkhqomYW5FYE7OmjsKon0vGfU1mgoj16A7WfKg,8979
 bareos/bsock/bsock.py,sha256=SIAPU7ouXOW5ScnnpgtVbcugKmzXlNhSs6lrC0ofspw,1242
 bareos/bsock/bsockjson.py,sha256=pnnX7b83dJH86pOw140CBz5etVJgafcQhXtKhr219TE,1289
 bareos/bsock/connectiontype.py,sha256=PNEHpqZfuAHV310NaOMgMXj6VKiZxAZwXeRIOUfHJWI,1043
@@ -9,7 +9,7 @@ bareos/bsock/constants.py,sha256=U9RlPy8XYNkFCG1j6B89gI5cCiODVHyfQMWNumz7pbY,512
 bareos/bsock/directorconsole.py,sha256=ou1IYXoMxgv46zws0ERrB28VWvrs0npA3iC1b5pLMz0,10368
 bareos/bsock/directorconsolejson.py,sha256=LdsMIwHZeaK-y9ydwOVl7EndMavqb2_v98ZRqWL0G7o,4457
 bareos/bsock/filedaemon.py,sha256=bl8QD97R3uc5qTFV2wN0mfi2C3ePJsjaN_bKeZAclsk,6067
-bareos/bsock/lowlevel.py,sha256=iDFqyU7XS3psoYnPQuah3lr6vl6hUFpc56wWf16pHzg,29916
+bareos/bsock/lowlevel.py,sha256=x7w2DrwDtTFmSx2R_gzJToH_PK0vInfkkt3QYWL-vsg,30661
 bareos/bsock/protocolmessageids.py,sha256=WKlbo8qbgSL5V48fQnFXtyvjBBgIu_lOYzvQ8vQrGaQ,1228
 bareos/bsock/protocolmessages.py,sha256=GgtstzAwA_gjOJCYQTG_wevsA6zTMn_bbz3E2yr8TCU,3008
 bareos/bsock/protocolversions.py,sha256=7i5AaSnG9F-8WNVds7SJcezVzJU-SyjTNryJTNWikns,1030
@@ -20,11 +20,11 @@ bareos/util/bareosbase64.py,sha256=5bsv6-sxNJEnO1M3f0LyZP9CV6ZPyQ1axoi9Tfno4U8,3
 bareos/util/password.py,sha256=w71h7KnVHNik37oRl0ljj8krBVslz6a2tB_1jBJBJfM,2531
 bareos/util/path.py,sha256=nycMxK3V-P9Cx-CMsWo4e-IVlnl6_Im61pFUIPQEbL0,3099
 bareos/util/version.py,sha256=xqNm9vvkaHMKpS0xJozQs11XrQYJR1U4j5oOUCnPiMw,1201
-python_bareos-25.0.2.data/scripts/bareos-fd-connect.py,sha256=y7Jh2A-tkQeBNjyKYo8RsA7POHyDEYuOuy8ozjCEE1o,2127
-python_bareos-25.0.2.data/scripts/bconsole-json.py,sha256=0vFaTeQvJYt_Vk3ldGefMb1rZbPhdO16FaT7dZH0b2k,1960
-python_bareos-25.0.2.data/scripts/bconsole.py,sha256=m7ylVGq-ibYBbi1ZdkDdMC891WLZ3Cf5mg4IIe27i64,1993
-python_bareos-25.0.2.dist-info/licenses/LICENSE.txt,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-python_bareos-25.0.2.dist-info/METADATA,sha256=h-BxS4Ndi3tPP7eXCGAcQcCYj1iq25N4iu1dHab-zPI,8456
-python_bareos-25.0.2.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-python_bareos-25.0.2.dist-info/top_level.txt,sha256=NlKJmA3FY973VTk-0zlxwwhDtFZHYVjpSNzgeMJsknY,7
-python_bareos-25.0.2.dist-info/RECORD,,
+python_bareos-25.0.4.data/scripts/bareos-fd-connect.py,sha256=y7Jh2A-tkQeBNjyKYo8RsA7POHyDEYuOuy8ozjCEE1o,2127
+python_bareos-25.0.4.data/scripts/bconsole-json.py,sha256=0vFaTeQvJYt_Vk3ldGefMb1rZbPhdO16FaT7dZH0b2k,1960
+python_bareos-25.0.4.data/scripts/bconsole.py,sha256=m7ylVGq-ibYBbi1ZdkDdMC891WLZ3Cf5mg4IIe27i64,1993
+python_bareos-25.0.4.dist-info/licenses/LICENSE.txt,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+python_bareos-25.0.4.dist-info/METADATA,sha256=n3R4Kb7a0uDu4FOL6Qwj8ObqFyIpi5_HeF-y_06j-0U,8777
+python_bareos-25.0.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_bareos-25.0.4.dist-info/top_level.txt,sha256=NlKJmA3FY973VTk-0zlxwwhDtFZHYVjpSNzgeMJsknY,7
+python_bareos-25.0.4.dist-info/RECORD,,

{python_bareos-25.0.2.dist-info → python_bareos-25.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any