sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

python/samba/test/dcerpc: Py3 port of samba.tests.dcerpc.raw_protocol

Browse Source 
Port code to allow this test run with either py2 or py3
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-05-01 12:24:47 +01:00 committed by Andrew Bartlett
parent c958a04327
commit a467dc2a31
2 changed files with 188 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

339
python/samba/tests/dcerpc/raw_protocol.py
View File

File diff suppressed because it is too large Load Diff

29
python/samba/tests/dcerpc/raw_testcase.py
View File

@ -27,6 +27,7 @@ from samba import gensec
from samba.credentials import Credentials
from samba.tests import TestCase
from samba.ndr import ndr_pack, ndr_unpack, ndr_unpack_out
from samba.compat import text_type
class RawDCERPCTest(TestCase):
@ -165,7 +166,7 @@ class RawDCERPCTest(TestCase):
self.assertEquals(rep.u.versions[0].rpc_vers, req.rpc_vers)
self.assertEquals(rep.u.versions[0].rpc_vers_minor, req.rpc_vers_minor)
self.assertEquals(len(rep.u._pad), 3)
self.assertEquals(rep.u._pad, '\0' * 3)
self.assertEquals(rep.u._pad, b'\0' * 3)
return
self.verify_pdu(rep, samba.dcerpc.dcerpc.DCERPC_PKT_BIND_ACK, req.call_id,
pfc_flags=pfc_flags)
@ -318,7 +319,7 @@ class RawDCERPCTest(TestCase):
sys.stderr.write("stub_in: %d\n%s" % (len(stub_in), self.hexdump(stub_in)))
else:
# only used for sig_size calculation
stub_in = '\xff' * samba.dcerpc.dcerpc.DCERPC_AUTH_PAD_ALIGNMENT
stub_in = b'\xff' * samba.dcerpc.dcerpc.DCERPC_AUTH_PAD_ALIGNMENT
sig_size = 0
if auth_context is not None:
@ -326,7 +327,7 @@ class RawDCERPCTest(TestCase):
auth_pad_length = 0
if mod_len > 0:
auth_pad_length = samba.dcerpc.dcerpc.DCERPC_AUTH_PAD_ALIGNMENT - mod_len
stub_in += '\x00' * auth_pad_length
stub_in += b'\x00' * auth_pad_length
if auth_context["g_auth_level"] >= samba.dcerpc.dcerpc.DCERPC_AUTH_LEVEL_PACKET:
sig_size = auth_context["gensec"].sig_size(len(stub_in))
@ -463,19 +464,19 @@ class RawDCERPCTest(TestCase):
floor2.rhs = rhs2
lhs3 = samba.dcerpc.epmapper.epm_lhs()
lhs3.protocol = samba.dcerpc.epmapper.EPM_PROTOCOL_NCACN
lhs3.lhs_data = ""
lhs3.lhs_data = b""
floor3 = samba.dcerpc.epmapper.epm_floor()
floor3.lhs = lhs3
floor3.rhs.minor_version = 0
lhs4 = samba.dcerpc.epmapper.epm_lhs()
lhs4.protocol = samba.dcerpc.epmapper.EPM_PROTOCOL_TCP
lhs4.lhs_data = ""
lhs4.lhs_data = b""
floor4 = samba.dcerpc.epmapper.epm_floor()
floor4.lhs = lhs4
floor4.rhs.port = self.tcp_port
lhs5 = samba.dcerpc.epmapper.epm_lhs()
lhs5.protocol = samba.dcerpc.epmapper.EPM_PROTOCOL_IP
lhs5.lhs_data = ""
lhs5.lhs_data = b""
floor5 = samba.dcerpc.epmapper.epm_floor()
floor5.lhs = lhs5
floor5.rhs.ipaddr = "0.0.0.0"
@ -647,7 +648,7 @@ class RawDCERPCTest(TestCase):
if getattr(payload, 'auth_info', None):
ai = payload.auth_info
else:
ai = ""
ai = b""
p = samba.dcerpc.dcerpc.ncacn_packet()
p.rpc_vers = rpc_vers
@ -681,7 +682,7 @@ class RawDCERPCTest(TestCase):
if getattr(p.u, 'auth_info', None):
ai = p.u.auth_info
else:
ai = ""
ai = b""
self.assertEqual(p.rpc_vers, rpc_vers)
self.assertEqual(p.rpc_vers_minor, rpc_vers_minor)
@ -708,7 +709,7 @@ class RawDCERPCTest(TestCase):
max_recv_frag=5840,
assoc_group_id=0,
ctx_list=[],
auth_info="",
auth_info=b"",
ndr_print=None, hexdump=None):
b = samba.dcerpc.dcerpc.bind()
@ -734,7 +735,7 @@ class RawDCERPCTest(TestCase):
max_recv_frag=5840,
assoc_group_id=0,
ctx_list=[],
auth_info="",
auth_info=b"",
ndr_print=None, hexdump=None):
a = samba.dcerpc.dcerpc.bind()
@ -756,7 +757,7 @@ class RawDCERPCTest(TestCase):
def generate_auth3(self, call_id,
pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
auth_info="",
auth_info=b"",
ndr_print=None, hexdump=None):
a = samba.dcerpc.dcerpc.auth3()
@ -778,7 +779,7 @@ class RawDCERPCTest(TestCase):
opnum=None,
object=None,
stub=None,
auth_info="",
auth_info=b"",
ndr_print=None, hexdump=None):
if alloc_hint is None:
@ -806,7 +807,7 @@ class RawDCERPCTest(TestCase):
def generate_co_cancel(self, call_id,
pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
auth_info="",
auth_info=b"",
ndr_print=None, hexdump=None):
c = samba.dcerpc.dcerpc.co_cancel()
@ -823,7 +824,7 @@ class RawDCERPCTest(TestCase):
def generate_orphaned(self, call_id,
pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
auth_info="",
auth_info=b"",
ndr_print=None, hexdump=None):
o = samba.dcerpc.dcerpc.orphaned()