Merge pull request #18 from nbareil/master

No attribute filtering

lists/microsoft-office365/list.json

@@ -1336,5 +1336,11 @@
     "2a01:111:f400:7c00::/54",
     "2a01:111:f403::/48"
   ],
-  "version": "20161206"
+  "matching_attributes": [
+      "ip-src",
+      "ip-dst",
+      "domain|ip",
+      "hostname"
+  ],
+  "version": "20170127"
 }

lists/public-dns-v4/list.json

@@ -96085,11 +96085,11 @@
         "zz2013433001d30fccb2.userreverse.dion.ne.jp.",
         "zz2014403768d2c78302.userreverse.dion.ne.jp."
     ],
-    "matching_attribute": [
+    "matching_attributes": [
         "ip-src",
         "ip-dst",
         "domain|ip"
     ],
     "name": "List of known IPv4 public DNS resolvers",
     "version": "20160803"
-}
+}

lists/public-dns-v6/list.json

@@ -174,11 +174,11 @@
         "yardbird.cns.ipv6.vt.edu.",
         "zen.stack.nl."
     ],
-    "matching_attribute": [
+    "matching_attributes": [
         "ip-src",
         "ip-dst",
         "domain|ip"
     ],
     "name": "List of known IPv6 public DNS resolvers",
     "version": "20160803"
-}
+}

tools/generate-publicdns.py

@@ -49,7 +49,7 @@ out4_list = {}
 out4_list['name'] = 'List of known IPv4 public DNS resolvers'
 out4_list['version'] = version
 out4_list['description'] = 'Event contains one or more public IPv4 DNS resolvers as attribute with an IDS flag set'
-out4_list['matching_attribute'] = [ 'ip-src', 'ip-dst', 'domain|ip' ]
+out4_list['matching_attributes'] = [ 'ip-src', 'ip-dst', 'domain|ip' ]
 out4_list['list'] = sorted(ip4_list)
 
 
@@ -57,7 +57,7 @@ out6_list = {}
 out6_list['name'] = 'List of known IPv6 public DNS resolvers'
 out6_list['version'] = version
 out6_list['description'] = 'Event contains one or more public IPv6 DNS resolvers as attribute with an IDS flag set'
-out6_list['matching_attribute'] = [ 'ip-src', 'ip-dst', 'domain|ip' ]
+out6_list['matching_attributes'] = [ 'ip-src', 'ip-dst', 'domain|ip' ]
 out6_list['list'] = sorted(ip6_list)