Sanitize CC codes

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))

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)