This is an automated email from the ASF dual-hosted git repository.
gsim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new 50fcfc5 DISPATCH-1257: only convert user/password to string if they
are not None
50fcfc5 is described below
commit 50fcfc5c1fdfbd0034ab066f525b597d434f65b9
Author: Gordon Sim <g...@redhat.com>
AuthorDate: Fri Jan 25 19:41:38 2019 +0000
DISPATCH-1257: only convert user/password to string if they are not None
---
python/qpid_dispatch/management/client.py | 4 ++--
tests/system_tests_qdstat.py | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/python/qpid_dispatch/management/client.py
b/python/qpid_dispatch/management/client.py
index 22ed58e..80498fd 100644
--- a/python/qpid_dispatch/management/client.py
+++ b/python/qpid_dispatch/management/client.py
@@ -102,8 +102,8 @@ class Node(object):
ssl_domain=ssl_domain,
sasl_enabled=sasl_enabled,
allowed_mechs=str(sasl.mechs) if sasl and
sasl.mechs != None else None,
- user=str(sasl.user) if sasl else None,
- password=str(sasl.password) if sasl else
None)
+ user=str(sasl.user) if sasl and sasl.user !=
None else None,
+ password=str(sasl.password) if sasl and
sasl.password != None else None)
@staticmethod
def connect(url=None, router=None, timeout=10, ssl_domain=None, sasl=None):
diff --git a/tests/system_tests_qdstat.py b/tests/system_tests_qdstat.py
index 16614f7..2129fad 100644
--- a/tests/system_tests_qdstat.py
+++ b/tests/system_tests_qdstat.py
@@ -242,6 +242,7 @@ try:
def get_ssl_args(self):
args = dict(
+ sasl_external = ['--sasl-mechanisms', 'EXTERNAL'],
trustfile = ['--ssl-trustfile',
self.ssl_file('ca-certificate.pem')],
bad_trustfile = ['--ssl-trustfile',
self.ssl_file('bad-ca-certificate.pem')],
client_cert = ['--ssl-certificate',
self.ssl_file('client-certificate.pem')],
@@ -316,6 +317,9 @@ try:
def test_ssl_bad_trustfile_to_auth(self):
self.ssl_test_bad('auth_s', ['bad_trustfile', 'client_cert_all'])
+ def test_ssl_cert_explicit_external_to_auth(self):
+ self.ssl_test('auth_s', ['sasl_external', 'client_cert_all'])
+
# Unsecured SSL listener, allows non-SSL
def test_ssl_none_to_unsecured(self):
@@ -349,6 +353,7 @@ try:
"""
def get_ssl_args(self):
args = dict(
+ sasl_external = ['--sasl-mechanisms', 'EXTERNAL'],
trustfile = ['--ssl-trustfile',
self.ssl_file('ca-certificate.pem')],
bad_trustfile = ['--ssl-trustfile',
self.ssl_file('bad-ca-certificate.pem')],
client_cert = ['--ssl-certificate',
self.ssl_file('client-certificate.pem')],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
