mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 84679655 | patch | commit | show whitespace
Gary Williams
18.10.2011 04748be0fbba73ce2f47b9a153365065bab45067 
fix modify global aci in sasl tests
2 files modified
42 ■■■■■ changed files
opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml 39 ●●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/security/security.xml 3 ●●●●● patch | view | raw | blame | history 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml


@@ -24,6 +24,7 @@


 ! CDDL HEADER END


 !


 !      Copyright 2008-2009 Sun Microsystems, Inc.


 !      Portions Copyright 2011 ForgeRock AS


 ! -->


<stax>




@@ -943,15 +944,11 @@


               'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod equal sasl, delete global search ACI'


            </message>




            <script>


                    global_aci="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"


            </script>


               


            <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : global_aci ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


            </call>


            


@@ -1096,7 +1093,7 @@


              { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'               : global_aci ,


                'aciValue'               : GLOBAL_ACI_SEARCH ,


                'opType'                 : 'add'


              }


            </call>


@@ -1185,15 +1182,11 @@


              'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod equal simple, delete global search ACI'


            </message>




            <script>


              global_aci="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"


            </script>


                


            <call function="'modifyGlobalAci'">


              { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'               : global_aci ,


                'aciValue'               : GLOBAL_ACI_SEARCH ,


                'opType'                 : 'remove'


              }


            </call>


@@ -1340,7 +1333,7 @@


              { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'               : global_aci ,


                'aciValue'               : GLOBAL_ACI_SEARCH ,


                'opType'                 : 'add'


              }


            </call>


@@ -1429,15 +1422,11 @@


              'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod  not equals simple, delete global search ACI'


            </message>




            <script>


              global_aci="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"


            </script>


                


            <call function="'modifyGlobalAci'">


              { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'               : global_aci ,


                'aciValue'               : GLOBAL_ACI_SEARCH ,


                'opType'                 : 'remove'


              }


            </call>


@@ -1584,7 +1573,7 @@


              { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'               : global_aci ,


                'aciValue'               : GLOBAL_ACI_SEARCH ,


                'opType'                 : 'add'


              }


            </call>


@@ -1673,15 +1662,11 @@


              'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod equals none, delete global search ACI'


            </message>




            <script>


              global_aci="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"


            </script>


                


            <call function="'modifyGlobalAci'">


              { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'               : global_aci ,


                'aciValue'               : GLOBAL_ACI_SEARCH  ,


                'opType'                 : 'remove'


              }


            </call>


@@ -1830,7 +1815,7 @@


              { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'               : global_aci ,


                'aciValue'               : GLOBAL_ACI_SEARCH ,


                'opType'                 : 'add'


              }


            </call>


@@ -3371,15 +3356,11 @@


              'Delete global search ACI'


            </message>




            <script>


              global_aci="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"


            </script>


                


            <call function="'modifyGlobalAci'">


              { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,


                'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,


                'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,


                'aciValue'       : global_aci ,


                'aciValue'       : GLOBAL_ACI_SEARCH ,


                'opType'         : 'remove'


              }


            </call>




 opends/tests/staf-tests/functional-tests/testcases/security/security.xml


@@ -24,6 +24,7 @@


 ! CDDL HEADER END


 !


 !      Copyright 2006-2009 Sun Microsystems, Inc.


 !      Portions Copyright 2011 ForgeRock AS


 ! -->


<stax>


  <defaultcall function="main_security" />


@@ -45,6 +46,8 @@


            <script>


              CurrentTestPath['group']='security'


              _group=CurrentTestPath['group']




              GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||targetUniqueID||changeInitiatorsName||changeLogCookie\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"


            </script>


            <call function="'testGroup_Preamble'" />


            <script>