mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

4370. [bug] Address python3 compatibility issues with RNDC module.

Browse Source 
[RT #42499] [RT #42506]
This commit is contained in:
Mark Andrews
2016-05-26 12:01:31 +10:00
parent a0f5a5e3c5
commit 10f8dc8456
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -6,7 +6,7 @@
Thanks to Tony Finch. [RT #41615] Thanks to Tony Finch. [RT #41615]
4370. [bug] Address python3 compatibility issues with RNDC module. 4370. [bug] Address python3 compatibility issues with RNDC module.
[RT #42499] [RT #42499] [RT #42506]
--- 9.11.0a2 released --- --- 9.11.0a2 released ---

30
bin/python/isc/rndc.py
View File

@@ -62,13 +62,16 @@ class rndc(object):
return dict(self.__command(type=cmd)['_data']) return dict(self.__command(type=cmd)['_data'])
def __serialize_dict(self, data, ignore_auth=False): def __serialize_dict(self, data, ignore_auth=False):
rv = '' rv = bytearray()
for k, v in data.iteritems(): for k, v in data.items():
if ignore_auth and k == '_auth': if ignore_auth and k == '_auth':
continue continue
rv += chr(len(k)) rv += struct.pack('B', len(k)) + k.encode('ascii')
rv += k
if type(v) == str: if type(v) == str:
rv += struct.pack('>BI', 1, len(v)) + v.encode('ascii')
elif type(v) == bytes:
rv += struct.pack('>BI', 1, len(v)) + v
elif type(v) == bytearray:
rv += struct.pack('>BI', 1, len(v)) + v rv += struct.pack('>BI', 1, len(v)) + v
elif type(v) == OrderedDict: elif type(v) == OrderedDict:
sd = self.__serialize_dict(v) sd = self.__serialize_dict(v)
@@ -99,8 +102,8 @@ class rndc(object):
if self.algo == 'md5': if self.algo == 'md5':
d['_auth']['hmd5'] = struct.pack('22s', bhash) d['_auth']['hmd5'] = struct.pack('22s', bhash)
else: else:
d['_auth']['hsha'] = struct.pack('B88s', d['_auth']['hsha'] = bytearray(struct.pack('B88s',
self.__algos[self.algo], bhash) self.__algos[self.algo], bhash))
msg = self.__serialize_dict(d) msg = self.__serialize_dict(d)
msg = struct.pack('>II', len(msg) + 4, 1) + msg msg = struct.pack('>II', len(msg) + 4, 1) + msg
return msg return msg
@@ -108,7 +111,12 @@ class rndc(object):
def __verify_msg(self, msg): def __verify_msg(self, msg):
if self.nonce is not None and msg['_ctrl']['_nonce'] != self.nonce: if self.nonce is not None and msg['_ctrl']['_nonce'] != self.nonce:
return False return False
bhash = msg['_auth']['hmd5' if self.algo == 'md5' else 'hsha'] if self.algo == 'md5':
bhash = msg['_auth']['hmd5']
else:
bhash = msg['_auth']['hsha'][1:]
if type(bhash) == bytes:
bhash = bhash.decode('ascii')
bhash += '=' * (4 - (len(bhash) % 4)) bhash += '=' * (4 - (len(bhash) % 4))
remote_hash = base64.b64decode(bhash) remote_hash = base64.b64decode(bhash)
my_msg = self.__serialize_dict(msg, ignore_auth=True) my_msg = self.__serialize_dict(msg, ignore_auth=True)
@@ -136,6 +144,8 @@ class rndc(object):
if len(data) != length: if len(data) != length:
raise IOError("Can't read response data") raise IOError("Can't read response data")
if type(data) == str:
data = bytearray(data)
msg = self.__parse_message(data) msg = self.__parse_message(data)
if not self.__verify_msg(msg): if not self.__verify_msg(msg):
raise IOError("Authentication failure") raise IOError("Authentication failure")
@@ -150,11 +160,11 @@ class rndc(object):
def __parse_element(self, input): def __parse_element(self, input):
pos = 0 pos = 0
labellen = ord(input[pos]) labellen = input[pos]
pos += 1 pos += 1
label = input[pos:pos+labellen] label = input[pos:pos+labellen].decode('ascii')
pos += labellen pos += labellen
type = ord(input[pos]) type = input[pos]
pos += 1 pos += 1
datalen = struct.unpack('>I', input[pos:pos+4])[0] datalen = struct.unpack('>I', input[pos:pos+4])[0]
pos += 4 pos += 4