Deprecate using osixia/openldap and setup test configuration using our own alpine/ldap container

tests/server/openldap/bases/21-example.com.ldif

@@ -1,6 +1,7 @@
 dn: olcDatabase=mdb,cn=config
-changetype: add
 objectClass: olcDatabaseConfig
+objectClass: olcMdbConfig
+olcDbDirectory: /var/lib/openldap/data
 olcDatabase: mdb
 olcLastMod: TRUE
 olcMonitoring: TRUE

tests/server/openldap/bases/22-example_com.ldif

@@ -1,6 +1,7 @@
 dn: olcDatabase=mdb,cn=config
-changetype: add
 objectClass: olcDatabaseConfig
+objectClass: olcMdbConfig
+olcDbDirectory: /var/lib/openldap/data
 olcDatabase: mdb
 olcLastMod: TRUE
 olcMonitoring: TRUE

tests/server/openldap/bases/23-flintstones.ldif

@@ -1,6 +1,7 @@
 dn: olcDatabase=mdb,cn=config
-changetype: add
 objectClass: olcDatabaseConfig
+objectClass: olcMdbConfig
+olcDbDirectory: /var/lib/openldap/data
 olcDatabase: mdb
 olcLastMod: TRUE
 olcMonitoring: TRUE

tests/server/openldap/bases/24-simpsons.ldif

@@ -1,6 +1,7 @@
 dn: olcDatabase=mdb,cn=config
-changetype: add
 objectClass: olcDatabaseConfig
+objectClass: olcMdbConfig
+olcDbDirectory: /var/lib/openldap/data
 olcDatabase: mdb
 olcLastMod: TRUE
 olcMonitoring: TRUE

tests/server/openldap/bases/25-test.ldif

@@ -0,0 +1,12 @@
+dn: olcDatabase=mdb,cn=config
+objectClass: olcDatabaseConfig
+objectClass: olcMdbConfig
+olcDbDirectory: /var/lib/openldap/data
+olcDatabase: mdb
+olcLastMod: TRUE
+olcMonitoring: TRUE
+olcSuffix: dc=Test
+olcAccess: to dn.base="" by dn="cn=admin,dc=Test" write by * read
+olcAccess: to * by dn="cn=admin,dc=Test" write by dn="cn=admin,dc=Test" write by * read
+olcRootDN: cn=admin,dc=Test
+olcRootPW: {SSHA}UCTtlcHOSqGCFuKtOCJAU8k8icNpVGiw

tests/server/openldap/bootstrap/uidpool.schema

@@ -1,11 +0,0 @@
-##
-## Used for storing the next gid and next uid in the the directory
-##
-objectclass ( 1.3.6.1.4.1.7165.1.2.2.3 NAME 'uidPool' SUP top AUXILIARY
-       DESC 'Pool for allocating UNIX uids'
-       MUST ( uidNumber $ cn ) )
-
-
-objectclass ( 1.3.6.1.4.1.7165.1.2.2.4 NAME 'gidPool' SUP top AUXILIARY
-       DESC 'Pool for allocating UNIX gids'
-       MUST ( gidNumber $ cn ) )

tests/server/openldap/data/01-au.ldif

@@ -0,0 +1,4 @@
+# Base DN
+dn: c=AU
+c: AU
+objectclass: country

tests/server/openldap/data/03-example.com.ldif

@@ -1,11 +1,4 @@
 # LDIF Export for dc=example,dc=com
-# Server: C5: OpenLDAP 2.3.27: config (c5dev.leenooks.vpn)
-# Search Scope: sub
-# Search Filter: (objectClass=*)
-# Total Entries: 15
-#
-# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on April 26, 2011 9:25 pm
-# Version: 1.2.0.5
 
 #version: 1
 
@@ -146,3 +139,64 @@ c: US
 description: United States of America
 objectclass: country
 objectclass: top
+
+# Entry 16: c=JP,dc=example,dc=com
+dn: c=JP,dc=example,dc=com
+c: JP
+description: Japan
+description;lang-jp: 日本
+objectclass: country
+objectclass: top
+
+#
+dn:: b3U95Za25qWt6YOoLGM9SlAsZGM9ZXhhbXBsZSxkYz1jb20=
+# dn:: ou=<JapaneseOU>,c=JP
+objectclass: top
+objectclass: organizationalUnit
+ou:: 5Za25qWt6YOo
+# ou:: <JapaneseOU>
+ou;lang-ja:: 5Za25qWt6YOo
+# ou;lang-ja:: <JapaneseOU>
+#ou;lang-ja;x-phonetic:: 44GI44GE44GO44KH44GG44G2
+# ou;lang-ja:: <JapaneseOU_in_phonetic_representation>
+ou;lang-en: Sales
+description: Japanese office
+
+#
+dn:: dWlkPXJvZ2FzYXdhcmEsb3U95Za25qWt6YOoLGM9SlAsZGM9ZXhhbXBsZSxkYz1jb20=
+# dn:: uid=<uid>,ou=<JapaneseOU>,c=JP
+userpassword: {SHA}O3HSv1MusyL4kTjP+HKI5uxuNoM=
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+uid: rogasawara
+mail: rogasawara@airius.co.jp
+givenname;lang-ja:: 44Ot44OJ44OL44O8
+# givenname;lang-ja:: <JapaneseGivenname>
+sn;lang-ja:: 5bCP56yg5Y6f
+# sn;lang-ja:: <JapaneseSn>
+cn;lang-ja:: 5bCP56yg5Y6fIOODreODieODi+ODvA==
+# cn;lang-ja:: <JapaneseCn>
+title;lang-ja:: 5Za25qWt6YOoIOmDqOmVtw==
+# title;lang-ja:: <JapaneseTitle>
+preferredlanguage: ja
+givenname:: 44Ot44OJ44OL44O8
+# givenname:: <JapaneseGivenname>
+sn:: 5bCP56yg5Y6f
+# sn:: <JapaneseSn>
+cn:: 5bCP56yg5Y6fIOODreODieODi+ODvA==
+# cn:: <JapaneseCn>
+title:: 5Za25qWt6YOoIOmDqOmVtw==
+# title:: <JapaneseTitle>
+#givenname;lang-ja;x-phonetic:: 44KN44Gp44Gr44O8
+# givenname;lang-ja;x-phonetic:: <JapaneseGivenname_in_phonetic_representation_kana>
+#sn;lang-ja;x-phonetic:: 44GK44GM44GV44KP44KJ
+# sn;lang-ja;x-phonetic:: <JapaneseSn_in_phonetic_representation_kana>
+#cn;lang-ja;x-phonetic:: 44GK44GM44GV44KP44KJIOOCjeOBqeOBq+ODvA==
+# cn;lang-ja;x-phonetic:: <JapaneseCn_in_phonetic_representation_kana>
+#title;lang-ja;x-phonetic:: 44GI44GE44GO44KH44GG44G2IOOBtuOBoeOCh+OBhg==
+# title;lang-ja;x-phonetic:: <JapaneseTitle_in_phonetic_representation_kana>
+givenname;lang-en: Rodney
+sn;lang-en: Ogasawara
+cn;lang-en: Rodney Ogasawara

tests/server/openldap/data/04-example_com.ldif

@@ -1,11 +1,4 @@
 # LDIF Export for dc=example.com
-# Server: C5: OpenLDAP 2.3.27: config (c5dev.leenooks.vpn)
-# Search Scope: sub
-# Search Filter: (objectClass=*)
-# Total Entries: 23
-#
-# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on April 26, 2011 9:13 pm
-# Version: 1.2.0.5
 
 #version: 1
 

tests/server/openldap/data/05-flintstones.ldif

@@ -1,11 +1,4 @@
 # LDIF Export for o=Flintstones
-# Server: C5: OpenLDAP 2.3.27: config (c5dev.leenooks.vpn)
-# Search Scope: sub
-# Search Filter: (objectClass=*)
-# Total Entries: 12
-#
-# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on April 26, 2011 9:03 pm
-# Version: 1.2.0.5
 
 #version: 1
 

tests/server/openldap/data/06-simpsons.ldif

@@ -1,11 +1,4 @@
 # LDIF Export for o=Simpsons
-# Server: C5: OpenLDAP 2.3.27: config (c5dev.leenooks.vpn)
-# Search Scope: sub
-# Search Filter: (objectClass=*)
-# Total Entries: 11
-#
-# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on April 26, 2011 9:05 pm
-# Version: 1.2.0.5
 
 #version: 1
 

tests/server/openldap/data/07-test-01.ldif

@@ -1,135 +1,135 @@
-# LDIF Export for o=Test
+# LDIF Export for dc=Test
 
 #version: 1
 
-dn: o=Test
+#dn: dc=Test
-o: Test
+#o: Test
-objectclass: organization
+#objectclass: organization
 
-dn: cn=user,o=Test
+dn: cn=user,dc=Test
 cn: user
 sn: Doe
 objectclass: inetOrgPerson
 objectclass: top
 
-dn: ou=Bad DNs,o=Test
+dn: ou=Bad DNs,dc=Test
 objectclass: organizationalUnit
 ou: Bad DNs
 
-#dn: c=double plus ++,ou=Bad DNs,o=Test
+#dn: c=double plus ++,ou=Bad DNs,dc=Test
 #c: double plus ++
 #objectclass: country
 
-#dn: c=end dollar$,ou=Bad DNs,o=Test
+#dn: c=end dollar$,ou=Bad DNs,dc=Test
 #c: end dollar$
 #objectclass: country
 
-dn: sn=sign@at+uid=multi-mixed,ou=Bad DNs,o=Test
+dn: sn=sign@at+uid=multi-mixed,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: sign@at
 uid: multi-mixed
 
-dn: uid=angle\3Cleft,ou=Bad DNs,o=Test
+dn: uid=angle\3Cleft,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: angle<left
 
-dn: uid=angle\3Eright,ou=Bad DNs,o=Test
+dn: uid=angle\3Eright,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: angle>right
 
-dn: uid=brace(left,ou=Bad DNs,o=Test
+dn: uid=brace(left,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: brace(left
 
-dn: uid=brace)right,ou=Bad DNs,o=Test
+dn: uid=brace)right,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: brace)right
 
-dn: uid=colon:full,ou=Bad DNs,o=Test
+dn: uid=colon:full,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: colon:full
 
-dn: uid=colon\3Bsemi,ou=Bad DNs,o=Test
+dn: uid=colon\3Bsemi,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: colon;semi
 
-#dn: uid=multi+uid=sign@at,ou=Bad DNs,o=Test
+#dn: uid=multi+uid=sign@at,ou=Bad DNs,dc=Test
 #cn: Test
 #objectclass: inetOrgPerson
 #sn: Test
 #uid: multi
 #uid: sign@at
 
-#dn: uid=multi+uid=value,ou=Bad DNs,o=Test
+#dn: uid=multi+uid=value,ou=Bad DNs,dc=Test
 #cn: Test
 #objectclass: inetOrgPerson
 #sn: Test
 #uid: multi
 #uid: value
 
-dn: uid=quote\22double,ou=Bad DNs,o=Test
+dn: uid=quote\22double,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: quote"double
 
-dn: uid=quote'single,ou=Bad DNs,o=Test
+dn: uid=quote'single,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: quote'single
 
-dn: uid=sign%percent,ou=Bad DNs,o=Test
+dn: uid=sign%percent,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: sign%percent
 
-dn: uid=sign\2Bplus,ou=Bad DNs,o=Test
+dn: uid=sign\2Bplus,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: sign+plus
 
-dn: uid=sign\2Ccomma,ou=Bad DNs,o=Test
+dn: uid=sign\2Ccomma,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: sign,comma
 
-dn: uid=sign\3Bsemicolon@at,ou=Bad DNs,o=Test
+dn: uid=sign\3Bsemicolon@at,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: sign;semicolon@at
 
-dn: uid=sign\3Dequal,ou=Bad DNs,o=Test
+dn: uid=sign\3Dequal,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: sign=equal
 
-dn: uid=sign?question,ou=Bad DNs,o=Test
+dn: uid=sign?question,ou=Bad DNs,dc=Test
 cn: Test
 objectclass: inetOrgPerson
 sn: Test
 uid: sign?question
 
-dn: uid=sign@at,ou=Bad DNs,o=Test
+#dn: uid=sign@at,ou=Bad DNs,dc=Test
-cn: Test
+#cn: Test
-objectclass: inetOrgPerson
+#objectclass: inetOrgPerson
-sn: Test
+#sn: Test
-uid: sign@at
+#uid: sign@at

tests/server/openldap/data/07-test-il8n.ldif

@@ -1,18 +1,18 @@
 # This is a Test-File for characters / encoding
 # 1. Change the
-#      ,o=Test
+#      ,dc=Test
 #    to avalue for your organisation
 # 2. Import it with phpldapadmin
 #
 # pla-i18n, example.com
 #
-dn: ou=pla-i18n,o=Test
+dn: ou=pla-i18n,dc=Test
 ou: pla-i18n
 objectClass: top
 objectClass: organizationalUnit
 
 # pl, pla-i18n, example.com
-dn: ou=pl,ou=pla-i18n,o=Test
+dn: ou=pl,ou=pla-i18n,dc=Test
 description:: IGRvcMOza2k=
 description:: xITFu8WaxbnEhsWDxYHDk8SYIMSFxbzFm8W6xIfFhMWCw7PEmQ==
 description:: V3NrYXrDs3drYQ==
@@ -21,7 +21,7 @@ objectClass: organizationalUnit
 ou: pl
 
 # ru, pla-i18n, example.com
-dn: ou=ru,ou=pla-i18n,o=Test
+dn: ou=ru,ou=pla-i18n,dc=Test
 description:: 0LfQstGD0YfQuNGCINC/0L7QtNC+0LHQvdC+
 description:: 0J/RgNC+0YHRgtCw0Y8g0YTQvtGA0LzQsCDQv9C+0LjRgdC6
 objectClass: top
@@ -29,21 +29,21 @@ objectClass: organizationalUnit
 ou: ru
 
 # jp, pla-i18n, example.com
-dn: ou=jp,ou=pla-i18n,o=Test
+dn: ou=jp,ou=pla-i18n,dc=Test
 ou: jp
 objectClass: top
 objectClass: organizationalUnit
 description:: SVNPLTIwMjItSlDjga7lpJrlm73nsY3oqIDoqp7jgbjjga7mi6HlvLXmgKc=
 
 # pt-br, pla-i18n, example.com
-dn: ou=pt-br,ou=pla-i18n,o=Test
+dn: ou=pt-br,ou=pla-i18n,dc=Test
 ou: pt-br
 objectClass: top
 objectClass: organizationalUnit
 description:: VmVyIGFzIHJlcXVpc2nDp8O1ZXMgZW0gYWJlcnRv
 
 # de, pla-i18n, example.com
-dn: ou=de,ou=pla-i18n,o=Test
+dn: ou=de,ou=pla-i18n,dc=Test
 ou: de
 objectClass: top
 objectClass: organizationalUnit
@@ -51,7 +51,7 @@ description:: U29uZGVyemVpY2hlbiDDtsOkw7zDnyDDlsOEw5w=
 description:: w5bDliDDnMOcIMOEw4Q=
 
 # sv, pla-i18n, example.com
-dn: ou=sv,ou=pla-i18n,o=Test
+dn: ou=sv,ou=pla-i18n,dc=Test
 ou: sv
 objectClass: top
 objectClass: organizationalUnit
@@ -59,7 +59,7 @@ description:: U8O2a29tZsOlbmc=
 description:: bMOldGVyIHNvbQ==
 
 # ca, pla-i18n, example.com
-dn: ou=ca,ou=pla-i18n,o=Test
+dn: ou=ca,ou=pla-i18n,dc=Test
 ou: ca
 objectClass: top
 objectClass: organizationalUnit

tests/server/openldap/data/07-test.ldif

@@ -3,9 +3,9 @@
 #version: 1
 
 # This entry already exists as a result of configuring the LDAP server
-#dn: dc=Test
+dn: dc=Test
-#dc: Test
+dc: Test
-#objectclass: dNSDomain
+objectclass: dNSDomain
 
 dn: cn=AdminUser,dc=Test
 cn: Admin User

tests/server/openldap/schema/30-test.ldif

@@ -1,11 +0,0 @@
-dn: olcDatabase=mdb,cn=config
-changetype: add
-objectClass: olcDatabaseConfig
-olcDatabase: mdb
-olcLastMod: TRUE
-olcMonitoring: TRUE
-olcSuffix: o=Test
-olcAccess: to dn.base="" by dn="cn=admin,dc=Test" write by * read
-olcAccess: to * by dn="cn=admin,o=Test" write by dn="cn=admin,dc=Test" write by * read
-olcRootDN: cn=admin,o=Test
-olcRootPW: {SSHA}e8xGdXmL+mSD3u/389YHeM+dpqFCUSyq

tests/server/openldap/schema/add/30-sudorole.ldif

@@ -1,69 +1,61 @@
-attributetype ( 1.3.6.1.4.1.15953.9.1.1
+dn: cn=sudorole,cn=schema,cn=config
-  NAME 'sudoUser'
+objectClass: olcSchemaConfig
+cn: sudorole
+olcAttributeTypes: {0}( 1.3.6.1.4.1.15953.9.1.1 NAME 'sudoUser'
   DESC 'User(s) who may  run sudo'
   EQUALITY caseExactIA5Match
   SUBSTR caseExactIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
+olcAttributeTypes: {1}( 1.3.6.1.4.1.15953.9.1.2
-attributetype ( 1.3.6.1.4.1.15953.9.1.2
   NAME 'sudoHost'
   DESC 'Host(s) who may run sudo'
   EQUALITY caseExactIA5Match
   SUBSTR caseExactIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
+olcAttributeTypes: {2}( 1.3.6.1.4.1.15953.9.1.3
-attributetype ( 1.3.6.1.4.1.15953.9.1.3
   NAME 'sudoCommand'
   DESC 'Command(s) to be executed by sudo'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
+olcAttributeTypes: {3}( 1.3.6.1.4.1.15953.9.1.4
-attributetype ( 1.3.6.1.4.1.15953.9.1.4
   NAME 'sudoRunAs'
   DESC 'User(s) impersonated by sudo'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
+olcAttributeTypes: {4}( 1.3.6.1.4.1.15953.9.1.5
-attributetype ( 1.3.6.1.4.1.15953.9.1.5
   NAME 'sudoOption'
   DESC 'Options(s) followed by sudo'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
+olcAttributeTypes: {5}( 1.3.6.1.4.1.15953.9.1.6
-attributetype ( 1.3.6.1.4.1.15953.9.1.6
   NAME 'sudoRunAsUser'
   DESC 'User(s) impersonated by sudo'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
+olcAttributeTypes: {6}( 1.3.6.1.4.1.15953.9.1.7
-attributetype ( 1.3.6.1.4.1.15953.9.1.7
   NAME 'sudoRunAsGroup'
   DESC 'Group(s) impersonated by sudo'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
+olcAttributeTypes: {7}( 1.3.6.1.4.1.15953.9.1.8
-attributetype ( 1.3.6.1.4.1.15953.9.1.8
   NAME 'sudoNotBefore'
   DESC 'Start of time interval for which the entry is valid'
   EQUALITY generalizedTimeMatch
   ORDERING generalizedTimeOrderingMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
-
+olcAttributeTypes: {8}( 1.3.6.1.4.1.15953.9.1.9
-attributetype ( 1.3.6.1.4.1.15953.9.1.9
   NAME 'sudoNotAfter'
   DESC 'End of time interval for which the entry is valid'
   EQUALITY generalizedTimeMatch
   ORDERING generalizedTimeOrderingMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
-
+olcAttributeTypes: {9} ( 1.3.6.1.4.1.15953.9.1.10
-attributeTypes ( 1.3.6.1.4.1.15953.9.1.10
   NAME 'sudoOrder'
   DESC 'an integer to order the sudoRole entries'
   EQUALITY integerMatch
   ORDERING integerOrderingMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
+olcObjectClasses: {0} ( 1.3.6.1.4.1.15953.9.2.1 NAME 'sudoRole' SUP top STRUCTURAL
-objectclass ( 1.3.6.1.4.1.15953.9.2.1 NAME 'sudoRole' SUP top STRUCTURAL
   DESC 'Sudoer Entries'
   MUST ( cn )
   MAY ( sudoUser $ sudoHost $ sudoCommand $ sudoRunAs $ sudoRunAsUser $ sudoRunAsGroup $ sudoOption $ sudoNotBefore $ sudoNotAfter $ sudoOrder $ description ) )

tests/server/openldap/schema/add/30-uidpool.ldif

@@ -0,0 +1,12 @@
+##
+## Used for storing the next gid and next uid in the the directory
+##
+dn: cn=uidpool,cn=schema,cn=config
+objectClass: olcSchemaConfig
+cn: uidpool
+olcObjectClasses: {0}( 1.3.6.1.4.1.7165.1.2.2.3 NAME 'uidPool' SUP top AUXILIARY
+       DESC 'Pool for allocating UNIX uids'
+       MUST ( uidNumber $ cn ) )
+olcObjectClasses: {1}( 1.3.6.1.4.1.7165.1.2.2.4 NAME 'gidPool' SUP top AUXILIARY
+       DESC 'Pool for allocating UNIX gids'
+       MUST ( gidNumber $ cn ) )