From 4d4b39c102d3f4114343559644d3fd589ce0c69e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 29 May 2024 13:17:54 +0200 Subject: [PATCH] python:tests/dns_base: let verify_packet() work against Windows BUG: https://bugzilla.samba.org/show_bug.cgi?id=13019 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett (cherry picked from commit 8324d0739dfdd0a081c403e298a9038ee7df681f) --- python/samba/tests/dns_base.py | 11 ++++++++++- selftest/knownfail.d/dns_tkey | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python/samba/tests/dns_base.py b/python/samba/tests/dns_base.py index b8afc1f22a2..3d751faee5c 100644 --- a/python/samba/tests/dns_base.py +++ b/python/samba/tests/dns_base.py @@ -353,6 +353,15 @@ class DNSTKeyTest(DNSTest): self.assertEqual(response.arcount, 1) self.assertEqual(response.additional[0].rr_type, dns.DNS_QTYPE_TSIG) + if self.tkey['algorithm'] == "gss-tsig": + gss_tsig = True + else: + gss_tsig = False + + request_mac_len = b"" + if len(request_mac) > 0 and gss_tsig: + request_mac_len = struct.pack('!H', len(request_mac)) + tsig_record = response.additional[0].rdata mac = bytes(tsig_record.mac) @@ -378,7 +387,7 @@ class DNSTKeyTest(DNSTest): fake_tsig.other_data = tsig_record.other_data fake_tsig_packet = ndr.ndr_pack(fake_tsig) - data = request_mac + response_packet_wo_tsig + fake_tsig_packet + data = request_mac_len + request_mac + response_packet_wo_tsig + fake_tsig_packet try: self.tkey['gensec'].check_packet(data, data, mac) except NTSTATUSError as nt: diff --git a/selftest/knownfail.d/dns_tkey b/selftest/knownfail.d/dns_tkey index f1889609e6d..19fe5c8bde3 100644 --- a/selftest/knownfail.d/dns_tkey +++ b/selftest/knownfail.d/dns_tkey @@ -9,3 +9,5 @@ ^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_tsig_bad_algorithm.fl2008r2dc ^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_tsig_changed_algorithm1.fl2008r2dc ^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_tsig_changed_algorithm2.fl2008r2dc +^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_gss_tsig_tkey_req_additional.fl2008r2dc +^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_tsig_windows.fl2008r2dc -- 2.47.2