From bf0ff88fb663659da44d6039a0038ac7254a285e Mon Sep 17 00:00:00 2001 From: Richard Gibson Date: Tue, 16 Oct 2018 21:02:56 -0400 Subject: [PATCH] dnsdist: Confirm presentation of valid UTF-8 in trailing data as individual octets --- regression-tests.dnsdist/test_Trailing.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regression-tests.dnsdist/test_Trailing.py b/regression-tests.dnsdist/test_Trailing.py index adfb781b9e..a9c74b5855 100644 --- a/regression-tests.dnsdist/test_Trailing.py +++ b/regression-tests.dnsdist/test_Trailing.py @@ -204,14 +204,14 @@ class TestTrailingDataToDnsdist(DNSDistTest): function reportTrailingHex(dq) local tail = dq:getTrailingData() local hex = string.gsub(tail, ".", function(ch) - return string.format("\\x2502X", string.byte(ch)) + return string.sub(string.format("\\x2502X", string.byte(ch)), -2) end) return DNSAction.Spoof, "-0x" .. hex .. ".echoed-hex.trailing.tests.powerdns.com." end addLuaAction("echoed-hex.trailing.tests.powerdns.com.", reportTrailingHex) function replaceTrailingData_unsafe(dq) - local success = dq:setTrailingData("\\xB0\\x00\\x00\\xDE\\xAD.") + local success = dq:setTrailingData("\\xB0\\x00\\xDE\\xADB\\xF0\\x9F\\x91\\xBB\\xC3\\xBE") if not success then return DNSAction.ServFail, "" end @@ -388,7 +388,7 @@ class TestTrailingDataToDnsdist(DNSDistTest): 60, dns.rdataclass.IN, dns.rdatatype.CNAME, - '-0xB00000DEAD2E.echoed-hex.trailing.tests.powerdns.com.') + '-0xB000DEAD42F09F91BBC3BE.echoed-hex.trailing.tests.powerdns.com.') expectedResponse.answer.append(rrset) raw = query.to_wire() -- 2.47.2