You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2019/10/02 17:34:52 UTC
[qpid-dispatch] branch master updated: NO-JIRA - Added tests to
make sure you can specify env: and literal: prefixes in the password file
This is an automated email from the ASF dual-hosted git repository.
gmurthy 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 38c1ec6 NO-JIRA - Added tests to make sure you can specify env: and literal: prefixes in the password file
38c1ec6 is described below
commit 38c1ec6d4b02964f02439aa46cda85f54aaec085
Author: Ganesh Murthy <gm...@apache.org>
AuthorDate: Wed Oct 2 13:29:01 2019 -0400
NO-JIRA - Added tests to make sure you can specify env: and literal: prefixes in the password file
---
pom.xml | 2 ++
tests/ssl_certs/server-password-file-env.txt | 1 +
tests/ssl_certs/server-password-file-literal.txt | 1 +
tests/system_tests_user_id.py | 6 ++++--
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 74d7bf8..c5c74a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,8 @@
<exclude>**/sasl-password-file.txt</exclude>
<exclude>**/server-password-file.txt</exclude>
<exclude>**/server-password-file-bad.txt</exclude>
+ <exclude>**/server-password-file-env.txt</exclude>
+ <exclude>**/server-password-file-literal.txt</exclude>
<exclude>**/client-password-file.txt</exclude>
<exclude>**/*.pkcs12</exclude>
<exclude>**/.idea/**</exclude> <!-- This is for ignoring the intellij idea project files -->
diff --git a/tests/ssl_certs/server-password-file-env.txt b/tests/ssl_certs/server-password-file-env.txt
new file mode 100644
index 0000000..b2520d5
--- /dev/null
+++ b/tests/ssl_certs/server-password-file-env.txt
@@ -0,0 +1 @@
+env:TLS_SERVER_PASSWORD
diff --git a/tests/ssl_certs/server-password-file-literal.txt b/tests/ssl_certs/server-password-file-literal.txt
new file mode 100644
index 0000000..9d40817
--- /dev/null
+++ b/tests/ssl_certs/server-password-file-literal.txt
@@ -0,0 +1 @@
+literal:server-password
diff --git a/tests/system_tests_user_id.py b/tests/system_tests_user_id.py
index 827cd0f..73a389c 100644
--- a/tests/system_tests_user_id.py
+++ b/tests/system_tests_user_id.py
@@ -38,6 +38,8 @@ class QdSSLUseridTest(TestCase):
def setUpClass(cls):
super(QdSSLUseridTest, cls).setUpClass()
+ os.environ["TLS_SERVER_PASSWORD"] = "server-password"
+
ssl_profile1_json = os.path.join(DIR, 'displayname_files', 'profile_names1.json')
ssl_profile2_json = os.path.join(DIR, 'displayname_files', 'profile_names2.json')
@@ -123,7 +125,7 @@ class QdSSLUseridTest(TestCase):
'privateKeyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': '1x',
'uidNameMappingFile': ssl_profile2_json,
- 'password': 'server-password'}),
+ 'passwordFile': cls.ssl_file('server-password-file-literal.txt')}),
# All components in the uidFormat are unrecognized, pn_get_transport_user will be returned
('sslProfile', {'name': 'server-ssl11',
@@ -131,7 +133,7 @@ class QdSSLUseridTest(TestCase):
'certFile': cls.ssl_file('server-certificate.pem'),
'privateKeyFile': cls.ssl_file('server-private-key.pem'),
'uidFormat': 'abxd',
- 'password': 'server-password'}),
+ 'passwordFile': cls.ssl_file('server-password-file-env.txt')}),
('sslProfile', {'name': 'server-ssl12',
'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