[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Sun Mar 18 19:31:04 MDT 2012
The branch, master has been updated
via ee0e1ca s4:selftest: add test for "samba-tool group list"
via 704f068 s4:samba-tool: add simple command "group list"
via f4458a5 s4:selftest: add a new testsuite for the "samba-tool group" command
from eeec0d9 upgrade provision didn't run findprovisionrange anymore
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ee0e1ca5d8bbd03be5df23ecce504115e2e5012f
Author: Michael Adam <obnox at samba.org>
Date: Sun Mar 18 23:40:18 2012 +0100
s4:selftest: add test for "samba-tool group list"
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Mon Mar 19 02:30:39 CET 2012 on sn-devel-104
commit 704f0683f0d9e9ec9b1270b621096cfc238af7e0
Author: Michael Adam <obnox at samba.org>
Date: Thu Mar 8 22:39:24 2012 +0100
s4:samba-tool: add simple command "group list"
commit f4458a5cef9b80e81aab598fc6095033111e5fa1
Author: Michael Adam <obnox at samba.org>
Date: Sun Mar 18 22:19:46 2012 +0100
s4:selftest: add a new testsuite for the "samba-tool group" command
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/netcmd/group.py | 33 +++++
.../python/samba/tests/samba_tool/group.py | 150 ++++++++++++++++++++
source4/selftest/tests.py | 1 +
3 files changed, 184 insertions(+), 0 deletions(-)
create mode 100644 source4/scripting/python/samba/tests/samba_tool/group.py
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/netcmd/group.py b/source4/scripting/python/samba/netcmd/group.py
index 3d5c42e..004307b 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/source4/scripting/python/samba/netcmd/group.py
@@ -260,6 +260,38 @@ Example2 shows how to remove a single user account, User2, from the supergroup A
raise CommandError('Failed to remove members "%s" from group "%s"' % (listofmembers, groupname), e)
self.outf.write("Removed members from group %s\n" % groupname)
+class cmd_group_list(Command):
+ """List all groups"""
+
+ synopsis = "%prog [options]"
+
+ takes_options = [
+ Option("-H", "--URL", help="LDB URL for database or target server", type=str,
+ metavar="URL", dest="H"),
+ ]
+
+ takes_optiongroups = {
+ "sambaopts": options.SambaOptions,
+ "credopts": options.CredentialsOptions,
+ "versionopts": options.VersionOptions,
+ }
+
+ def run(self, sambaopts=None, credopts=None, versionopts=None, H=None):
+ lp = sambaopts.get_loadparm()
+ creds = credopts.get_credentials(lp, fallback_machine=True)
+
+ samdb = SamDB(url=H, session_info=system_session(),
+ credentials=creds, lp=lp)
+
+ domain_dn = samdb.domain_dn()
+ res = samdb.search(domain_dn, scope=ldb.SCOPE_SUBTREE,
+ expression=("(objectClass=group)"),
+ attrs=["samaccountname"])
+ if (len(res) == 0):
+ return
+
+ for msg in res:
+ self.outf.write("%s\n" % msg.get("samaccountname", idx=0))
class cmd_group(SuperCommand):
"""Group management"""
@@ -269,3 +301,4 @@ class cmd_group(SuperCommand):
subcommands["delete"] = cmd_group_delete()
subcommands["addmembers"] = cmd_group_add_members()
subcommands["removemembers"] = cmd_group_remove_members()
+ subcommands["list"] = cmd_group_list()
diff --git a/source4/scripting/python/samba/tests/samba_tool/group.py b/source4/scripting/python/samba/tests/samba_tool/group.py
new file mode 100644
index 0000000..be10716
--- /dev/null
+++ b/source4/scripting/python/samba/tests/samba_tool/group.py
@@ -0,0 +1,150 @@
+# Unix SMB/CIFS implementation.
+# Copyright (C) Michael Adam 2012
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+import time
+import ldb
+from samba.tests.samba_tool.base import SambaToolCmdTest
+from samba import (
+ nttime2unix,
+ dsdb
+ )
+
+class GroupCmdTestCase(SambaToolCmdTest):
+ """Tests for samba-tool group subcommands"""
+ groups = []
+ samdb = None
+
+ def setUp(self):
+ super(GroupCmdTestCase, self).setUp()
+ self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
+ "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
+ self.groups = []
+ self.groups.append(self._randomGroup({"name": "testgroup1"}))
+ self.groups.append(self._randomGroup({"name": "testgroup2"}))
+ self.groups.append(self._randomGroup({"name": "testgroup3"}))
+ self.groups.append(self._randomGroup({"name": "testgroup4"}))
+
+ # setup the 4 groups and ensure they are correct
+ for group in self.groups:
+ (result, out, err) = self._create_group(group)
+
+ self.assertCmdSuccess(result)
+ self.assertEquals(err, "", "There shouldn't be any error message")
+ self.assertIn("Added group %s" % group["name"], out)
+
+ found = self._find_group(group["name"])
+
+ self.assertIsNotNone(found)
+
+ self.assertEquals("%s" % found.get("name"), group["name"])
+ self.assertEquals("%s" % found.get("description"), group["description"])
+
+ def tearDown(self):
+ super(GroupCmdTestCase, self).tearDown()
+ # clean up all the left over groups, just in case
+ for group in self.groups:
+ if self._find_group(group["name"]):
+ self.runsubcmd("group", "delete", group["name"])
+
+
+ def test_newgroup(self):
+ """This tests the "group add" and "group delete" commands"""
+ # try to add all the groups again, this should fail
+ for group in self.groups:
+ (result, out, err) = self._create_group(group)
+ self.assertCmdFail(result, "Succeeded to create existing group")
+ self.assertIn("LDAP error 68 LDAP_ENTRY_ALREADY_EXISTS", err)
+
+ # try to delete all the groups we just added
+ for group in self.groups:
+ (result, out, err) = self.runsubcmd("group", "delete", group["name"])
+ self.assertCmdSuccess(result,
+ "Failed to delete group '%s'" % group["name"])
+ found = self._find_group(group["name"])
+ self.assertIsNone(found,
+ "Deleted group '%s' still exists" % group["name"])
+
+ # test adding groups
+ for group in self.groups:
+ (result, out, err) = self.runsubcmd("group", "add", group["name"],
+ "--description=%s" % group["description"],
+ "-H", "ldap://%s" % os.environ["DC_SERVER"],
+ "-U%s%%%s" % (os.environ["DC_USERNAME"],
+ os.environ["DC_PASSWORD"]))
+
+ self.assertCmdSuccess(result)
+ self.assertEquals(err,"","There shouldn't be any error message")
+ self.assertIn("Added group %s" % group["name"], out)
+
+ found = self._find_group(group["name"])
+
+ self.assertEquals("%s" % found.get("samaccountname"),
+ "%s" % group["name"])
+
+
+ def test_list(self):
+ (result, out, err) = self.runsubcmd("group", "list",
+ "-H", "ldap://%s" % os.environ["DC_SERVER"],
+ "-U%s%%%s" % (os.environ["DC_USERNAME"],
+ os.environ["DC_PASSWORD"]))
+ self.assertCmdSuccess(result, "Error running list")
+
+ search_filter = "(objectClass=group)"
+
+ grouplist = self.samdb.search(base=self.samdb.domain_dn(),
+ scope=ldb.SCOPE_SUBTREE,
+ expression=search_filter,
+ attrs=["samaccountname"])
+
+ self.assertTrue(len(grouplist) > 0, "no groups found in samdb")
+
+ for groupobj in grouplist:
+ name = groupobj.get("samaccountname", idx=0)
+ found = self.assertMatch(out, name,
+ "group '%s' not found" % name)
+
+
+ def _randomGroup(self, base={}):
+ """create a group with random attribute values, you can specify base attributes"""
+ group = {
+ "name": self.randomName(),
+ "description": self.randomName(count=100),
+ }
+ group.update(base)
+ return group
+
+ def _create_group(self, group):
+ return self.runsubcmd("group", "add", group["name"],
+ "--description=%s" % group["description"],
+ "-H", "ldap://%s" % os.environ["DC_SERVER"],
+ "-U%s%%%s" % (os.environ["DC_USERNAME"],
+ os.environ["DC_PASSWORD"]))
+
+ def _find_group(self, name):
+ search_filter = ("(&(sAMAccountName=%s)(objectCategory=%s,%s))" %
+ (ldb.binary_encode(name),
+ "CN=Group,CN=Schema,CN=Configuration",
+ self.samdb.domain_dn()))
+ grouplist = self.samdb.search(base=self.samdb.domain_dn(),
+ scope=ldb.SCOPE_SUBTREE,
+ expression=search_filter,
+ attrs=[])
+ if grouplist:
+ return grouplist[0]
+ else:
+ return None
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 8b44cdc..63d1b80 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -433,6 +433,7 @@ planpythontestsuite("none", "samba.tests.samba3sam")
planpythontestsuite("dc:local", "samba.tests.samba_tool.timecmd")
planpythontestsuite("dc:local", "samba.tests.samba_tool.user")
+planpythontestsuite("dc:local", "samba.tests.samba_tool.group")
planpythontestsuite("none", "subunit")
planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
--
Samba Shared Repository
More information about the samba-cvs
mailing list