sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

Add a blackbox test for the provision-backend script.

Browse Source 
This test (as most tests do :-) found a few bugs, also fixed in this
commit.

Andrew Bartlett
(This used to be commit d96a6482da)
This commit is contained in:
Andrew Bartlett
2008-06-19 11:05:20 +10:00
parent 221b69af84
commit 9ea25cacf1
3 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
source4/scripting/python/samba/provision.py
View File

@ -1150,15 +1150,18 @@ def provision_backend(setup_dir=None, message=None,
if root is None: if root is None:
root = findnss(pwd.getpwnam, ["root"])[0] root = findnss(pwd.getpwnam, ["root"])[0]
if smbconf is None: if adminpass is None:
etcdir = os.path.join(targetdir, "etc") adminpass = misc.random_password(12)
os.makedirs(etcdir)
smbconf = os.path.join(etcdir, "smb.conf") if targetdir is not None:
if (not os.path.exists(os.path.join(targetdir, "etc"))):
os.makedirs(os.path.join(targetdir, "etc"))
smbconf = os.path.join(targetdir, "etc", "smb.conf")
# only install a new smb.conf if there isn't one there already # only install a new smb.conf if there isn't one there already
if not os.path.exists(smbconf): if not os.path.exists(smbconf):
make_smbconf(smbconf, setup_path, hostname, domain, realm, make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
serverrole, targetdir) targetdir)
lp = param.LoadParm() lp = param.LoadParm()
lp.load(smbconf) lp.load(smbconf)
@ -1230,11 +1233,11 @@ def provision_backend(setup_dir=None, message=None,
elif ldap_backend_type == "openldap": elif ldap_backend_type == "openldap":
attrs = ["linkID", "lDAPDisplayName"] attrs = ["linkID", "lDAPDisplayName"]
res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs) res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs)
memberof_config = "# Generated from schema in %s\n" % schemadb_path memberof_config = "# Generated from schema in %s\n" % schemadb_path
refint_attributes = "" refint_attributes = ""
for i in range (0, len(res)): for i in range (0, len(res)):
expression = "(&(objectclass=attributeSchema)(linkID=%d))" % (int(res[i]["linkID"][0])+1) expression = "(&(objectclass=attributeSchema)(linkID=%d))" % (int(res[i]["linkID"][0])+1)
target = schemadb.searchone(basedn=names.schemadn, target = schemadb.searchone(basedn=names.schemadn,
expression=expression, expression=expression,
@ -1252,11 +1255,11 @@ memberof-dangling-error 32
""" """
memberof_config += """ memberof_config += """
overlay refint overlay refint
refint_attributes""" + refint_attributes + "\n" refint_attributes""" + refint_attributes + "\n"
setup_file(setup_path("slapd.conf"), paths.slapdconf, setup_file(setup_path("slapd.conf"), paths.slapdconf,
{"DNSDOMAIN": names.dnsdomain, {"DNSDOMAIN": names.dnsdomain,
"LDAPDIR": paths.ldapdir, "LDAPDIR": paths.ldapdir,
"DOMAINDN": names.domaindn, "DOMAINDN": names.domaindn,
@ -1265,27 +1268,27 @@ refint_attributes""" + refint_attributes + "\n"
"LDAPMANAGERDN": names.ldapmanagerdn, "LDAPMANAGERDN": names.ldapmanagerdn,
"LDAPMANAGERPASS": adminpass, "LDAPMANAGERPASS": adminpass,
"MEMBEROF_CONFIG": memberof_config}) "MEMBEROF_CONFIG": memberof_config})
setup_file(setup_path("modules.conf"), paths.modulesconf, setup_file(setup_path("modules.conf"), paths.modulesconf,
{"REALM": names.realm}) {"REALM": names.realm})
setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user"))) setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config"))) setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema"))) setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
mapping = "schema-map-openldap-2.3" mapping = "schema-map-openldap-2.3"
backend_schema = "backend-schema.schema" backend_schema = "backend-schema.schema"
ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="") ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
if ldap_backend_port is not None: if ldap_backend_port is not None:
server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
else: else:
server_port_string = "" server_port_string = ""
slapdcommand="Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string slapdcommand="Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema) schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
os.system(schema_command) os.system(schema_command)
message("Your %s Backend for Samba4 is now configured, and is ready to be started" % ldap_backend_type) message("Your %s Backend for Samba4 is now configured, and is ready to be started" % ldap_backend_type)
message("Server Role: %s" % serverrole) message("Server Role: %s" % serverrole)
message("Hostname: %s" % names.hostname) message("Hostname: %s" % names.hostname)

1
source4/selftest/samba4_tests.sh
View File

@ -358,5 +358,6 @@ plantest "blackbox.upgrade" none $PYTHON setup/upgrade $CONFIGURATION --targetdi
rm -rf $PREFIX/provision rm -rf $PREFIX/provision
mkdir $PREFIX/provision mkdir $PREFIX/provision
plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision" plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision"
plantest "blackbox.provision-backend.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision-backend.sh "$PREFIX/provision"
plantest "blackbox.setpassword.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_setpassword.sh "$PREFIX/provision" plantest "blackbox.setpassword.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_setpassword.sh "$PREFIX/provision"
plantest "blackbox.newuser.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_newuser.sh "$PREFIX/provision" plantest "blackbox.newuser.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_newuser.sh "$PREFIX/provision"

25
source4/setup/tests/blackbox_provision-backend.sh Executable file
View File

@ -0,0 +1,25 @@
#!/bin/sh
if [ $# -lt 1 ]; then
cat <<EOF
Usage: blackbox_provision.sh PREFIX
EOF
exit 1;
fi
PREFIX="$1"
shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
testit "openldap-backend" $PYTHON ./setup/provision-backend --domain=FOO --realm=foo.example.com --host-name=samba --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend
testit "fedora-ds-backend" $PYTHON ./setup/provision-backend --domain=FOO --realm=foo.example.com --host-name=samba --ldap-backend-type=fedora-ds --targetdir=$PREFIX/fedora-ds-backend
reprovision() {
$PYTHON ./setup/provision-backend --domain=FOO --realm=foo.example.com --host-name=samba --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend-reprovision
$PYTHON ./setup/provision-backend --domain=FOO --realm=foo.example.com --host-name=samba --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend-reprovision
}
testit "reprovision-backend" reprovision
exit $failed