mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
0ebf52744c
fix dsdb_Dn comparison for Python 3 In Python 3, the builtin `cmp` funtion was dropped. And the `__cmp__` magic method in object is no longer honored, which is replaced by 6 new methods: __eq__, __ne__, __lt__, __le__, __gt__, __ge__. This caused `tests.CommonTests` failed with `py3_compatiable=True`. Fixed by adding the above methods. Signed-off-by: Joe Guo <joeg@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
149 lines
4.2 KiB
Python
149 lines
4.2 KiB
Python
# Samba common functions
|
|
#
|
|
# Copyright (C) Matthieu Patou <mat@matws.net>
|
|
#
|
|
# 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 ldb
|
|
from samba import dsdb
|
|
from samba.ndr import ndr_pack
|
|
from samba.dcerpc import misc
|
|
import binascii
|
|
|
|
from samba.compat import PY3
|
|
|
|
|
|
if PY3:
|
|
# cmp() exists only in Python 2
|
|
def cmp(a, b):
|
|
return (a > b) - (a < b)
|
|
|
|
|
|
def confirm(msg, forced=False, allow_all=False):
|
|
"""confirm an action with the user
|
|
|
|
:param msg: A string to print to the user
|
|
:param forced: Are the answer forced
|
|
"""
|
|
if forced:
|
|
print("%s [YES]" % msg)
|
|
return True
|
|
|
|
mapping = {
|
|
'Y': True,
|
|
'YES': True,
|
|
'': False,
|
|
'N': False,
|
|
'NO': False,
|
|
}
|
|
|
|
prompt = '[y/N]'
|
|
|
|
if allow_all:
|
|
mapping['ALL'] = 'ALL'
|
|
mapping['NONE'] = 'NONE'
|
|
prompt = '[y/N/all/none]'
|
|
|
|
while True:
|
|
v = raw_input(msg + ' %s ' % prompt)
|
|
v = v.upper()
|
|
if v in mapping:
|
|
return mapping[v]
|
|
print("Unknown response '%s'" % v)
|
|
|
|
|
|
def normalise_int32(ivalue):
|
|
'''normalise a ldap integer to signed 32 bit'''
|
|
if int(ivalue) & 0x80000000 and int(ivalue) > 0:
|
|
return str(int(ivalue) - 0x100000000)
|
|
return str(ivalue)
|
|
|
|
|
|
class dsdb_Dn(object):
|
|
'''a class for binary DN'''
|
|
|
|
def __init__(self, samdb, dnstring, syntax_oid=None):
|
|
'''create a dsdb_Dn'''
|
|
if syntax_oid is None:
|
|
# auto-detect based on string
|
|
if dnstring.startswith("B:"):
|
|
syntax_oid = dsdb.DSDB_SYNTAX_BINARY_DN
|
|
elif dnstring.startswith("S:"):
|
|
syntax_oid = dsdb.DSDB_SYNTAX_STRING_DN
|
|
else:
|
|
syntax_oid = dsdb.DSDB_SYNTAX_OR_NAME
|
|
if syntax_oid in [dsdb.DSDB_SYNTAX_BINARY_DN, dsdb.DSDB_SYNTAX_STRING_DN]:
|
|
# it is a binary DN
|
|
colons = dnstring.split(':')
|
|
if len(colons) < 4:
|
|
raise RuntimeError("Invalid DN %s" % dnstring)
|
|
prefix_len = 4 + len(colons[1]) + int(colons[1])
|
|
self.prefix = dnstring[0:prefix_len]
|
|
self.binary = self.prefix[3+len(colons[1]):-1]
|
|
self.dnstring = dnstring[prefix_len:]
|
|
else:
|
|
self.dnstring = dnstring
|
|
self.prefix = ''
|
|
self.binary = ''
|
|
self.dn = ldb.Dn(samdb, self.dnstring)
|
|
|
|
def __str__(self):
|
|
return self.prefix + str(self.dn.extended_str(mode=1))
|
|
|
|
def __cmp__(self, other):
|
|
''' compare dsdb_Dn values similar to parsed_dn_compare()'''
|
|
dn1 = self
|
|
dn2 = other
|
|
guid1 = dn1.dn.get_extended_component("GUID")
|
|
guid1b = ndr_pack(misc.GUID(guid1))
|
|
guid2 = dn2.dn.get_extended_component("GUID")
|
|
guid2b = ndr_pack(misc.GUID(guid2))
|
|
|
|
v = cmp(guid1, guid2)
|
|
if v != 0:
|
|
return v
|
|
v = cmp(dn1.binary, dn2.binary)
|
|
return v
|
|
|
|
# In Python3, __cmp__ is replaced by these 6 methods
|
|
def __eq__(self, other):
|
|
return self.__cmp__(other) == 0
|
|
|
|
def __ne__(self, other):
|
|
return self.__cmp__(other) != 0
|
|
|
|
def __lt__(self, other):
|
|
return self.__cmp__(other) < 0
|
|
|
|
def __le__(self, other):
|
|
return self.__cmp__(other) <= 0
|
|
|
|
def __gt__(self, other):
|
|
return self.__cmp__(other) > 0
|
|
|
|
def __ge__(self, other):
|
|
return self.__cmp__(other) >= 0
|
|
|
|
def get_binary_integer(self):
|
|
'''return binary part of a dsdb_Dn as an integer, or None'''
|
|
if self.prefix == '':
|
|
return None
|
|
return int(self.binary, 16)
|
|
|
|
def get_bytes(self):
|
|
'''return binary as a byte string'''
|
|
return binascii.unhexlify(self.binary)
|