From dd97a7857c486fe0aa4908e4f8af0d1f0b08ca6f Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Mon, 10 Aug 2020 14:17:29 +0200 Subject: [PATCH] Check appliedPolicyTrigger in protobuf regress test --- regression-tests.recursor-dnssec/test_Protobuf.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py index 689f5478db..2ff681d4d3 100644 --- a/regression-tests.recursor-dnssec/test_Protobuf.py +++ b/regression-tests.recursor-dnssec/test_Protobuf.py @@ -194,12 +194,14 @@ class TestRecursorProtobuf(RecursorTest): self.assertEquals(record.ttl, rttl) self.assertTrue(record.HasField('rdata')) - def checkProtobufPolicy(self, msg, policyType, reason): + def checkProtobufPolicy(self, msg, policyType, reason, name): self.assertEquals(msg.type, dnsmessage_pb2.PBDNSMessage.DNSResponseType) self.assertTrue(msg.response.HasField('appliedPolicyType')) self.assertTrue(msg.response.HasField('appliedPolicy')) + self.assertTrue(msg.response.HasField('appliedPolicyTrigger')) self.assertEquals(msg.response.appliedPolicy, reason) self.assertEquals(msg.response.appliedPolicyType, policyType) + self.assertEquals(msg.response.appliedPolicyTrigger, name) def checkProtobufTags(self, msg, tags): print(tags) @@ -859,7 +861,7 @@ sub.test 3600 IN A 192.0.2.42 # then the response msg = self.getFirstProtobufMessage() self.checkProtobufResponse(msg, dnsmessage_pb2.PBDNSMessage.UDP, res) - self.checkProtobufPolicy(msg, dnsmessage_pb2.PBDNSMessage.PolicyType.QNAME, 'zone.rpz.') + self.checkProtobufPolicy(msg, dnsmessage_pb2.PBDNSMessage.PolicyType.QNAME, 'zone.rpz.', '*.test.example.') self.assertEquals(len(msg.response.rrs), 1) rr = msg.response.rrs[0] # we have max-cache-ttl set to 15 @@ -926,7 +928,7 @@ sub.test 3600 IN A 192.0.2.42 # then the response msg = self.getFirstProtobufMessage() self.checkProtobufResponse(msg, dnsmessage_pb2.PBDNSMessage.UDP, res) - self.checkProtobufPolicy(msg, dnsmessage_pb2.PBDNSMessage.PolicyType.QNAME, 'zone.rpz.') + self.checkProtobufPolicy(msg, dnsmessage_pb2.PBDNSMessage.PolicyType.QNAME, 'zone.rpz.', '*.test.example.') self.checkProtobufTags(msg, self._tags + self._tags_from_gettag + self._tags_from_rpz) self.assertEquals(len(msg.response.rrs), 1) rr = msg.response.rrs[0] -- 2.47.2