qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmur...@apache.org
Subject qpid-dispatch git commit: DISPATCH-1095 - Only adding SASL listener when SASL available. This closes #352
Date Fri, 03 Aug 2018 13:26:02 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master a1585a9c3 -> 5e7c75d9c


DISPATCH-1095 - Only adding SASL listener when SASL available. This closes #352


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/5e7c75d9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/5e7c75d9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/5e7c75d9

Branch: refs/heads/master
Commit: 5e7c75d9c20a85be48854e14f8e40b4fcceb73c5
Parents: a1585a9
Author: Fernando Giorgetti <fgiorget@redhat.com>
Authored: Fri Aug 3 09:47:28 2018 -0300
Committer: Ganesh Murthy <gmurthy@redhat.com>
Committed: Fri Aug 3 09:20:16 2018 -0400

----------------------------------------------------------------------
 tests/system_tests_ssl.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5e7c75d9/tests/system_tests_ssl.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_ssl.py b/tests/system_tests_ssl.py
index f38ae6d..5eb9a6f 100644
--- a/tests/system_tests_ssl.py
+++ b/tests/system_tests_ssl.py
@@ -104,14 +104,13 @@ class RouterTestSslClient(RouterTestSslBase):
                                  'mode': 'interior',
                                  'saslConfigName': 'tests-mech-PLAIN',
                                  'saslConfigDir': os.getcwd()})
+
+            # Generate authentication DB
+            super(RouterTestSslClient, cls).create_sasl_files()
         else:
             router = ('router', {'id': 'QDR.A',
                                  'mode': 'interior'})
 
-
-        # Generate authentication DB
-        super(RouterTestSslClient, cls).create_sasl_files()
-
         # Saving listener ports for each TLS definition
         cls.PORT_TLS1 = cls.tester.get_port()
         cls.PORT_TLS11 = cls.tester.get_port()
@@ -156,12 +155,21 @@ class RouterTestSslClient(RouterTestSslBase):
             # Invalid protocol version
             ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.PORT_SSL3,
                           'authenticatePeer': 'no',
-                          'sslProfile': 'ssl-profile-ssl3'}),
-            # TLS 1 and 1.2 with SASL PLAIN authentication for proton client validation
-            ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.PORT_TLS_SASL,
-                          'authenticatePeer': 'yes', 'saslMechanisms': 'PLAIN',
-                          'requireSsl': 'yes', 'requireEncryption': 'yes',
-                          'sslProfile': 'ssl-profile-tls1-tls12'}),
+                          'sslProfile': 'ssl-profile-ssl3'})
+        ]
+
+        # Adding SASL listener only when SASL is available
+        if SASL.extended():
+            conf += [
+                # TLS 1 and 1.2 with SASL PLAIN authentication for proton client validation
+                ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.PORT_TLS_SASL,
+                              'authenticatePeer': 'yes', 'saslMechanisms': 'PLAIN',
+                              'requireSsl': 'yes', 'requireEncryption': 'yes',
+                              'sslProfile': 'ssl-profile-tls1-tls12'})
+            ]
+
+        # Adding SSL profiles
+        conf += [
             # SSL Profile for TLSv1
             ('sslProfile', {'name': 'ssl-profile-tls1',
                             'caCertFile': cls.ssl_file('ca-certificate.pem'),


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message