From 8fe3844e91399cb7abb5dfd19fdc2b134cdb2b0b Mon Sep 17 00:00:00 2001 From: huitema Date: Thu, 28 May 2026 17:33:52 -0700 Subject: [PATCH] Sanitize CC codes --- resolver/rsv_pdns.py | 4 ++++ resolver/rsv_zombie_p.py | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/resolver/rsv_pdns.py b/resolver/rsv_pdns.py index 4eea612..d219b2e 100644 --- a/resolver/rsv_pdns.py +++ b/resolver/rsv_pdns.py @@ -764,6 +764,10 @@ def add_query(self, uid, query_cc, query_AS, query_time, query_ad_time, query_rr if self.current.query_time == 0: self.current.query_time = query_time + query_cc = str(query_cc) + if len(query_cc) != 2: + query_cc = 'ZZ' + #if query_time > query_ad_time + self.zombie_max: # self.zombie_max = query_time - query_ad_time # print("Zombie: " + str(self.zombie_max)) diff --git a/resolver/rsv_zombie_p.py b/resolver/rsv_zombie_p.py index b67f9a2..a8142da 100644 --- a/resolver/rsv_zombie_p.py +++ b/resolver/rsv_zombie_p.py @@ -116,6 +116,9 @@ def get_prov(resolver_cc, resolver_AS, resolver_tag): if resolver_tag in Pdns_index: prov = resolver_tag else: + resolver_cc = str(resolver_cc) + if len(resolver_cc) > 2: + resolver_cc = 'ZZ' prov = resolver_cc + '-' + resolver_AS return prov @@ -171,6 +174,9 @@ def __init__(self, ip2a4, ip2a6, as_names): def add(self, query_cc, query_AS, rr_type, resolver_cc, resolver_AS, resolver_tag, nb): if len(str(query_cc)) != 2: query_cc = 'ZZ' + else: + query_cc = str(query_cc); + key = str(query_cc) + '-' + query_AS if not key in self.zombie_AS: self.zombie_AS[key] = zombie_cc_as(query_cc, query_AS)