修复cdn判断问题

modules/iscdn.py

@@ -37,11 +37,13 @@ def check_header_key(header):
             return True
 
 
-def check_cdn_cidr(ip):
+def check_cdn_cidr(content):
-    ip = ipaddress.ip_address(ip)
+    ips = set(content.split(','))
-    for cidr in cdn_ip_cidr:
+    for ip in ips:
-        if ip in ipaddress.ip_network(cidr):
+        ip = ipaddress.ip_address(ip)
-            return True
+        for cidr in cdn_ip_cidr:
+            if ip in ipaddress.ip_network(cidr):
+                return True
 
 
 def check_cdn_asn(asn):
@@ -55,7 +57,7 @@ def check_cdn(data):
         if cname:
             if check_cname_keyword(cname):
                 data[index]['cdn'] = 1
-                break
+                continue
         header = item.get('header')
         if header:
             header = json.loads(header)
@@ -63,9 +65,9 @@ def check_cdn(data):
                 data[index]['cdn'] = 1
                 continue
         kind = item.get('type')
-        ip = item.get('content')
+        content = item.get('content')
-        if kind == 'A' and ip:
+        if kind == 'A' and content:
-            if check_cdn_cidr(ip):
+            if check_cdn_cidr(content):
                 data[index]['cdn'] = 1
                 continue
         asn = item.get('asn')