jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Clean up pyrad test cases for python3 compatibility

Browse source 
All other test cases seem to work, but radius_das_disconnect_time_window
is still failing due to incorrect authenticator or Message-Authenticator
in Disconnect-Request.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-02-04 18:26:53 +02:00
parent a68e9b6980
commit 55845e190b
3 changed files with 159 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/test_ap_hs20.py
View file

@ -6102,7 +6102,7 @@ def test_ap_hs20_terms_and_conditions_coa(dev, apdev):
dict = pyrad.dictionary.Dictionary("dictionary.radius") dict = pyrad.dictionary.Dictionary("dictionary.radius")
srv = pyrad.client.Client(server="127.0.0.1", acctport=3799, srv = pyrad.client.Client(server="127.0.0.1", acctport=3799,
secret="secret", dict=dict) secret=b"secret", dict=dict)
srv.retries = 1 srv.retries = 1
srv.timeout = 1 srv.timeout = 1
@ -6111,7 +6111,7 @@ def test_ap_hs20_terms_and_conditions_coa(dev, apdev):
logger.info("CoA-Request with matching Acct-Session-Id") logger.info("CoA-Request with matching Acct-Session-Id")
vsa = binascii.unhexlify('00009f68090600000000') vsa = binascii.unhexlify('00009f68090600000000')
req = radius_das.CoAPacket(dict=dict, secret="secret", req = radius_das.CoAPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
Acct_Multi_Session_Id=multi_sess_id, Acct_Multi_Session_Id=multi_sess_id,
Chargeable_User_Identity="hs20-cui", Chargeable_User_Identity="hs20-cui",

223
tests/hwsim/test_eap_proto.py
View file

@ -89,7 +89,7 @@ def start_radius_server(eap_handler):
class TestServer(pyrad.server.Server): class TestServer(pyrad.server.Server):
def _HandleAuthPacket(self, pkt): def _HandleAuthPacket(self, pkt):
pyrad.server.Server._HandleAuthPacket(self, pkt) pyrad.server.Server._HandleAuthPacket(self, pkt)
eap = "" eap = b''
for p in pkt[79]: for p in pkt[79]:
eap += p eap += p
eap_req = self.eap_handler(self.ctx, eap) eap_req = self.eap_handler(self.ctx, eap)
@ -111,8 +111,7 @@ def start_radius_server(eap_handler):
hmac_obj.update(struct.pack("B", reply.id)) hmac_obj.update(struct.pack("B", reply.id))
# reply attributes # reply attributes
reply.AddAttribute("Message-Authenticator", reply.AddAttribute("Message-Authenticator", 16*b'\x00')
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
attrs = reply._PktEncodeAttributes() attrs = reply._PktEncodeAttributes()
# Length # Length
@ -149,7 +148,7 @@ def start_radius_server(eap_handler):
srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"), srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"),
authport=18138, acctport=18139) authport=18138, acctport=18139)
srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1", srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1",
"radius", b"radius",
"localhost") "localhost")
srv.BindToAddress("") srv.BindToAddress("")
t_stop = threading.Event() t_stop = threading.Event()
@ -172,7 +171,7 @@ def test_eap_proto(dev, apdev):
"""EAP protocol tests""" """EAP protocol tests"""
check_eap_capa(dev[0], "MD5") check_eap_capa(dev[0], "MD5")
def eap_handler(ctx, req): def eap_handler(ctx, req):
logger.info("eap_handler - RX " + req.encode("hex")) logger.info("eap_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -393,7 +392,7 @@ def test_eap_proto(dev, apdev):
def test_eap_proto_notification_errors(dev, apdev): def test_eap_proto_notification_errors(dev, apdev):
"""EAP Notification errors""" """EAP Notification errors"""
def eap_handler(ctx, req): def eap_handler(ctx, req):
logger.info("eap_handler - RX " + req.encode("hex")) logger.info("eap_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -494,7 +493,7 @@ def test_eap_proto_sake(dev, apdev):
EAP_SAKE_AT_RAND_S, 18, 0, 0, 0, 0) EAP_SAKE_AT_RAND_S, 18, 0, 0, 0, 0)
def sake_handler(ctx, req): def sake_handler(ctx, req):
logger.info("sake_handler - RX " + req.encode("hex")) logger.info("sake_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] += 1 ctx['num'] += 1
@ -830,7 +829,7 @@ def test_eap_proto_sake_errors(dev, apdev):
def test_eap_proto_sake_errors2(dev, apdev): def test_eap_proto_sake_errors2(dev, apdev):
"""EAP-SAKE protocol tests (2)""" """EAP-SAKE protocol tests (2)"""
def sake_handler(ctx, req): def sake_handler(ctx, req):
logger.info("sake_handler - RX " + req.encode("hex")) logger.info("sake_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] += 1 ctx['num'] += 1
@ -872,7 +871,7 @@ def test_eap_proto_leap(dev, apdev):
"""EAP-LEAP protocol tests""" """EAP-LEAP protocol tests"""
check_eap_capa(dev[0], "LEAP") check_eap_capa(dev[0], "LEAP")
def leap_handler(ctx, req): def leap_handler(ctx, req):
logger.info("leap_handler - RX " + req.encode("hex")) logger.info("leap_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -1040,7 +1039,7 @@ def test_eap_proto_leap_errors(dev, apdev):
check_eap_capa(dev[0], "LEAP") check_eap_capa(dev[0], "LEAP")
def leap_handler2(ctx, req): def leap_handler2(ctx, req):
logger.info("leap_handler2 - RX " + req.encode("hex")) logger.info("leap_handler2 - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -1341,7 +1340,7 @@ def test_eap_proto_md5(dev, apdev):
check_eap_capa(dev[0], "MD5") check_eap_capa(dev[0], "MD5")
def md5_handler(ctx, req): def md5_handler(ctx, req):
logger.info("md5_handler - RX " + req.encode("hex")) logger.info("md5_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -1424,7 +1423,7 @@ def test_eap_proto_md5_errors(dev, apdev):
def test_eap_proto_otp(dev, apdev): def test_eap_proto_otp(dev, apdev):
"""EAP-OTP protocol tests""" """EAP-OTP protocol tests"""
def otp_handler(ctx, req): def otp_handler(ctx, req):
logger.info("otp_handler - RX " + req.encode("hex")) logger.info("otp_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -1487,7 +1486,7 @@ def test_eap_proto_otp(dev, apdev):
def test_eap_proto_otp_errors(dev, apdev): def test_eap_proto_otp_errors(dev, apdev):
"""EAP-OTP local error cases""" """EAP-OTP local error cases"""
def otp_handler2(ctx, req): def otp_handler2(ctx, req):
logger.info("otp_handler2 - RX " + req.encode("hex")) logger.info("otp_handler2 - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -1531,7 +1530,7 @@ EAP_GPSK_OPCODE_PROTECTED_FAIL = 6
def test_eap_proto_gpsk(dev, apdev): def test_eap_proto_gpsk(dev, apdev):
"""EAP-GPSK protocol tests""" """EAP-GPSK protocol tests"""
def gpsk_handler(ctx, req): def gpsk_handler(ctx, req):
logger.info("gpsk_handler - RX " + req.encode("hex")) logger.info("gpsk_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -1975,7 +1974,7 @@ EAP_EKE_FAILURE = 4
def test_eap_proto_eke(dev, apdev): def test_eap_proto_eke(dev, apdev):
"""EAP-EKE protocol tests""" """EAP-EKE protocol tests"""
def eke_handler(ctx, req): def eke_handler(ctx, req):
logger.info("eke_handler - RX " + req.encode("hex")) logger.info("eke_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -2406,7 +2405,7 @@ def test_eap_proto_pax(dev, apdev):
0xf0, 0xac, 0xcf, 0xc4, 0x66, 0xcd, 0x2d, 0xbf) 0xf0, 0xac, 0xcf, 0xc4, 0x66, 0xcd, 0x2d, 0xbf)
def pax_handler(ctx, req): def pax_handler(ctx, req):
logger.info("pax_handler - RX " + req.encode("hex")) logger.info("pax_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -2752,7 +2751,7 @@ def test_eap_proto_pax_errors(dev, apdev):
def test_eap_proto_psk(dev, apdev): def test_eap_proto_psk(dev, apdev):
"""EAP-PSK protocol tests""" """EAP-PSK protocol tests"""
def psk_handler(ctx, req): def psk_handler(ctx, req):
logger.info("psk_handler - RX " + req.encode("hex")) logger.info("psk_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -3009,7 +3008,7 @@ EAP_SIM_AT_BIDDING = 136
def test_eap_proto_aka(dev, apdev): def test_eap_proto_aka(dev, apdev):
"""EAP-AKA protocol tests""" """EAP-AKA protocol tests"""
def aka_handler(ctx, req): def aka_handler(ctx, req):
logger.info("aka_handler - RX " + req.encode("hex")) logger.info("aka_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -3704,7 +3703,7 @@ def test_eap_proto_aka(dev, apdev):
def test_eap_proto_aka_prime(dev, apdev): def test_eap_proto_aka_prime(dev, apdev):
"""EAP-AKA' protocol tests""" """EAP-AKA' protocol tests"""
def aka_prime_handler(ctx, req): def aka_prime_handler(ctx, req):
logger.info("aka_prime_handler - RX " + req.encode("hex")) logger.info("aka_prime_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -4130,7 +4129,7 @@ def test_eap_proto_aka_prime(dev, apdev):
def test_eap_proto_sim(dev, apdev): def test_eap_proto_sim(dev, apdev):
"""EAP-SIM protocol tests""" """EAP-SIM protocol tests"""
def sim_handler(ctx, req): def sim_handler(ctx, req):
logger.info("sim_handler - RX " + req.encode("hex")) logger.info("sim_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -4850,7 +4849,7 @@ def test_eap_proto_ikev2(dev, apdev):
eap_proto_ikev2_test_done = False eap_proto_ikev2_test_done = False
def ikev2_handler(ctx, req): def ikev2_handler(ctx, req):
logger.info("ikev2_handler - RX " + req.encode("hex")) logger.info("ikev2_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -5000,7 +4999,7 @@ def test_eap_proto_ikev2(dev, apdev):
0, 0, 0, 0, 0, 0, 0, 0,
0, 0x20, 34, 0x08, 0, 28) 0, 0x20, 34, 0x08, 0, 28)
def build_ike(id, next=0, exch_type=34, flags=0x00, ike=''): def build_ike(id, next=0, exch_type=34, flags=0x00, ike=b''):
return struct.pack(">BBHBB2L2LBBBBLL", EAP_CODE_REQUEST, id, return struct.pack(">BBHBB2L2LBBBBLL", EAP_CODE_REQUEST, id,
4 + 1 + 1 + 28 + len(ike), 4 + 1 + 1 + 28 + len(ike),
EAP_TYPE_IKEV2, flags, EAP_TYPE_IKEV2, flags,
@ -5188,7 +5187,7 @@ def test_eap_proto_ikev2(dev, apdev):
logger.info("Test: Mismatch in DH Group in SAi1") logger.info("Test: Mismatch in DH Group in SAi1")
ike = build_sa(next=34) ike = build_sa(next=34)
ike += struct.pack(">BBHHH", 0, 0, 4 + 4 + 96, 12345, 0) ike += struct.pack(">BBHHH", 0, 0, 4 + 4 + 96, 12345, 0)
ike += 96*'\x00' ike += 96*b'\x00'
return build_ike(ctx['id'], next=33, ike=ike) return build_ike(ctx['id'], next=33, ike=ike)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
@ -5200,12 +5199,12 @@ def test_eap_proto_ikev2(dev, apdev):
logger.info("Test: Invalid DH public value length in SAi1") logger.info("Test: Invalid DH public value length in SAi1")
ike = build_sa(next=34) ike = build_sa(next=34)
ike += struct.pack(">BBHHH", 0, 0, 4 + 4 + 96, 5, 0) ike += struct.pack(">BBHHH", 0, 0, 4 + 4 + 96, 5, 0)
ike += 96*'\x00' ike += 96*b'\x00'
return build_ike(ctx['id'], next=33, ike=ike) return build_ike(ctx['id'], next=33, ike=ike)
def build_ke(next=0): def build_ke(next=0):
ke = struct.pack(">BBHHH", next, 0, 4 + 4 + 192, 5, 0) ke = struct.pack(">BBHHH", next, 0, 4 + 4 + 192, 5, 0)
ke += 191*'\x00'+'\x02' ke += 191*b'\x00'+b'\x02'
return ke return ke
idx += 1 idx += 1
@ -5228,11 +5227,11 @@ def test_eap_proto_ikev2(dev, apdev):
logger.info("Test: Too long Ni in SAi1") logger.info("Test: Too long Ni in SAi1")
ike = build_sa(next=34) ike = build_sa(next=34)
ike += build_ke(next=40) ike += build_ke(next=40)
ike += struct.pack(">BBH", 0, 0, 4 + 257) + 257*'\x00' ike += struct.pack(">BBH", 0, 0, 4 + 257) + 257*b'\x00'
return build_ike(ctx['id'], next=33, ike=ike) return build_ike(ctx['id'], next=33, ike=ike)
def build_ni(next=0): def build_ni(next=0):
return struct.pack(">BBH", next, 0, 4 + 256) + 256*'\x00' return struct.pack(">BBH", next, 0, 4 + 256) + 256*b'\x00'
def build_sai1(id): def build_sai1(id):
ike = build_sa(next=34) ike = build_sa(next=34)
@ -5256,7 +5255,7 @@ def test_eap_proto_ikev2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: No integrity checksum") logger.info("Test: No integrity checksum")
ike = '' ike = b''
return build_ike(ctx['id'], next=37, ike=ike) return build_ike(ctx['id'], next=37, ike=ike)
idx += 1 idx += 1
@ -5278,7 +5277,7 @@ def test_eap_proto_ikev2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Invalid integrity checksum") logger.info("Test: Invalid integrity checksum")
ike = '' ike = b''
return build_ike(ctx['id'], next=37, flags=0x20, ike=ike) return build_ike(ctx['id'], next=37, flags=0x20, ike=ike)
idx += 1 idx += 1
@ -5347,7 +5346,7 @@ def GenerateAuthenticatorResponse(password, nt_response, peer_challenge,
data = password_hash_hash + nt_response + magic1 data = password_hash_hash + nt_response + magic1
digest = hashlib.sha1(data).digest() digest = hashlib.sha1(data).digest()
challenge = ChallengeHash(peer_challenge, auth_challenge, username) challenge = ChallengeHash(peer_challenge, auth_challenge, username.encode())
data = digest + challenge + magic2 data = digest + challenge + magic2
resp = hashlib.sha1(data).digest() resp = hashlib.sha1(data).digest()
@ -5519,7 +5518,7 @@ def test_eap_proto_mschapv2(dev, apdev):
check_eap_capa(dev[0], "MSCHAPV2") check_eap_capa(dev[0], "MSCHAPV2")
def mschapv2_handler(ctx, req): def mschapv2_handler(ctx, req):
logger.info("mschapv2_handler - RX " + req.encode("hex")) logger.info("mschapv2_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -5574,7 +5573,7 @@ def test_eap_proto_mschapv2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure before challenge - invalid failure challenge len") logger.info("Test: Failure before challenge - invalid failure challenge len")
payload = 'C=12' payload = b'C=12'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5587,7 +5586,7 @@ def test_eap_proto_mschapv2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure before challenge - invalid failure challenge len") logger.info("Test: Failure before challenge - invalid failure challenge len")
payload = 'C=12 V=3' payload = b'C=12 V=3'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5600,7 +5599,7 @@ def test_eap_proto_mschapv2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure before challenge - invalid failure challenge") logger.info("Test: Failure before challenge - invalid failure challenge")
payload = 'C=00112233445566778899aabbccddeefQ ' payload = b'C=00112233445566778899aabbccddeefQ '
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5613,7 +5612,7 @@ def test_eap_proto_mschapv2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure before challenge - password expired") logger.info("Test: Failure before challenge - password expired")
payload = 'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired' payload = b'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5621,7 +5620,7 @@ def test_eap_proto_mschapv2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Success after password change") logger.info("Test: Success after password change")
payload = "S=1122334455667788990011223344556677889900" payload = b"S=1122334455667788990011223344556677889900"
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5649,11 +5648,11 @@ def test_eap_proto_mschapv2(dev, apdev):
return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + 1 + 16 + 6, 4 + 1 + 4 + 1 + 16 + 6,
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
1, 0, 4 + 1 + 16 + 6, 16) + 16*'A' + 'foobar' 1, 0, 4 + 1 + 16 + 6, 16) + 16*b'A' + b'foobar'
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure - password expired") logger.info("Test: Failure - password expired")
payload = 'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired' payload = b'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5676,19 +5675,19 @@ def test_eap_proto_mschapv2(dev, apdev):
nt_response = data[0:24] nt_response = data[0:24]
data = data[24:] data = data[24:]
flags = data flags = data
logger.info("enc_hash: " + enc_hash.encode("hex")) logger.info("enc_hash: " + binascii.hexlify(enc_hash).decode())
logger.info("peer_challenge: " + peer_challenge.encode("hex")) logger.info("peer_challenge: " + binascii.hexlify(peer_challenge).decode())
logger.info("nt_response: " + nt_response.encode("hex")) logger.info("nt_response: " + binascii.hexlify(nt_response).decode())
logger.info("flags: " + flags.encode("hex")) logger.info("flags: " + binascii.hexlify(flags).decode())
auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff") auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff")
logger.info("auth_challenge: " + auth_challenge.encode("hex")) logger.info("auth_challenge: " + binascii.hexlify(auth_challenge).decode())
auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response, auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response,
peer_challenge, peer_challenge,
auth_challenge, "user") auth_challenge, "user")
payload = "S=" + auth_resp.encode('hex').upper() payload = b"S=" + binascii.hexlify(auth_resp).decode().upper().encode()
logger.info("Success message payload: " + payload) logger.info("Success message payload: " + payload.decode())
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5701,7 +5700,7 @@ def test_eap_proto_mschapv2(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure - password expired") logger.info("Test: Failure - password expired")
payload = 'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired' payload = b'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5724,19 +5723,19 @@ def test_eap_proto_mschapv2(dev, apdev):
nt_response = data[0:24] nt_response = data[0:24]
data = data[24:] data = data[24:]
flags = data flags = data
logger.info("enc_hash: " + enc_hash.encode("hex")) logger.info("enc_hash: " + binascii.hexlify(enc_hash).decode())
logger.info("peer_challenge: " + peer_challenge.encode("hex")) logger.info("peer_challenge: " + binascii.hexlify(peer_challenge).decode())
logger.info("nt_response: " + nt_response.encode("hex")) logger.info("nt_response: " + binascii.hexlify(nt_response).decode())
logger.info("flags: " + flags.encode("hex")) logger.info("flags: " + binascii.hexlify(flags).decode())
auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff") auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff")
logger.info("auth_challenge: " + auth_challenge.encode("hex")) logger.info("auth_challenge: " + binascii.hexlify(auth_challenge).decode())
auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response, auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response,
peer_challenge, peer_challenge,
auth_challenge, "user") auth_challenge, "user")
payload = "S=" + auth_resp.encode('hex').upper() payload = b"S=" + binascii.hexlify(auth_resp).decode().upper().encode()
logger.info("Success message payload: " + payload) logger.info("Success message payload: " + payload.decode())
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5752,11 +5751,11 @@ def test_eap_proto_mschapv2(dev, apdev):
return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + 1 + 16 + 6, 4 + 1 + 4 + 1 + 16 + 6,
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
1, 0, 4 + 1 + 16 + 6, 16) + 16*'A' + 'foobar' 1, 0, 4 + 1 + 16 + 6, 16) + 16*b'A' + b'foobar'
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure - authentication failure") logger.info("Test: Failure - authentication failure")
payload = 'E=691 R=1 C=00112233445566778899aabbccddeeff V=3 M=Authentication failed' payload = b'E=691 R=1 C=00112233445566778899aabbccddeeff V=3 M=Authentication failed'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5768,11 +5767,11 @@ def test_eap_proto_mschapv2(dev, apdev):
return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + 1 + 16 + 6, 4 + 1 + 4 + 1 + 16 + 6,
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
1, 0, 4 + 1 + 16 + 6, 16) + 16*'A' + 'foobar' 1, 0, 4 + 1 + 16 + 6, 16) + 16*b'A' + b'foobar'
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Failure - authentication failure") logger.info("Test: Failure - authentication failure")
payload = 'E=691 R=1 C=00112233445566778899aabbccddeeff V=3 M=Authentication failed (2)' payload = b'E=691 R=1 C=00112233445566778899aabbccddeeff V=3 M=Authentication failed (2)'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5788,7 +5787,7 @@ def test_eap_proto_mschapv2(dev, apdev):
return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + 1 + 16 + 6, 4 + 1 + 4 + 1 + 16 + 6,
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
1, 0, 4 + 1 + 16 + 6 + 1, 16) + 16*'A' + 'foobar' 1, 0, 4 + 1 + 16 + 6 + 1, 16) + 16*b'A' + b'foobar'
return None return None
@ -5884,7 +5883,7 @@ def test_eap_proto_mschapv2_errors(dev, apdev):
def mschapv2_fail_password_expired(ctx): def mschapv2_fail_password_expired(ctx):
logger.info("Test: Failure before challenge - password expired") logger.info("Test: Failure before challenge - password expired")
payload = 'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired' payload = b'E=648 R=1 C=00112233445566778899aabbccddeeff V=3 M=Password expired'
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
@ -5893,7 +5892,7 @@ def test_eap_proto_mschapv2_errors(dev, apdev):
def mschapv2_success_after_password_change(ctx, req=None): def mschapv2_success_after_password_change(ctx, req=None):
logger.info("Test: Success after password change") logger.info("Test: Success after password change")
if req is None or len(req) != 591: if req is None or len(req) != 591:
payload = "S=1122334455667788990011223344556677889900" payload = b"S=1122334455667788990011223344556677889900"
else: else:
data = req[9:] data = req[9:]
enc_pw = data[0:516] enc_pw = data[0:516]
@ -5907,25 +5906,25 @@ def test_eap_proto_mschapv2_errors(dev, apdev):
nt_response = data[0:24] nt_response = data[0:24]
data = data[24:] data = data[24:]
flags = data flags = data
logger.info("enc_hash: " + enc_hash.encode("hex")) logger.info("enc_hash: " + binascii.hexlify(enc_hash).decode())
logger.info("peer_challenge: " + peer_challenge.encode("hex")) logger.info("peer_challenge: " + binascii.hexlify(peer_challenge).decode())
logger.info("nt_response: " + nt_response.encode("hex")) logger.info("nt_response: " + binascii.hexlify(nt_response).decode())
logger.info("flags: " + flags.encode("hex")) logger.info("flags: " + binascii.hexlify(flags).decode())
auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff") auth_challenge = binascii.unhexlify("00112233445566778899aabbccddeeff")
logger.info("auth_challenge: " + auth_challenge.encode("hex")) logger.info("auth_challenge: " + binascii.hexlify(auth_challenge).decode())
auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response, auth_resp = GenerateAuthenticatorResponse("new-pw", nt_response,
peer_challenge, peer_challenge,
auth_challenge, "user") auth_challenge, "user")
payload = "S=" + auth_resp.encode('hex').upper() payload = b"S=" + binascii.hexlify(auth_resp).decode().upper().encode()
return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + len(payload), 4 + 1 + 4 + len(payload),
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
3, 0, 4 + len(payload)) + payload 3, 0, 4 + len(payload)) + payload
def mschapv2_handler(ctx, req): def mschapv2_handler(ctx, req):
logger.info("mschapv2_handler - RX " + req.encode("hex")) logger.info("mschapv2_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -6097,7 +6096,7 @@ def test_eap_proto_pwd(dev, apdev):
eap_proto_pwd_test_wait = False eap_proto_pwd_test_wait = False
def pwd_handler(ctx, req): def pwd_handler(ctx, req):
logger.info("pwd_handler - RX " + req.encode("hex")) logger.info("pwd_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -6244,7 +6243,7 @@ def test_eap_proto_pwd(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Commit payload with all zeros values --> Shared key at infinity") logger.info("Test: Commit payload with all zeros values --> Shared key at infinity")
payload = struct.pack(">B", 0x02) + 96*'\0' payload = struct.pack(">B", 0x02) + 96*b'\0'
return struct.pack(">BBHB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + len(payload), EAP_TYPE_PWD) + payload 4 + 1 + len(payload), EAP_TYPE_PWD) + payload
@ -6290,7 +6289,7 @@ def test_eap_proto_pwd(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Confirm payload with incorrect value") logger.info("Test: Confirm payload with incorrect value")
payload = struct.pack(">B", 0x03) + 32*'\0' payload = struct.pack(">B", 0x03) + 32*b'\0'
return struct.pack(">BBHB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + len(payload), EAP_TYPE_PWD) + payload 4 + 1 + len(payload), EAP_TYPE_PWD) + payload
@ -6535,7 +6534,7 @@ def test_eap_proto_erp(dev, apdev):
eap_proto_erp_test_done = False eap_proto_erp_test_done = False
def erp_handler(ctx, req): def erp_handler(ctx, req):
logger.info("erp_handler - RX " + req.encode("hex")) logger.info("erp_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] += 1 ctx['num'] += 1
@ -6564,7 +6563,7 @@ def test_eap_proto_erp(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Zero-length TVs/TLVs") logger.info("Test: Zero-length TVs/TLVs")
payload = "" payload = b""
return struct.pack(">BBHBB", EAP_CODE_INITIATE, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_INITIATE, ctx['id'],
4 + 1 + 1 + len(payload), 4 + 1 + 1 + len(payload),
EAP_ERP_TYPE_REAUTH_START, 0) + payload EAP_ERP_TYPE_REAUTH_START, 0) + payload
@ -7069,7 +7068,7 @@ def test_eap_proto_expanded(dev, apdev):
eap_proto_expanded_test_done = False eap_proto_expanded_test_done = False
def expanded_handler(ctx, req): def expanded_handler(ctx, req):
logger.info("expanded_handler - RX " + req.encode("hex")) logger.info("expanded_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] += 1 ctx['num'] += 1
@ -7115,7 +7114,7 @@ def test_eap_proto_expanded(dev, apdev):
return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBBHB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 4 + 1 + 16 + 6, 4 + 1 + 4 + 1 + 16 + 6,
EAP_TYPE_MSCHAPV2, EAP_TYPE_MSCHAPV2,
1, 0, 4 + 1 + 16 + 6, 16) + 16*'A' + 'foobar' 1, 0, 4 + 1 + 16 + 6, 16) + 16*b'A' + b'foobar'
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Invalid expanded frame type") logger.info("Test: Invalid expanded frame type")
@ -7180,7 +7179,7 @@ def test_eap_proto_tls(dev, apdev):
eap_proto_tls_test_wait = False eap_proto_tls_test_wait = False
def tls_handler(ctx, req): def tls_handler(ctx, req):
logger.info("tls_handler - RX " + req.encode("hex")) logger.info("tls_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] += 1 ctx['num'] += 1
@ -7279,7 +7278,7 @@ def test_eap_proto_tls(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Fragmented TLS message (long; first)") logger.info("Test: Fragmented TLS message (long; first)")
payload = 1450*'A' payload = 1450*b'A'
return struct.pack(">BBHBBL", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBL", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + 4 + len(payload), 4 + 1 + 1 + 4 + len(payload),
EAP_TYPE_TLS, 0xc0, 65536) + payload EAP_TYPE_TLS, 0xc0, 65536) + payload
@ -7289,7 +7288,7 @@ def test_eap_proto_tls(dev, apdev):
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Test: Fragmented TLS message (long; cont %d)" % i) logger.info("Test: Fragmented TLS message (long; cont %d)" % i)
eap_proto_tls_test_wait = True eap_proto_tls_test_wait = True
payload = 1470*'A' payload = 1470*b'A'
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(payload), 4 + 1 + 1 + len(payload),
EAP_TYPE_TLS, 0x40) + payload EAP_TYPE_TLS, 0x40) + payload
@ -7367,7 +7366,7 @@ def test_eap_proto_tnc(dev, apdev):
eap_proto_tnc_test_done = False eap_proto_tnc_test_done = False
def tnc_handler(ctx, req): def tnc_handler(ctx, req):
logger.info("tnc_handler - RX " + req.encode("hex")) logger.info("tnc_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] += 1 ctx['num'] += 1
@ -7477,8 +7476,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "FOO" resp = b"FOO"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7491,8 +7490,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "</TNCCS-Batch><TNCCS-Batch>" resp = b"</TNCCS-Batch><TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7505,8 +7504,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch foo=3></TNCCS-Batch>" resp = b"<TNCCS-Batch foo=3></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7519,8 +7518,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=123456789></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=123456789></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7533,8 +7532,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=2><IMC-IMV-Message><TNCC-TNCS-Message></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=2><IMC-IMV-Message><TNCC-TNCS-Message></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7550,8 +7549,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=2><IMC-IMV-Message></IMC-IMV-Message><TNCC-TNCS-Message></TNCC-TNCS-Message></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=2><IMC-IMV-Message></IMC-IMV-Message><TNCC-TNCS-Message></TNCC-TNCS-Message></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7567,8 +7566,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML></TNCC-TNCS-Message></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML></TNCC-TNCS-Message></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7584,8 +7583,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type></TNCC-TNCS-Message></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type></TNCC-TNCS-Message></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7601,8 +7600,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><Base64>abc</TNCC-TNCS-Message></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><Base64>abc</TNCC-TNCS-Message></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7618,8 +7617,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><Base64>aGVsbG8=</Base64></TNCC-TNCS-Message></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><Base64>aGVsbG8=</Base64></TNCC-TNCS-Message></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7635,8 +7634,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = "<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML>hello</XML></TNCC-TNCS-Message></TNCCS-Batch>" resp = b"<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML>hello</XML></TNCC-TNCS-Message></TNCCS-Batch>"
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7652,8 +7651,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = '<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML><TNCCS-Recommendation foo=1></TNCCS-Recommendation></XML></TNCC-TNCS-Message></TNCCS-Batch>' resp = b'<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML><TNCCS-Recommendation foo=1></TNCCS-Recommendation></XML></TNCC-TNCS-Message></TNCCS-Batch>'
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7669,8 +7668,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = '<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML><TNCCS-Recommendation type="none"></TNCCS-Recommendation></XML></TNCC-TNCS-Message></TNCCS-Batch>' resp = b'<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML><TNCCS-Recommendation type="none"></TNCCS-Recommendation></XML></TNCC-TNCS-Message></TNCCS-Batch>'
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7686,8 +7685,8 @@ def test_eap_proto_tnc(dev, apdev):
EAP_TYPE_TNC, 0x21) EAP_TYPE_TNC, 0x21)
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("Received TNCCS-Batch: " + req[6:]) logger.info("Received TNCCS-Batch: " + binascii.hexlify(req[6:]).decode())
resp = '<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML><TNCCS-Recommendation type="isolate"></TNCCS-Recommendation></XML></TNCC-TNCS-Message></TNCCS-Batch>' resp = b'<TNCCS-Batch BatchId=2><TNCC-TNCS-Message><Type>00000001</Type><XML><TNCCS-Recommendation type="isolate"></TNCCS-Recommendation></XML></TNCC-TNCS-Message></TNCCS-Batch>'
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(resp), 4 + 1 + 1 + len(resp),
EAP_TYPE_TNC, 0x01) + resp EAP_TYPE_TNC, 0x01) + resp
@ -7733,7 +7732,7 @@ def test_eap_canned_success_after_identity(dev, apdev):
"""EAP protocol tests for canned EAP-Success after identity""" """EAP protocol tests for canned EAP-Success after identity"""
check_eap_capa(dev[0], "MD5") check_eap_capa(dev[0], "MD5")
def eap_canned_success_handler(ctx, req): def eap_canned_success_handler(ctx, req):
logger.info("eap_canned_success_handler - RX " + req.encode("hex")) logger.info("eap_canned_success_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -7789,7 +7788,7 @@ def test_eap_proto_wsc(dev, apdev):
eap_proto_wsc_test_done = False eap_proto_wsc_test_done = False
def wsc_handler(ctx, req): def wsc_handler(ctx, req):
logger.info("wsc_handler - RX " + req.encode("hex")) logger.info("wsc_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] += 1 ctx['num'] += 1
@ -8086,7 +8085,7 @@ def eap_fast_start(ctx):
logger.info("Send EAP-FAST/Start") logger.info("Send EAP-FAST/Start")
return struct.pack(">BBHBBHH", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBBHH", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + 4 + 16, 4 + 1 + 1 + 4 + 16,
EAP_TYPE_FAST, 0x21, 4, 16) + 16*'A' EAP_TYPE_FAST, 0x21, 4, 16) + 16*b'A'
def test_eap_fast_proto(dev, apdev): def test_eap_fast_proto(dev, apdev):
"""EAP-FAST Phase protocol testing""" """EAP-FAST Phase protocol testing"""
@ -8095,7 +8094,7 @@ def test_eap_fast_proto(dev, apdev):
eap_fast_proto_ctx = None eap_fast_proto_ctx = None
def eap_handler(ctx, req): def eap_handler(ctx, req):
logger.info("eap_handler - RX " + req.encode("hex")) logger.info("eap_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1
@ -8114,7 +8113,7 @@ def test_eap_fast_proto(dev, apdev):
idx += 1 idx += 1
if ctx['num'] == idx: if ctx['num'] == idx:
logger.info("EAP-FAST: TLS processing failed") logger.info("EAP-FAST: TLS processing failed")
data = 'ABCDEFGHIK' data = b'ABCDEFGHIK'
return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'], return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
4 + 1 + 1 + len(data), 4 + 1 + 1 + len(data),
EAP_TYPE_FAST, 0x01) + data EAP_TYPE_FAST, 0x01) + data
@ -8204,7 +8203,7 @@ def run_eap_fast_phase2(dev, test_payload, test_failure=True):
EAP_TYPE_FAST, 0x01) + data EAP_TYPE_FAST, 0x01) + data
def eap_handler(ctx, req): def eap_handler(ctx, req):
logger.info("eap_handler - RX " + req.encode("hex")) logger.info("eap_handler - RX " + binascii.hexlify(req).decode())
if 'num' not in ctx: if 'num' not in ctx:
ctx['num'] = 0 ctx['num'] = 0
ctx['num'] = ctx['num'] + 1 ctx['num'] = ctx['num'] + 1

93
tests/hwsim/test_radius.py
View file

@ -448,12 +448,12 @@ def test_radius_das_disconnect(dev, apdev):
dict = pyrad.dictionary.Dictionary("dictionary.radius") dict = pyrad.dictionary.Dictionary("dictionary.radius")
srv = pyrad.client.Client(server="127.0.0.1", acctport=3799, srv = pyrad.client.Client(server="127.0.0.1", acctport=3799,
secret="secret", dict=dict) secret=b"secret", dict=dict)
srv.retries = 1 srv.retries = 1
srv.timeout = 1 srv.timeout = 1
logger.info("Disconnect-Request with incorrect secret") logger.info("Disconnect-Request with incorrect secret")
req = radius_das.DisconnectPacket(dict=dict, secret="incorrect", req = radius_das.DisconnectPacket(dict=dict, secret=b"incorrect",
User_Name="foo", User_Name="foo",
NAS_Identifier="localhost", NAS_Identifier="localhost",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
@ -465,7 +465,7 @@ def test_radius_das_disconnect(dev, apdev):
logger.info("Disconnect-Request with incorrect secret properly ignored") logger.info("Disconnect-Request with incorrect secret properly ignored")
logger.info("Disconnect-Request without Event-Timestamp") logger.info("Disconnect-Request without Event-Timestamp")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
User_Name="psk.user@example.com") User_Name="psk.user@example.com")
logger.debug(req) logger.debug(req)
try: try:
@ -475,7 +475,7 @@ def test_radius_das_disconnect(dev, apdev):
logger.info("Disconnect-Request without Event-Timestamp properly ignored") logger.info("Disconnect-Request without Event-Timestamp properly ignored")
logger.info("Disconnect-Request with non-matching Event-Timestamp") logger.info("Disconnect-Request with non-matching Event-Timestamp")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
User_Name="psk.user@example.com", User_Name="psk.user@example.com",
Event_Timestamp=123456789) Event_Timestamp=123456789)
logger.debug(req) logger.debug(req)
@ -486,57 +486,57 @@ def test_radius_das_disconnect(dev, apdev):
logger.info("Disconnect-Request with non-matching Event-Timestamp properly ignored") logger.info("Disconnect-Request with non-matching Event-Timestamp properly ignored")
logger.info("Disconnect-Request with unsupported attribute") logger.info("Disconnect-Request with unsupported attribute")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
User_Name="foo", User_Name="foo",
User_Password="foo", User_Password="foo",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 401) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 401)
logger.info("Disconnect-Request with invalid Calling-Station-Id") logger.info("Disconnect-Request with invalid Calling-Station-Id")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
User_Name="foo", User_Name="foo",
Calling_Station_Id="foo", Calling_Station_Id="foo",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 407) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 407)
logger.info("Disconnect-Request with mismatching User-Name") logger.info("Disconnect-Request with mismatching User-Name")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
User_Name="foo", User_Name="foo",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503)
logger.info("Disconnect-Request with mismatching Calling-Station-Id") logger.info("Disconnect-Request with mismatching Calling-Station-Id")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Calling_Station_Id="12:34:56:78:90:aa", Calling_Station_Id="12:34:56:78:90:aa",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503)
logger.info("Disconnect-Request with mismatching Acct-Session-Id") logger.info("Disconnect-Request with mismatching Acct-Session-Id")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Acct_Session_Id="12345678-87654321", Acct_Session_Id="12345678-87654321",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503)
logger.info("Disconnect-Request with mismatching Acct-Session-Id (len)") logger.info("Disconnect-Request with mismatching Acct-Session-Id (len)")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Acct_Session_Id="12345678", Acct_Session_Id="12345678",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503)
logger.info("Disconnect-Request with mismatching Acct-Multi-Session-Id") logger.info("Disconnect-Request with mismatching Acct-Multi-Session-Id")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Acct_Multi_Session_Id="12345678+87654321", Acct_Multi_Session_Id="12345678+87654321",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503)
logger.info("Disconnect-Request with mismatching Acct-Multi-Session-Id (len)") logger.info("Disconnect-Request with mismatching Acct-Multi-Session-Id (len)")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Acct_Multi_Session_Id="12345678", Acct_Multi_Session_Id="12345678",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503)
logger.info("Disconnect-Request with no session identification attributes") logger.info("Disconnect-Request with no session identification attributes")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 503)
@ -545,14 +545,14 @@ def test_radius_das_disconnect(dev, apdev):
raise Exception("Unexpected disconnection") raise Exception("Unexpected disconnection")
logger.info("Disconnect-Request with mismatching NAS-IP-Address") logger.info("Disconnect-Request with mismatching NAS-IP-Address")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="192.168.3.4", NAS_IP_Address="192.168.3.4",
Acct_Session_Id=id, Acct_Session_Id=id,
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 403) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, 403)
logger.info("Disconnect-Request with mismatching NAS-Identifier") logger.info("Disconnect-Request with mismatching NAS-Identifier")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_Identifier="unknown.example.com", NAS_Identifier="unknown.example.com",
Acct_Session_Id=id, Acct_Session_Id=id,
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
@ -563,7 +563,7 @@ def test_radius_das_disconnect(dev, apdev):
raise Exception("Unexpected disconnection") raise Exception("Unexpected disconnection")
logger.info("Disconnect-Request with matching Acct-Session-Id") logger.info("Disconnect-Request with matching Acct-Session-Id")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Acct_Session_Id=id, Acct_Session_Id=id,
@ -576,7 +576,7 @@ def test_radius_das_disconnect(dev, apdev):
logger.info("Disconnect-Request with matching Acct-Multi-Session-Id") logger.info("Disconnect-Request with matching Acct-Multi-Session-Id")
sta = hapd.get_sta(addr) sta = hapd.get_sta(addr)
multi_sess_id = sta['authMultiSessionId'] multi_sess_id = sta['authMultiSessionId']
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Acct_Multi_Session_Id=multi_sess_id, Acct_Multi_Session_Id=multi_sess_id,
@ -587,7 +587,7 @@ def test_radius_das_disconnect(dev, apdev):
dev[0].wait_connected(timeout=10, error="Re-connection timed out") dev[0].wait_connected(timeout=10, error="Re-connection timed out")
logger.info("Disconnect-Request with matching User-Name") logger.info("Disconnect-Request with matching User-Name")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
User_Name="psk.user@example.com", User_Name="psk.user@example.com",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
@ -597,7 +597,7 @@ def test_radius_das_disconnect(dev, apdev):
dev[0].wait_connected(timeout=10, error="Re-connection timed out") dev[0].wait_connected(timeout=10, error="Re-connection timed out")
logger.info("Disconnect-Request with matching Calling-Station-Id") logger.info("Disconnect-Request with matching Calling-Station-Id")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
Calling_Station_Id=addr, Calling_Station_Id=addr,
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
@ -612,7 +612,7 @@ def test_radius_das_disconnect(dev, apdev):
dev[0].wait_connected(timeout=10, error="Re-connection timed out") dev[0].wait_connected(timeout=10, error="Re-connection timed out")
logger.info("Disconnect-Request with matching Calling-Station-Id and non-matching CUI") logger.info("Disconnect-Request with matching Calling-Station-Id and non-matching CUI")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Calling_Station_Id=addr, Calling_Station_Id=addr,
Chargeable_User_Identity="foo@example.com", Chargeable_User_Identity="foo@example.com",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
@ -623,7 +623,7 @@ def test_radius_das_disconnect(dev, apdev):
eap="GPSK", identity="gpsk-cui", eap="GPSK", identity="gpsk-cui",
password="abcdefghijklmnop0123456789abcdef", password="abcdefghijklmnop0123456789abcdef",
scan_freq="2412") scan_freq="2412")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
Chargeable_User_Identity="gpsk-chargeable-user-identity", Chargeable_User_Identity="gpsk-chargeable-user-identity",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectACK) send_and_check_reply(srv, req, pyrad.packet.DisconnectACK)
@ -638,14 +638,14 @@ def test_radius_das_disconnect(dev, apdev):
connect(dev[2], "radius-das") connect(dev[2], "radius-das")
logger.info("Disconnect-Request with matching User-Name - multiple sessions matching") logger.info("Disconnect-Request with matching User-Name - multiple sessions matching")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
User_Name="psk.user@example.com", User_Name="psk.user@example.com",
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, error_cause=508) send_and_check_reply(srv, req, pyrad.packet.DisconnectNAK, error_cause=508)
logger.info("Disconnect-Request with User-Name matching multiple sessions, Calling-Station-Id only one") logger.info("Disconnect-Request with User-Name matching multiple sessions, Calling-Station-Id only one")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Calling_Station_Id=addr, Calling_Station_Id=addr,
User_Name="psk.user@example.com", User_Name="psk.user@example.com",
@ -664,7 +664,7 @@ def test_radius_das_disconnect(dev, apdev):
multi_sess_id = sta['authMultiSessionId'] multi_sess_id = sta['authMultiSessionId']
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
dev[0].wait_disconnected(timeout=10) dev[0].wait_disconnected(timeout=10)
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Acct_Multi_Session_Id=multi_sess_id, Acct_Multi_Session_Id=multi_sess_id,
@ -682,7 +682,7 @@ def test_radius_das_disconnect(dev, apdev):
dev[0].wait_disconnected(timeout=10) dev[0].wait_disconnected(timeout=10)
dev[2].request("DISCONNECT") dev[2].request("DISCONNECT")
dev[2].wait_disconnected(timeout=10) dev[2].wait_disconnected(timeout=10)
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
User_Name="psk.user@example.com", User_Name="psk.user@example.com",
@ -692,7 +692,7 @@ def test_radius_das_disconnect(dev, apdev):
logger.info("Disconnect-Request with matching CUI after disassociation") logger.info("Disconnect-Request with matching CUI after disassociation")
dev[1].request("DISCONNECT") dev[1].request("DISCONNECT")
dev[1].wait_disconnected(timeout=10) dev[1].wait_disconnected(timeout=10)
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Chargeable_User_Identity="gpsk-chargeable-user-identity", Chargeable_User_Identity="gpsk-chargeable-user-identity",
@ -707,7 +707,7 @@ def test_radius_das_disconnect(dev, apdev):
dev[0].wait_connected(timeout=15) dev[0].wait_connected(timeout=15)
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
dev[0].wait_disconnected(timeout=10) dev[0].wait_disconnected(timeout=10)
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Calling_Station_Id=addr, Calling_Station_Id=addr,
@ -715,7 +715,7 @@ def test_radius_das_disconnect(dev, apdev):
send_and_check_reply(srv, req, pyrad.packet.DisconnectACK) send_and_check_reply(srv, req, pyrad.packet.DisconnectACK)
logger.info("Disconnect-Request with mismatching Calling-Station-Id after disassociation") logger.info("Disconnect-Request with mismatching Calling-Station-Id after disassociation")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Calling_Station_Id=addr, Calling_Station_Id=addr,
@ -729,13 +729,13 @@ def add_message_auth_req(req):
hmac_obj.update(struct.pack("B", req.id)) hmac_obj.update(struct.pack("B", req.id))
# request attributes # request attributes
req.AddAttribute("Message-Authenticator", 16*"\x00") req.AddAttribute("Message-Authenticator", 16*b"\x00")
attrs = req._PktEncodeAttributes() attrs = req._PktEncodeAttributes()
# Length # Length
flen = 4 + 16 + len(attrs) flen = 4 + 16 + len(attrs)
hmac_obj.update(struct.pack(">H", flen)) hmac_obj.update(struct.pack(">H", flen))
hmac_obj.update(16*"\x00") # all zeros Authenticator in calculation hmac_obj.update(16*b"\x00") # all zeros Authenticator in calculation
hmac_obj.update(attrs) hmac_obj.update(attrs)
del req[80] del req[80]
req.AddAttribute("Message-Authenticator", hmac_obj.digest()) req.AddAttribute("Message-Authenticator", hmac_obj.digest())
@ -767,12 +767,12 @@ def test_radius_das_disconnect_time_window(dev, apdev):
dict = pyrad.dictionary.Dictionary("dictionary.radius") dict = pyrad.dictionary.Dictionary("dictionary.radius")
srv = pyrad.client.Client(server="127.0.0.1", acctport=3799, srv = pyrad.client.Client(server="127.0.0.1", acctport=3799,
secret="secret", dict=dict) secret=b"secret", dict=dict)
srv.retries = 1 srv.retries = 1
srv.timeout = 1 srv.timeout = 1
logger.info("Disconnect-Request with unsupported attribute") logger.info("Disconnect-Request with unsupported attribute")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Calling_Station_Id=addr, Calling_Station_Id=addr,
@ -786,7 +786,7 @@ def test_radius_das_disconnect_time_window(dev, apdev):
logger.info("Disconnect-Request with non-matching Event-Timestamp properly ignored") logger.info("Disconnect-Request with non-matching Event-Timestamp properly ignored")
logger.info("Disconnect-Request with unsupported attribute") logger.info("Disconnect-Request with unsupported attribute")
req = radius_das.DisconnectPacket(dict=dict, secret="secret", req = radius_das.DisconnectPacket(dict=dict, secret=b"secret",
NAS_IP_Address="127.0.0.1", NAS_IP_Address="127.0.0.1",
NAS_Identifier="nas.example.com", NAS_Identifier="nas.example.com",
Calling_Station_Id=addr, Calling_Station_Id=addr,
@ -817,13 +817,13 @@ def test_radius_das_coa(dev, apdev):
dict = pyrad.dictionary.Dictionary("dictionary.radius") dict = pyrad.dictionary.Dictionary("dictionary.radius")
srv = pyrad.client.Client(server="127.0.0.1", acctport=3799, srv = pyrad.client.Client(server="127.0.0.1", acctport=3799,
secret="secret", dict=dict) secret=b"secret", dict=dict)
srv.retries = 1 srv.retries = 1
srv.timeout = 1 srv.timeout = 1
# hostapd does not currently support CoA-Request, so NAK is expected # hostapd does not currently support CoA-Request, so NAK is expected
logger.info("CoA-Request with matching Acct-Session-Id") logger.info("CoA-Request with matching Acct-Session-Id")
req = radius_das.CoAPacket(dict=dict, secret="secret", req = radius_das.CoAPacket(dict=dict, secret=b"secret",
Acct_Session_Id=id, Acct_Session_Id=id,
Event_Timestamp=int(time.time())) Event_Timestamp=int(time.time()))
send_and_check_reply(srv, req, pyrad.packet.CoANAK, error_cause=405) send_and_check_reply(srv, req, pyrad.packet.CoANAK, error_cause=405)
@ -1004,7 +1004,7 @@ def test_radius_protocol(dev, apdev):
logger.info("Add Message-Authenticator") logger.info("Add Message-Authenticator")
if self.t_events['wrong_secret'].is_set(): if self.t_events['wrong_secret'].is_set():
logger.info("Use incorrect RADIUS shared secret") logger.info("Use incorrect RADIUS shared secret")
pw = "incorrect" pw = b"incorrect"
else: else:
pw = reply.secret pw = reply.secret
hmac_obj = hmac.new(pw) hmac_obj = hmac.new(pw)
@ -1012,8 +1012,7 @@ def test_radius_protocol(dev, apdev):
hmac_obj.update(struct.pack("B", reply.id)) hmac_obj.update(struct.pack("B", reply.id))
# reply attributes # reply attributes
reply.AddAttribute("Message-Authenticator", reply.AddAttribute("Message-Authenticator", 16*b"\x00")
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
attrs = reply._PktEncodeAttributes() attrs = reply._PktEncodeAttributes()
# Length # Length
@ -1050,7 +1049,7 @@ def test_radius_protocol(dev, apdev):
srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"), srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"),
authport=18138, acctport=18139) authport=18138, acctport=18139)
srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1", srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1",
"radius", b"radius",
"localhost") "localhost")
srv.BindToAddress("") srv.BindToAddress("")
t_events = {} t_events = {}
@ -1094,7 +1093,8 @@ def test_radius_protocol(dev, apdev):
t.join() t.join()
def build_tunnel_password(secret, authenticator, psk): def build_tunnel_password(secret, authenticator, psk):
a = "\xab\xcd" a = b"\xab\xcd"
psk = psk.encode()
padlen = 16 - (1 + len(psk)) % 16 padlen = 16 - (1 + len(psk)) % 16
if padlen == 16: if padlen == 16:
padlen = 0 padlen = 0
@ -1108,7 +1108,7 @@ def build_tunnel_password(secret, authenticator, psk):
cc = bytearray(pp[i] ^ bb[i] for i in range(len(bb))) cc = bytearray(pp[i] ^ bb[i] for i in range(len(bb)))
cc_all += cc cc_all += cc
b = hashlib.md5(secret + cc).digest() b = hashlib.md5(secret + cc).digest()
data = '\x00' + a + bytes(cc_all) data = b'\x00' + a + bytes(cc_all)
return data return data
def start_radius_psk_server(psk, invalid_code=False, acct_interim_interval=0, def start_radius_psk_server(psk, invalid_code=False, acct_interim_interval=0,
@ -1163,7 +1163,7 @@ def start_radius_psk_server(psk, invalid_code=False, acct_interim_interval=0,
srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"), srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"),
authport=18138, acctport=18139) authport=18138, acctport=18139)
srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1", srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1",
"radius", b"radius",
"localhost") "localhost")
srv.BindToAddress("") srv.BindToAddress("")
t_events = {} t_events = {}
@ -1349,8 +1349,7 @@ def add_message_auth(req):
hmac_obj.update(struct.pack("B", req.id)) hmac_obj.update(struct.pack("B", req.id))
# request attributes # request attributes
req.AddAttribute("Message-Authenticator", req.AddAttribute("Message-Authenticator", 16*b"\x00")
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
attrs = req._PktEncodeAttributes() attrs = req._PktEncodeAttributes()
# Length # Length
@ -1372,14 +1371,14 @@ def test_radius_server_failures(dev, apdev):
dict = pyrad.dictionary.Dictionary("dictionary.radius") dict = pyrad.dictionary.Dictionary("dictionary.radius")
client = pyrad.client.Client(server="127.0.0.1", authport=1812, client = pyrad.client.Client(server="127.0.0.1", authport=1812,
secret="radius", dict=dict) secret=b"radius", dict=dict)
client.retries = 1 client.retries = 1
client.timeout = 1 client.timeout = 1
# unexpected State # unexpected State
req = client.CreateAuthPacket(code=pyrad.packet.AccessRequest, req = client.CreateAuthPacket(code=pyrad.packet.AccessRequest,
User_Name="foo") User_Name="foo")
req['State'] = 'foo-state' req['State'] = b'foo-state'
add_message_auth(req) add_message_auth(req)
reply = client.SendPacket(req) reply = client.SendPacket(req)
if reply.code != pyrad.packet.AccessReject: if reply.code != pyrad.packet.AccessReject:
@ -1442,7 +1441,7 @@ def test_ap_vlan_wpa2_psk_radius_required(dev, apdev):
srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"), srv = TestServer(dict=pyrad.dictionary.Dictionary("dictionary.radius"),
authport=18138, acctport=18139) authport=18138, acctport=18139)
srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1", srv.hosts["127.0.0.1"] = pyrad.server.RemoteHost("127.0.0.1",
"radius", b"radius",
"localhost") "localhost")
srv.BindToAddress("") srv.BindToAddress("")
t_events = {} t_events = {}