python-bareos 25.0.3__tar.gz → 25.0.4__tar.gz

{python_bareos-25.0.3 → python_bareos-25.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-bareos
-Version: 25.0.3
+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.4/bareos/VERSION.txt

@@ -0,0 +1 @@
+25.0.4

{python_bareos-25.0.3 → python_bareos-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
 ------
 

{python_bareos-25.0.3 → python_bareos-25.0.4}/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.3 → python_bareos-25.0.4}/python_bareos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-bareos
-Version: 25.0.3
+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.3/bareos/VERSION.txt

@@ -1 +0,0 @@
-25.0.3