From e299d0229f51541e755b53e450b6bc30a71a83a7 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 23 Jul 2007 21:23:22 +0000
Subject: [PATCH] Refactored about half of the Security test suite to use dsconfig and modifyAnAttribute. Many ldif files can be eliminated as a result.
---
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml | 53 +
opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml | 62 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml | 53 +
opends/tests/functional-tests/shared/functions/dsconfig.xml | 274 ++++++++++
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml | 60 +
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml | 53 +
opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml | 218 +++++---
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml | 53 +
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml | 53 +
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml | 50
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml | 53 +
/dev/null | 29 -
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml | 49 +
opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml | 76 +-
opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml | 216 ++++----
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml | 56 +
opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml | 69 +-
opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml | 49
18 files changed, 954 insertions(+), 572 deletions(-)
diff --git a/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif b/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif
deleted file mode 100644
index 73d86c2..0000000
--- a/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif
+++ /dev/null
@@ -1,30 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=scarter,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
-changetype: modify
-add: ds-pwp-account-disabled
-ds-pwp-account-disabled: true
-
diff --git a/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif b/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif
deleted file mode 100644
index cd78d40..0000000
--- a/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif
+++ /dev/null
@@ -1,30 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
-changetype: modify
-add: ds-pwp-account-expiration-time
-ds-pwp-account-expiration-time: 20061111161234Z
-
diff --git a/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif b/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif
deleted file mode 100644
index 1e492d0..0000000
--- a/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif
+++ /dev/null
@@ -1,30 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
-changetype: modify
-replace: ds-pwp-account-expiration-time
-ds-pwp-account-expiration-time: 20361111161234Z
-
diff --git a/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif b/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif
deleted file mode 100644
index 81c8381..0000000
--- a/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif
+++ /dev/null
@@ -1,30 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=scarter,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
-changetype: modify
-replace: ds-pwp-account-disabled
-ds-pwp-account-disabled: false
-
diff --git a/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif b/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif
deleted file mode 100644
index d683423..0000000
--- a/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
-changetype: modify
-delete: ds-pwp-account-expiration-time
-
diff --git a/opends/tests/functional-tests/shared/data/security/bind_no_pwd/disable_bind_no_pwd.ldif b/opends/tests/functional-tests/shared/data/security/bind_no_pwd/disable_bind_no_pwd.ldif
deleted file mode 100644
index d5ddc5d..0000000
--- a/opends/tests/functional-tests/shared/data/security/bind_no_pwd/disable_bind_no_pwd.ldif
+++ /dev/null
@@ -1,5 +0,0 @@
-dn: cn=config
-changetype: modify
-replace: ds-cfg-bind-with-dn-requires-password
-ds-cfg-bind-with-dn-requires-password: true
-
diff --git a/opends/tests/functional-tests/shared/data/security/bind_no_pwd/enable_bind_no_pwd.ldif b/opends/tests/functional-tests/shared/data/security/bind_no_pwd/enable_bind_no_pwd.ldif
deleted file mode 100644
index bf7f42a..0000000
--- a/opends/tests/functional-tests/shared/data/security/bind_no_pwd/enable_bind_no_pwd.ldif
+++ /dev/null
@@ -1,5 +0,0 @@
-dn: cn=config
-changetype: modify
-replace: ds-cfg-bind-with-dn-requires-password
-ds-cfg-bind-with-dn-requires-password: false
-
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif
deleted file mode 100644
index 33c67ea..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: BAD
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif
deleted file mode 100644
index 4d3f7ec..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: BASE64
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif
deleted file mode 100644
index aa21a45..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: CLEAR
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif
deleted file mode 100644
index b9f5c69..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: MD5
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif
deleted file mode 100644
index 85436c7..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: SHA
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif
deleted file mode 100644
index d2f6c3a..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: SMD5
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif
deleted file mode 100644
index fc504aa..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: SSHA256
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif
deleted file mode 100644
index 1862aad..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: SSHA384
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif
deleted file mode 100644
index 338342a..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: SSHA512
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif
deleted file mode 100644
index 087829c..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-delete: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: MD5
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif
deleted file mode 100644
index b4dc5ce..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-deprecated-password-storage-scheme
-ds-cfg-deprecated-password-storage-scheme: MD5
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif
deleted file mode 100644
index 7379481..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-default-password-storage-scheme
-ds-cfg-default-password-storage-scheme: SSHA
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif
deleted file mode 100644
index b101b53..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=bhall,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-add: userpassword
-userpassword: anotherorange
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif
deleted file mode 100644
index 41a3f02..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=jwallace,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: BASE64linear
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif
deleted file mode 100644
index ccdb879..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=jwalker,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: CLEARdogleg
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif
deleted file mode 100644
index 397f39b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=kwinters,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: MD5forsook
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif
deleted file mode 100644
index 8943b8b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=tmorris,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: SHAirrefutable
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif
deleted file mode 100644
index 4a494f2..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=trigden,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: SMD5sensitive
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif
deleted file mode 100644
index 91e349b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=scarter,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: SSHAsprain
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif
deleted file mode 100644
index 8508552..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=kvaughan,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: SSHA256bribery
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif
deleted file mode 100644
index 09ee355..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=dmiller,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: SSHA384gosling
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif
deleted file mode 100644
index 0c78ca9..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=gfarmer,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: SSHA512ruling
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif
deleted file mode 100644
index 27a3d46..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=tmason,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: squinted
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif b/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif
deleted file mode 100644
index 324e830..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=bhall,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: manyoranges
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/add_sales_admin.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/add_sales_admin.ldif
deleted file mode 100644
index 93e4976..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/add_sales_admin.ldif
+++ /dev/null
@@ -1,12 +0,0 @@
-dn: cn=Sales Admin,cn=Root DNs,cn=config
-objectClass: person
-objectClass: inetOrgPerson
-objectClass: top
-objectClass: organizationalPerson
-objectClass: ds-cfg-root-dn
-userPassword: password
-cn: Sales Admin
-givenName: Sales
-sn: Admin
-ds-cfg-alternate-bind-dn: cn=Sales Admin
-
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif
deleted file mode 100644
index 5a08a2c..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
-changetype: modify
-replace: ds-cfg-maximum-password-length
-ds-cfg-maximum-password-length: 10
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif
deleted file mode 100644
index 0903782..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
-changetype: modify
-replace: ds-cfg-minimum-password-length
-ds-cfg-minimum-password-length: 4
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif
deleted file mode 100644
index 60f93fa..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-skip-validation-for-administrators
-ds-cfg-skip-validation-for-administrators: false
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif
deleted file mode 100644
index 9a4b768..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif
+++ /dev/null
@@ -1,28 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-delete: ds-cfg-password-validator-dn
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif
deleted file mode 100644
index c3a4d1f..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-skip-validation-for-administrators
-ds-cfg-skip-validation-for-administrators: true
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif
deleted file mode 100644
index 539f4e5..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-password-validator-dn
-ds-cfg-password-validator-dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif
deleted file mode 100644
index eb4c585..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
-changetype: modify
-replace: ds-cfg-maximum-password-length
-ds-cfg-maximum-password-length: 0
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif
deleted file mode 100644
index 36f8a4e..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
-changetype: modify
-replace: ds-cfg-minimum-password-length
-ds-cfg-minimum-password-length: 6
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif
deleted file mode 100644
index bcf83f8..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif
+++ /dev/null
@@ -1,27 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Sales Admin,cn=Root DNs,cn=config
-changetype: delete
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif
deleted file mode 100644
index 46d24be..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Sales Admin,cn=Root DNs,cn=config
-changetype: modify
-replace: userpassword
-userpassword: grape
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif
deleted file mode 100644
index 2e20f47..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Sales Admin,cn=Root DNs,cn=config
-changetype: modify
-replace: userpassword
-userpassword: goo
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif
deleted file mode 100644
index 31bd03c..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Sales Admin,cn=Root DNs,cn=config
-changetype: modify
-replace: userpassword
-userpassword: gaa
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif
deleted file mode 100644
index e067d75..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: pomegranates
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif
deleted file mode 100644
index a6709fc..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: grapefruit
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif
deleted file mode 100644
index 81120d9..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: grape
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif b/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif
deleted file mode 100644
index e3129f7..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: goo
diff --git a/opends/tests/functional-tests/shared/functions/dsconfig.xml b/opends/tests/functional-tests/shared/functions/dsconfig.xml
index 33afc08..1b335d5 100755
--- a/opends/tests/functional-tests/shared/functions/dsconfig.xml
+++ b/opends/tests/functional-tests/shared/functions/dsconfig.xml
@@ -174,6 +174,280 @@
STAXCode=RC
STAXReason=STAXResult
</script>
+
+ <if expr="expectedRC != 'noCheck'">
+ <call function="'checktestRC'">
+ { 'returncode' : STAXCode ,
+ 'result' : STAXReason ,
+ 'expected' : expectedRC }
+ </call>
+ </if>
+ <return>
+ STAXReason
+ </return>
+
+ </sequence>
+
+ </function>
+
+ <!-- Modify password policy using dsconfig -->
+ <function name="modifyGlobal">
+ <function-prolog>
+ This function modifies a global attribute value using dsconfig
+ </function-prolog>
+ <function-map-args>
+ <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
+ <function-arg-description>
+ Location of target host
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-description>
+ Pathname to installation root
+ </function-arg-description>
+ <function-arg-property name="type" value="filepath"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstanceHost" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
+ <function-arg-description>
+ Directory server hostname or IP address
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-description>
+ Directory server port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstanceDn" type="required">
+ <function-arg-description>
+ Bind DN
+ </function-arg-description>
+ <function-arg-property name="type" value="DN"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstancePswd" type="required">
+ <function-arg-description>
+ Bind password
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ <function-arg-def name="attributeName" type="required">
+ <function-arg-description>
+ Attribute to modify, e.g. bind-with-dn-requires-password
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ <function-arg-def name="attributeValue" type="required">
+ <function-arg-description>
+ New attribute value
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ </function-map-args>
+ <sequence>
+
+ <!-- Local variables -->
+ <script>
+ mylocation=location
+ STAFCmdParams=''
+ STAFCmd=''
+
+ if dsPath:
+ dsBinPath='%s/%s' % (dsPath,fileFolder)
+ STAFCmd='%s/%s%s' % (dsBinPath,DSCONFIG,fileExt)
+
+ if attributeValue:
+ attributeValue=attributeValue.replace('"','QUOT')
+
+ STAFCmdParamsList=[]
+ STAFCmdParamsList.append('set-global-configuration-prop ')
+ STAFCmdParamsList.append('--set "%s:%s"' % (attributeName,attributeValue))
+ </script>
+
+ <call function="'_dsconfigCommonArgs'"/>
+
+ <script>
+ STAFCmdParams=' '.join(STAFCmdParamsList)
+ </script>
+
+ <message>
+ '%s %s' % (STAFCmd, STAFCmdParams)
+ </message>
+
+ <process name="'Modify dsconfig object'">
+ <location>'%s' % location</location>
+ <command>'%s' % STAFCmd</command>
+ <parms>'%s' % STAFCmdParams</parms>
+ <workdir>'%s' % dsBinPath</workdir>
+ <envs>
+ ['PATH=/bin:/usr/bin:%s' % dsBinPath, 'JAVA_HOME=%s' % JAVA_HOME]
+ </envs>
+ <console use="'same'"/>
+ <stderr mode="'stdout'"/>
+ <returnstdout/>
+ </process>
+
+ <script>
+ STAXCode=RC
+ STAXReason=STAXResult
+ </script>
+ <if expr="expectedRC != 'noCheck'">
+ <call function="'checktestRC'">
+ { 'returncode' : STAXCode ,
+ 'result' : STAXReason ,
+ 'expected' : expectedRC }
+ </call>
+ </if>
+ <return>
+ STAXReason
+ </return>
+
+ </sequence>
+
+ </function>
+
+ <!-- Modify identity mapper using dsconfig -->
+ <function name="modifyIdentityMapper">
+ <function-prolog>
+ This function modifies an identity mapper using dsconfig
+ </function-prolog>
+ <function-map-args>
+ <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
+ <function-arg-description>
+ Location of target host
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-description>
+ Pathname to installation root
+ </function-arg-description>
+ <function-arg-property name="type" value="filepath"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstanceHost" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
+ <function-arg-description>
+ Directory server hostname or IP address
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-description>
+ Directory server port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstanceDn" type="required">
+ <function-arg-description>
+ Bind DN
+ </function-arg-description>
+ <function-arg-property name="type" value="DN"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsInstancePswd" type="required">
+ <function-arg-description>
+ Bind password
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ <function-arg-def name="mapperName" type="required">
+ <function-arg-description>
+ Mapper to modify, e.g. Exact Match
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ <function-arg-def name="attributeName" type="required">
+ <function-arg-description>
+ Attribute to modify, e.g. match-attribute
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ <function-arg-def name="attributeValue" type="required">
+ <function-arg-description>
+ New attribute value
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0
+ </function-arg-description>
+ <function-arg-property name="type" value="string"/>
+ </function-arg-def>
+
+ </function-map-args>
+ <sequence>
+
+ <!-- Local variables -->
+ <script>
+ mylocation=location
+ STAFCmdParams=''
+ STAFCmd=''
+
+ if dsPath:
+ dsBinPath='%s/%s' % (dsPath,fileFolder)
+ STAFCmd='%s/%s%s' % (dsBinPath,DSCONFIG,fileExt)
+
+ if attributeValue:
+ attributeValue=attributeValue.replace('"','QUOT')
+
+ STAFCmdParamsList=[]
+ STAFCmdParamsList.append('set-identity-mapper-prop ')
+ STAFCmdParamsList.append('--mapper-name "%s" ' % (mapperName))
+ STAFCmdParamsList.append('--set "%s:%s"' % (attributeName,attributeValue))
+ </script>
+
+ <call function="'_dsconfigCommonArgs'"/>
+
+ <script>
+ STAFCmdParams=' '.join(STAFCmdParamsList)
+ </script>
+
+ <message>
+ '%s %s' % (STAFCmd, STAFCmdParams)
+ </message>
+
+ <process name="'Modify dsconfig object'">
+ <location>'%s' % location</location>
+ <command>'%s' % STAFCmd</command>
+ <parms>'%s' % STAFCmdParams</parms>
+ <workdir>'%s' % dsBinPath</workdir>
+ <envs>
+ ['PATH=/bin:/usr/bin:%s' % dsBinPath, 'JAVA_HOME=%s' % JAVA_HOME]
+ </envs>
+ <console use="'same'"/>
+ <stderr mode="'stdout'"/>
+ <returnstdout/>
+ </process>
+
+ <script>
+ STAXCode=RC
+ STAXReason=STAXResult
+ </script>
+
<if expr="expectedRC != 'noCheck'">
<call function="'checktestRC'">
{ 'returncode' : STAXCode ,
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index db0ecc0..a273e3d 100755
--- a/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -48,8 +48,7 @@
'dsInstancePswd' : 'inflict' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base',
- 'expectedRC' : 0 }
+ 'extraParams' : '-s base' }
</call>
<call function="'testCase_Postamble'"/>
@@ -64,15 +63,17 @@
'Security: Account Expiration Admin Expiring User'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_expire_account.ldif' % logsRemoteDataDir,
- 'expectedRC' : 0 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'attributeName' : 'ds-pwp-account-expiration-time' ,
+ 'newAttributeValue' : '20061111161234Z' ,
+ 'changetype' : 'replace' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -90,7 +91,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'inflict' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 49 }
@@ -107,15 +108,17 @@
'Security: Account Expiration Admin Expiring User in Future'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_expire_account_future.ldif' % logsRemoteDataDir,
- 'expectedRC' : 0 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'attributeName' : 'ds-pwp-account-expiration-time' ,
+ 'newAttributeValue' : '20361111161234Z' ,
+ 'changetype' : 'replace' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -133,10 +136,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'inflict' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base',
- 'expectedRC' : 0 }
+ 'extraParams' : '-s base' }
</call>
<call function="'testCase_Postamble'"/>
@@ -151,15 +153,17 @@
'Security: Account Expiration: Postamble Step 1. Admin Removing User Expiration'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_unexpire_account.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 0 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'attributeName' : 'ds-pwp-account-expiration-time' ,
+ 'newAttributeValue' : '20361111161234Z' ,
+ 'changetype' : 'delete' }
</call>
-
+
<message>
'Security: Account Expiration Postamble Step 2. Checking User Bind After Removing Expiration'
</message>
@@ -169,10 +173,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'inflict' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base',
- 'expectedRC' : 0 }
+ 'extraParams' : '-s base' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
index c2890a9..6e0e7d8 100755
--- a/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
+++ b/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
@@ -48,8 +48,7 @@
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' ,
- 'expectedRC' : 0 }
+ 'extraParams' : '-s base' }
</call>
<call function="'testCase_Postamble'"/>
@@ -64,15 +63,17 @@
'Security: Account Activation: Admin Deactivating User'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_deactivate_account.ldif' % logsRemoteDataDir,
- 'expectedRC' : 0 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=scarter,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'attributeName' : 'ds-pwp-account-disabled' ,
+ 'newAttributeValue' : 'true' ,
+ 'changetype' : 'replace' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -90,10 +91,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
- 'expectedRC' : 49 }
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -108,16 +109,17 @@
'Security: Account Activation: Postamble Step 1. Admin Reactivating User'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_reactivate_account.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 0 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=scarter,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'attributeName' : 'ds-pwp-account-disabled' ,
+ 'newAttributeValue' : 'false' ,
+ 'changetype' : 'replace' }
</call>
-
-
+
<message>
'Security: Account Activation: Postamble Step 2. Checking User Bind After Reactivation'
</message>
@@ -127,10 +129,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base',
- 'expectedRC' : 0 }
+ 'extraParams' : '-s base' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
index dae80e3..e3e0246 100755
--- a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
+++ b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
@@ -45,7 +45,7 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % logsRemoteDataDir }
</call>
@@ -66,10 +66,10 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir,
- 'expectedRC' : 53 }
+ 'expectedRC' : 53 }
</call>
<call function="'testCase_Postamble'"/>
@@ -84,14 +84,15 @@
'Security: Bind No Pwd: Enable Binds With No Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/bind_no_pwd/enable_bind_no_pwd.ldif' % logsRemoteDataDir }
+ <call function="'modifyGlobal'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attributeName' : 'bind-with-dn-requires-password' ,
+ 'attributeValue' : 'false' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -108,7 +109,7 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % logsRemoteDataDir }
</call>
@@ -129,7 +130,7 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
</call>
@@ -150,12 +151,11 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=tmason, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
</call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -172,7 +172,7 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=Anybody, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
</call>
@@ -189,15 +189,15 @@
'Security: Bind No Pwd: Reset - Step 1. Reset Configuration'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/bind_no_pwd/disable_bind_no_pwd.ldif' % logsRemoteDataDir }
+ <call function="'modifyGlobal'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attributeName' : 'bind-with-dn-requires-password' ,
+ 'attributeValue' : 'true' }
</call>
-
-
+
<message>
'Security: Bind No Pwd: Reset - Step 2. Check Reset'
</message>
@@ -206,10 +206,10 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir,
- 'expectedRC' : 53 }
+ 'expectedRC' : 53 }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
index d095081..706274e 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
@@ -77,15 +77,18 @@
'Security: Deprecated Pwd Schemes: Preamble Step 2. User Change Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=tmason,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'squatted' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_depr_schemes.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=tmason,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'squatted' ,
+ 'DNToModify' : 'uid=tmason,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'squinted' ,
+ 'changetype' : 'replace' }
</call>
-
- <message>
+
+ <message>
'Security: Deprecating Pwd Schemes: Preamble Step 3. Checking for MD5 Scheme Before Deprecating'
</message>
@@ -96,7 +99,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmason,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -135,26 +138,31 @@
'Security: Deprecated Pwd Schemes: Admin Deprecating MD5 Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_depr_MD5.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'deprecated-password-storage-scheme' ,
+ 'attributeValue' : 'MD5' }
</call>
-
+
<message>
'Security: Deprecated Pwd Schemes: Admin Removing MD5 Scheme From Default'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_delete_MD5.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'cn=Default Password Policy,cn=Password Policies,cn=config' ,
+ 'attributeName' : 'ds-cfg-default-password-storage-scheme' ,
+ 'newAttributeValue' : 'MD5' ,
+ 'changetype' : 'delete' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -224,7 +232,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmason,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -269,7 +277,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmason,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -313,7 +321,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmason,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -350,14 +358,16 @@
'Security: Deprecating Pwd Schemes: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index c35b218..2de5db0 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -102,7 +102,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'cn=Default Password Policy,cn=Password Policies,cn=config' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-cfg-default-password-storage-scheme' }
+ 'attributes' : 'ds-cfg-default-password-storage-scheme' }
</call>
<script>
@@ -192,14 +192,17 @@
'Security: Multiple Pwd Schemes: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'oranges' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_mult_schemes.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'oranges' ,
+ 'DNToModify' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'manyoranges' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Multiple Pwd Schemes: User Binding With New Password'
</message>
@@ -209,7 +212,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'manyoranges' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -226,7 +229,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -276,7 +279,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -313,15 +316,18 @@
'Security: Multiple Pwd Schemes: User Improperly Add Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'manyoranges' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_add_pwd.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'manyoranges' ,
+ 'DNToModify' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'anotherorange' ,
+ 'changetype' : 'add' ,
+ 'expectedRC' : 53 }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -346,14 +352,16 @@
'Security: Mult Pwd Schemes: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<message>
'Security: Multiple Pwd Schemes: User Bind Final'
</message>
@@ -363,7 +371,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'manyoranges' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 803295b..5c3470e 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage BASE64: Preamble - Admin Changing to BASE64 Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_BASE64.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'BASE64' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -98,14 +100,17 @@
'Security: Pwd Storage BASE64: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=jwallace,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'linear' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_BASE64.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=jwallace,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'linear' ,
+ 'DNToModify' : 'uid=jwallace,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'BASE64linear' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage BASE64: User Binding With New Password'
</message>
@@ -115,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jwallace,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'BASE64linear' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -131,7 +136,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jwallace,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -169,14 +174,16 @@
'Security: Pwd Storage BASE64: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index e740eaf..e4ee0ab 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage CLEAR: Preamble - Admin Changing to CLEAR Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_CLEAR.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'CLEAR' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -97,15 +99,17 @@
'Security: Pwd Storage CLEAR: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=jwalker,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'dogleg' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_CLEAR.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=jwalker,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'dogleg' ,
+ 'DNToModify' : 'uid=jwalker,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'CLEARdogleg' ,
+ 'changetype' : 'replace' }
</call>
-
-
+
<message>
'Security: Pwd Storage CLEAR: User Binding With New Password'
</message>
@@ -115,7 +119,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jwalker,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'CLEARdogleg' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -131,7 +135,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jwalker,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -173,7 +177,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jwalker,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -211,14 +215,16 @@
'Security: Pwd Storage CLEAR: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index e5460a2..12b7315 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage MD5: Preamble - Admin Changing to MD5 Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_MD5.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'MD5' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -98,14 +100,17 @@
'Security: Pwd Storage MD5: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=kwinters,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'forsook' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_MD5.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=kwinters,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'forsook' ,
+ 'DNToModify' : 'uid=kwinters,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'MD5forsook' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage MD5: User Binding With New Password'
</message>
@@ -115,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=kwinters,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'MD5forsook' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -131,7 +136,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=kwinters,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -169,14 +174,16 @@
'Security: Pwd Storage MD5: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index 5105e5b..99c4872 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage SHA: Preamble - Admin Changing to SHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_SHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -98,14 +100,17 @@
'Security: Pwd Storage SHA: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=tmorris,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'irrefutable' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=tmorris,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'irrefutable' ,
+ 'DNToModify' : 'uid=tmorris,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'SHAirrefutable' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage SHA: User Binding With New Password'
</message>
@@ -115,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=tmorris,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'SHAirrefutable' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -131,7 +136,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmorris,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -169,14 +174,16 @@
'Security: Pwd Storage SHA: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index 570029d..ea48b1d 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage SMD5: Preamble - Admin Changing to SMD5 Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_SMD5.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SMD5' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -98,14 +100,17 @@
'Security: Pwd Storage SMD5: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=trigden,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'sensitive' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SMD5.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=trigden,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'sensitive' ,
+ 'DNToModify' : 'uid=trigden,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'SMD5sensitive' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage SMD5: User Binding With New Password'
</message>
@@ -169,14 +174,16 @@
'Security: Pwd Storage SMD5: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index 9271f1a..e60f422 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -62,11 +62,11 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-default-password-storage-scheme:SSHA',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-default-password-storage-scheme:SSHA',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -103,7 +103,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -144,14 +144,17 @@
'Security: Pwd Storage SSHA: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'sprain' ,
+ 'DNToModify' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'SSHAsprain' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage SSHA: User Binding With New Password'
</message>
@@ -161,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'SSHAsprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -177,7 +180,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -214,15 +217,26 @@
'Security: Pwd Storage SSHA: Admin Changing to Unsupported Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_BAD.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'BAD' ,
+ 'expectedRC' : 1 }
</call>
-
+
+ <script>
+ returnString = STAXReason[0][1]
+ </script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'error code 53' }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index de0dc3f..357f1eb 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage SSHA256: Preamble - Admin Changing to SSHA256 Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_SSHA256.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA256' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -97,14 +99,17 @@
'Security: Pwd Storage SSHA256: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=kvaughan,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'bribery' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA256.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=kvaughan,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'bribery' ,
+ 'DNToModify' : 'uid=kvaughan,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'SSHA256bribery' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage SSHA256: User Binding With New Password'
</message>
@@ -114,7 +119,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=kvaughan,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'SSHA256bribery' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -130,7 +135,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=kvaughan,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -168,14 +173,16 @@
'Security: Pwd Storage SSHA256: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index 18afc38..93d407c 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage SSHA384: Preamble - Admin Changing to SSHA384 Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_SSHA384.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA384' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -97,14 +99,17 @@
'Security: Pwd Storage SSHA384: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'gosling' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA384.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'gosling' ,
+ 'DNToModify' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'SSHA384gosling' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage SSHA384: User Binding With New Password'
</message>
@@ -114,7 +119,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'SSHA384gosling' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -130,7 +135,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -168,14 +173,16 @@
'Security: Pwd Storage SSHA384: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index ef65e17..ecbe4b4 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -60,14 +60,16 @@
'Security: Pwd Storage SSHA512: Preamble - Admin Changing to SSHA512 Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_SSHA512.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA512' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -98,14 +100,17 @@
'Security: Pwd Storage SSHA512: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'ruling' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA512.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ruling' ,
+ 'DNToModify' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'SSHA512ruling' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Storage SSHA512: User Binding With New Password'
</message>
@@ -115,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'SSHA512ruling' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -131,7 +136,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'userpassword' }
+ 'attributes' : 'userpassword' }
</call>
<script>
@@ -169,14 +174,16 @@
'Security: Pwd Storage SSHA512: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme' ,
+ 'attributeValue' : 'SSHA' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml b/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
index 55cc0b5..cb716ad 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
@@ -37,6 +37,7 @@
<testcase name="'Security: Pwd Length Min: Preamble Setup'">
<sequence>
<call function="'testCase_Preamble'"/>
+
<message>
'Security: Pwd Length Min: Preamble Step 1. Checking existence of ds-cfg-minimum-password-length'
</message>
@@ -55,14 +56,16 @@
'Security: Pwd Length Min: Preamble Step 2. Admin Enabling Pwd Length Validator'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_enable_pwd_length_validator.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'password-validator-dn' ,
+ 'attributeValue' : 'cn=Length-Based Password Validator,cn=Password Validators,cn=config' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -75,16 +78,19 @@
<message>
'Security: Pwd Length Min: Pwd Too Short 1 Step 1. User Changing Password'
</message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'oranges' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'oranges' ,
+ 'DNToModify' : 'uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'grape' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 53 }
</call>
-
+
<!--- User Search With Password -->
<message>
'Security: Pwd Length Min: Pwd Too Short 1 Step 2. User Searching With Password'
@@ -95,7 +101,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'grape' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 49 }
@@ -114,14 +120,18 @@
'Security: Pwd Length Min: Admin Changing Minimum Pwd Length'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_change_min_pwd_length.ldif' % logsRemoteDataDir }
+ <call function="'dsconfigSet'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'objectName' : 'password-validator' ,
+ 'propertyType' : 'validator' ,
+ 'propertyName' : 'Length-Based Password Validator' ,
+ 'attributeName' : 'minimum-password-length' ,
+ 'attributeValue' : '4' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -135,15 +145,18 @@
'Security: Pwd Length Min: Pwd Too Short 2 Step 1. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'oranges' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short2.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'oranges' ,
+ 'DNToModify' : 'uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'goo' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 53 }
</call>
-
+
<!--- User Search With Password -->
<message>
'Security: Pwd Length Min: Pwd Too Short 2 Step 2. User Searching With Password'
@@ -154,7 +167,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'goo' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -173,15 +186,17 @@
'Security: Pwd Length Min: User Change Pwd Step 1. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'oranges' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'oranges' ,
+ 'DNToModify' : 'uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'grape' ,
+ 'changetype' : 'replace' }
</call>
-
-
+
<!--- User Search With Password -->
<message>
'Security: Pwd Length Min: User Change Pwd Step 2. User Searching With Password'
@@ -192,7 +207,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'grape' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -210,14 +225,18 @@
'Security: Pwd Length Min: Postamble - Admin Resetting Minimum Pwd Length'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_reset_min_pwd_length.ldif' % logsRemoteDataDir }
+ <call function="'dsconfigSet'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'objectName' : 'password-validator' ,
+ 'propertyType' : 'validator' ,
+ 'propertyName' : 'Length-Based Password Validator' ,
+ 'attributeName' : 'minimum-password-length' ,
+ 'attributeValue' : '6' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -239,20 +258,23 @@
'entryToBeCompared' : 'cn=Length-Based Password Validator,cn=Password Validators,cn=config' }
</call>
-
<!--- Admin Change Maximum Pwd Length -->
<message>
'Security: Pwd Length Max: Preamble Step 2. Admin Changing Maximum Pwd Length'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_change_max_pwd_length.ldif' % logsRemoteDataDir }
+ <call function="'dsconfigSet'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'objectName' : 'password-validator' ,
+ 'propertyType' : 'validator' ,
+ 'propertyName' : 'Length-Based Password Validator' ,
+ 'attributeName' : 'maximum-password-length' ,
+ 'attributeValue' : '10' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -266,15 +288,18 @@
'Security: Pwd Length Max: Pwd Too Long 1 Step 1. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'grape' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_long.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'grape' ,
+ 'DNToModify' : 'uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'pomegranates' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 53 }
</call>
-
+
<!--- User Search With Password -->
<message>
'Security: Pwd Length Max: Pwd Too Long 1 Step 2. User Searching With Password'
@@ -285,7 +310,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pomegranates' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -304,14 +329,17 @@
'Security: Pwd Length Max: User Change Password Step 1. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'grape' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_long2.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'grape' ,
+ 'DNToModify' : 'uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'grapefruit' ,
+ 'changetype' : 'replace' }
</call>
-
+
<!--- User Search With Password -->
<message>
'Security: Pwd Length Max: User Change Password Step 2. User Searching With Password'
@@ -322,7 +350,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'grapefruit' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -340,26 +368,46 @@
'Security: Pwd Length Max: Postamble Step 1. Admin Resetting Maximum Pwd Length'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_reset_max_pwd_length.ldif' % logsRemoteDataDir }
+ <call function="'dsconfigSet'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'objectName' : 'password-validator' ,
+ 'propertyType' : 'validator' ,
+ 'propertyName' : 'Length-Based Password Validator' ,
+ 'attributeName' : 'maximum-password-length' ,
+ 'attributeValue' : '0' }
</call>
-
-
+
<!--- User Change Password -->
<message>
'Security: Pwd Length Max: Postamble Step 2. User Changing Password'
</message>
- <call function="'modifyEntry'">
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'grapefruit' ,
+ 'DNToModify' : 'uid=bhall, ou=People, ou=password tests, o=Pwd Validator Tests, dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'pomegranates' ,
+ 'changetype' : 'replace' }
+ </call>
+
+ <message>
+ 'Security: Pwd Length Max: User Change Password Step 2. User Searching With Password'
+ </message>
+
+ <call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'grapefruit' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_long.ldif' % logsRemoteDataDir }
+ 'dsInstancePswd' : 'pomegranates' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
index aaee337..a2077d2 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
@@ -39,33 +39,21 @@
<call function="'testCase_Preamble'"/>
- <!--- Add Sales Admin -->
- <message>
- 'Security: Root User Bypass Valid: Preamble - Step 1. Add Sales Admin'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/pwd_validator/add_sales_admin.ldif' % logsRemoteDataDir }
- </call>
-
-
<!--- Admin Enable Pwd Length Validator -->
<message>
- 'Security: Root User Bypass Valid: Preamble - Step 2. Admin Enabling Pwd Length Validator On Root Users'
+ 'Security: Root User Bypass Valid: Preamble - Step 1. Admin Enabling Pwd Length Validator On Root Users'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_enable_pwd_length_validator.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'password-validator-dn' ,
+ 'attributeValue' : 'cn=Length-Based Password Validator,cn=Password Validators,cn=config' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -75,21 +63,24 @@
<testcase name="'Security: Root User Bypass Valid: No Bypass'">
<sequence>
<call function="'testCase_Preamble'"/>
- <message>
+ <message>
'Security: Root User Bypass Valid: No Bypass - Step 1. Root Changing Password - Too Short'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'cn=Sales Admin,cn=Root DNs,cn=config' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'grape' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 53 }
</call>
-
- <!--- Root Search With Password -->
- <message>
+
+ <!--- Root Search With Password -->
+ <message>
'Security: Root User Bypass Valid: No Bypass - Step 2. Root Searching With Password'
</message>
@@ -117,27 +108,32 @@
'Security: Root User Bypass Valid: Bypass Enabled 1 - Step 1. Admin Enabling Bypass For Pwd Validator'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'skip-validation-for-administrators' ,
+ 'attributeValue' : 'true' }
</call>
-
- <message>
+
+ <message>
'Security: Root User Bypass Valid: Bypass Enabled 1 - Step 2. Root Changing Password - Too Short'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'cn=Sales Admin,cn=Root DNs,cn=config' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'grape' ,
+ 'changetype' : 'replace' }
</call>
-
- <!--- Root Search With Password -->
+
+ <!--- Root Search With Password -->
<message>
'Security: Root User Bypass Valid: Bypass Enabled 1 - Step 3. Root Searching With Password'
</message>
@@ -165,28 +161,34 @@
'Security: Root User Bypass Valid: Bypass Enabled 2 - Step 1. Admin Changing Minimum Pwd Length'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_change_min_pwd_length.ldif' % logsRemoteDataDir }
+ <call function="'dsconfigSet'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'objectName' : 'password-validator' ,
+ 'propertyType' : 'validator' ,
+ 'propertyName' : 'Length-Based Password Validator' ,
+ 'attributeName' : 'minimum-password-length' ,
+ 'attributeValue' : '4' }
</call>
-
-
+
<!--- User Change Password - Too Short-->
<message>
'Security: Root User Bypass Valid: Bypass Enabled 2 - Step 2. Root Changing Password - Too Short'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short2.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'cn=Sales Admin,cn=Root DNs,cn=config' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'goo' ,
+ 'changetype' : 'replace' }
</call>
-
+
<!--- Root Search With Password -->
<message>
'Security: Root User Bypass Valid: Bypass Enabled 2 - Step 3. Root Searching With Password'
@@ -197,7 +199,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Sales Admin' ,
'dsInstancePswd' : 'goo' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -218,15 +220,18 @@
'Security: Root User Bypass Valid: Self-Change Pwd - Step 1. Root Changing Password - Too Short'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'cn=Sales Admin' ,
- 'dsInstancePswd' : 'goo' ,
- 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short3.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'cn=Sales Admin' ,
+ 'dsInstancePswd' : 'goo' ,
+ 'DNToModify' : 'cn=Sales Admin,cn=Root DNs,cn=config' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'gaa' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 53 }
</call>
-
+
<!--- Root Search With Password -->
<message>
'Security: Root User Bypass Valid: Self-Change Pwd - Step 2. Root Searching With Password'
@@ -237,7 +242,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Sales Admin' ,
'dsInstancePswd' : 'gaa' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -254,46 +259,39 @@
<call function="'testCase_Preamble'"/>
- <!--- Root Reset Password-->
- <message>
- 'Security: Root User Bypass Valid: Postamble - Step 1. Delete Sales Admin'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/delete_sales_admin.ldif' % logsRemoteDataDir }
- </call>
-
<!--- Root Search With Original Password -->
<message>
- 'Security: Root User Bypass Valid: Postamble - Step 2. Admin Disabling Bypass For Pwd Validator'
+ 'Security: Root User Bypass Valid: Postamble - Step 1. Admin Disabling Bypass For Pwd Validator'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'skip-validation-for-administrators' ,
+ 'attributeValue' : 'false' }
</call>
-
- <message>
- 'Security: Root User Bypass Valid: Postamble - Step 3. Admin Resetting Minimum Pwd Length'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/admin_reset_min_pwd_length.ldif' % logsRemoteDataDir }
- </call>
-
+
<message>
- 'Security: Root User Bypass Valid: Postamble - Step 4. Admin Disabling Pwd Length Validator On Root Users'
+ 'Security: Root User Bypass Valid: Postamble - Step 2. Admin Resetting Minimum Pwd Length'
+ </message>
+
+ <call function="'dsconfigSet'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'objectName' : 'password-validator' ,
+ 'propertyType' : 'validator' ,
+ 'propertyName' : 'Length-Based Password Validator' ,
+ 'attributeName' : 'minimum-password-length' ,
+ 'attributeValue' : '6' }
+ </call>
+ <!--
+ <message>
+ 'Security: Root User Bypass Valid: Postamble - Step 3. Admin Disabling Pwd Length Validator On Root Users'
</message>
<call function="'modifyEntry'">
@@ -303,7 +301,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeModified' : '%s/security/pwd_validator/admin_disable_pwd_length_validator.ldif' % logsRemoteDataDir }
</call>
-
+ -->
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0