From f78382fd44d6339381ba3fc797e686b98fb8f982 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 03 Aug 2007 08:50:23 +0000
Subject: [PATCH] use dsconfig to configre SSL
---
opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml | 46 -------
opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml | 68 +---------
opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml | 52 +-------
opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml | 45 ------
opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml | 85 +------------
opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml | 8 -
opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml | 7 -
opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml | 8 -
8 files changed, 39 insertions(+), 280 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
index 5f3ab13..e7a49bc 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
@@ -53,12 +53,12 @@
<!-- Load in the local shared python objects from libraries -->
<call function="'loadVariables'">
- </call>
-
+ </call>
+
<message>
'---- Generating Server Certicate -----'
</message>
-
+
<!-- create a server certificate -->
<call function="'genCertificate'">
@@ -298,84 +298,21 @@
<call function="'loadVariables'">
</call>
- <!-- Configure SSL-->
+ <!-- Configure SSL and TLS -->
<message>
- '---- Configure SSL ----'
+ '---- Configure SSL and TLS----'
</message>
- <!--- Enable Key Manager Provider -->
- <message>
- 'Enabling Key Manager Provider'
- </message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <call function="'configureSSL_TLS'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/setup/enable_key_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'keystorePin' : SERVER_STOREPASS,
+ 'certAlias' : 'server-cert'}
+ </call>
- <!--- Enable Trust Manager Provider -->
- <message>
- 'Enabling Trust Manager Provider'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/setup/enable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
- <!--- Enable LDAPS Connection Handler -->
- <message>
- 'Enabling LDAPS Connection Handler - Port number'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/ldaps_port.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
- <!-- Enabling LDAPS Connection Handler - Keystore type -->
- <message>
- 'Enabling LDAPS Connection Handler - Keystore type'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/setup/enable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
- <!--- Enable StartTLS -->
- <message>
- 'Enabling StartTLS'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/client_auth/setup/enable_startTLS.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
<!--- Initial Search With SSL -->
<message>
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
index 656dd4f..8a26cf6 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -64,69 +64,19 @@
<!-- Load in the local shared python objects from libraries -->
<call function="'loadVariables'">
</call>
- <!--- Unconfigure SSL -->
-
-
- <!--- Disable LDAPS Connection Handler -->
+ <!--- Unconfigure SSL and TLS -->
+
<message>
- 'Disabling LDAPS Connection Handler'
- </message>
+ '---- Configure SSL and TLS----'
+ </message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <call function="'unconfigureSSL_TLS'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
- <!--- Disable SSL Trust Manager Provider -->
- <message> 'Disabling SSL Trust Manager Provider' </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
-
- <!--- Disable Key Manager Provider -->
- <message>
- 'Disabling Key Manager Provider'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
-
-
- <!--- Disable StartTLS -->
- <message>
- 'Disabling StartTLS'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_startTLS.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
<!-- remove client certificates keystore -->
<message>
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index 170a9a7..eeb1d17 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -105,13 +105,7 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'keystoreType' : '%s' % 'jks' }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
</call>
<!--- Initial Search With SSL -->
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index 455ac98..cba8ddc 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -73,50 +73,13 @@
'extraParams' : '-Z -X -x' }
</call>
- <!--- Disable LDAPS Connection Handler -->
- <message>
- 'Disabling LDAPS Connection Handler'
- </message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <call function="'unconfigureSSL'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/teardown/disable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
- <!--- Disable SSL Trust Manager Provider -->
- <message> 'Disabling SSL Trust Manager Provider' </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
-
- <!--- Disable Key Manager Provider -->
- <message>
- 'Disabling Key Manager Provider'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
<!--- Remove JKS Keystore -->
<message>
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index dd5160a..69f519b 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -100,14 +100,10 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'keystoreType' : '%s' % 'pkcs12' }
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'keystoreType' : 'PKCS12' }
</call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<!--- Initial Search With SSL -->
<message>
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index 89e4963..f56777f 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -79,52 +79,14 @@
</message>
<!--- Unconfigure SSL -->
+ <call function="'unconfigureSSL'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'keystoreType' : 'PKCS12' }
+ </call>
-
- <!--- Disable LDAPS Connection Handler -->
- <message>
- 'Disabling LDAPS Connection Handler'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
- <!--- Disable SSL Trust Manager Provider -->
- <message> 'Disabling SSL Trust Manager Provider' </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
-
- <!--- Disable Key Manager Provider -->
- <message>
- 'Disabling Key Manager Provider'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
<!--- Remove PKCS12 Keystore -->
<message>
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
index 6af1e7f..51f9d2a 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
@@ -75,14 +75,9 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'keystoreType' : '%s' % 'startTLS' }
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<!--- Initial Search With StartTLS -->
<message>
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index 0091412..99fe77b 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -56,50 +56,12 @@
'result' : STAXResult }
</call>
-
-
- <!--- Disable SSL Trust Manager Provider -->
- <message> 'Disabling SSL Trust Manager Provider' </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <call function="'unconfigureTLS'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
-
- <!--- Disable Key Manager Provider -->
- <message>
- 'Disabling Key Manager Provider'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
- <!--- Disable StartTLS -->
- <message>
- 'Disabling StartTLS'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/teardown/disable_startTLS.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
<!--- Remove JKS Keystore -->
<message>
--
Gitblit v1.10.0