sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

python: Move get_admin_sid() to SamDB

Browse Source 
Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jo Sutton 2024-04-15 13:23:15 +12:00 committed by Andrew Bartlett
parent 786eab65ce
commit 1889e0aea3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/samba/samdb.py
View File

@ -1557,6 +1557,13 @@ schemaUpdateNow: 1
dn = dsdb._dsdb_create_gkdi_root_key(self, *args, **kwargs)
return dn
def get_admin_sid(self):
res = self.search(
base="", expression="", scope=ldb.SCOPE_BASE, attrs=["tokenGroups"])
return self.schema_format_value(
"tokenGroups", res[0]["tokenGroups"][0]).decode("utf8")
class dsdb_Dn(object):
"""a class for binary DN"""

13
source4/dsdb/tests/python/unicodepwd_encrypted.py
View File

@ -6,7 +6,7 @@ import optparse
sys.path.insert(0, "bin/python")
import samba.getopt as options
from ldb import Message, MessageElement, Dn
from ldb import LdbError, FLAG_MOD_REPLACE, ERR_UNWILLING_TO_PERFORM, SCOPE_BASE
from ldb import LdbError, FLAG_MOD_REPLACE, ERR_UNWILLING_TO_PERFORM
from samba import gensec
from samba.auth import system_session
from samba.samdb import SamDB
@ -75,13 +75,6 @@ class UnicodePwdEncryptedConnectionTests(PasswordTestCase):
)
ldb.modify(m)
def get_admin_sid(self, ldb):
res = ldb.search(
base="", expression="", scope=SCOPE_BASE, attrs=["tokenGroups"])
return ldb.schema_format_value(
"tokenGroups", res[0]["tokenGroups"][0]).decode("utf8")
def test_with_seal(self):
"""Test unicodePwd on connection with seal.
@ -123,7 +116,7 @@ class UnicodePwdEncryptedConnectionTests(PasswordTestCase):
def test_simple_bind_plain(self):
"""Test unicodePwd using simple bind without encryption."""
admin_sid = self.get_admin_sid(self.ldb)
admin_sid = self.ldb.get_admin_sid()
self.creds.set_bind_dn(admin_sid)
ldb = SamDB(url=host_ldap, credentials=self.creds, lp=lp)
@ -140,7 +133,7 @@ class UnicodePwdEncryptedConnectionTests(PasswordTestCase):
def test_simple_bind_tls(self):
"""Test unicodePwd using simple bind with encryption."""
admin_sid = self.get_admin_sid(self.ldb)
admin_sid = self.ldb.get_admin_sid()
self.creds.set_bind_dn(admin_sid)
ldb = SamDB(url=host_ldaps, credentials=self.creds, lp=lp)