Try adding a script for generating the GeoIP ACLs

Signed-off-by: Rick Elrod <relrod@redhat.com>

roles/dns/files/GeoIP.sh

@@ -1,31 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# Rick Elrod <relrod@redhat.com>
+# (c) 2019 Red Hat, Inc.
+# etc.
 
-# This copyrighted material is made available to anyone wishing to use, modify,
+# Fail early
-# copy, or redistribute it subject to the terms and conditions of the GNU
+set -e
-# General Public License v.2.  This program is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
-# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.  You should have
-# received a copy of the GNU General Public License along with this program;
-# if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301, USA.
 
-rm -f /root/GeoIPCountryCSV.zip
+rm -f GeoLite2-Country-CSV.zip csvs/*
-
+rmdir csvs
-wget -q -T 5 -t 1 http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
-unzip -q GeoIPCountryCSV.zip || exit 1
-
-awk -F \" '{print $10","$6","$8}' GeoIPCountryWhois.csv > cbe.csv
-rm -f GeoIPCountryWhois.csv
-
-(for c in $(awk -F , '{print $1}' cbe.csv | sort -u)
-do
-  echo "acl \"$c\" {"
-  grep "^$c," cbe.csv | awk -F , 'function s(b,e,l,m,n) {l = int(log(e-b+1)/log(2)); m = 2^32-2^l; n = and(m,e); if (n == and(m,b)) printf "\t%u.%u.%u.%u/%u;\n",b/2^24%256,b/2^16%256,b/2^8%256,b%256,32-l; else {s(b,n-1); s(n,e)}} s($2,$3)'
-  echo -e "};\n"
-done) > /var/named/GeoIP.acl
-
-rm -f cbe.csv
-
-exit 0
 
+wget -q -T 5 -t 1 https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip
+unzip -j GeoLite2-Country-CSV.zip -d csvs/
+python geoip.py csvs/GeoLite2-Country-Blocks-IPv4.csv csvs/GeoLite2-Country-Blocks-IPv6.csv csvs/GeoLite2-Country-Locations-en.csv > /var/named/GeoIP.acl

roles/dns/files/geoip.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+# (c) 2019 Red Hat, Inc.
+# Rick Elrod <relrod@redhat.com>
+# etc.
+
+import csv
+import sys
+
+if len(sys.argv) != 4:
+    print "Usage: geoip-to-acl.py <GeoLite2-Country-Blocks-IPv4.csv> "\
+          "<GeoLite2-Country-Blocks-IPv6.csv> "\
+          "<GeoLite2-Country-Locations-en.csv>"
+    sys.exit(1)
+
+v4blocks = sys.argv[1]
+v6blocks = sys.argv[2]
+locations = sys.argv[3]
+
+location_map = {}
+subnet_map = {}
+
+with open(locations) as loc_in:
+    reader = csv.reader(loc_in)
+    # Skip the header line
+    reader.next()
+    for row in reader:
+        # If we have a narrowed down country, use it.
+        # Otherwise, use the continent.
+        if row[4] == '':
+            location_map[int(row[0])] = row[2]
+        else:
+            location_map[int(row[0])] = row[4]
+
+# Handle v4
+with open(v4blocks) as v4_in:
+    reader = csv.reader(v4_in)
+    # Skip the header line
+    reader.next()
+    for row in reader:
+        # Figure out if we need to use row[1] or row[2]
+        if row[1] == '' and row[2] == '':
+            # If the subnet has no country attached to it at all (??), skip it.
+            continue
+        elif row[2] == '':
+            geo_code = location_map[int(row[1])]
+        else:
+            geo_code = location_map[int(row[2])]
+
+        if subnet_map.get(geo_code):
+            subnet_map[geo_code].append(row[0])
+        else:
+            subnet_map[geo_code] = [row[0]]
+
+# Handle v6
+with open(v6blocks) as v6_in:
+    reader = csv.reader(v6_in)
+    # Skip the header line
+    reader.next()
+    for row in reader:
+        # Figure out if we need to use row[1] or row[2]
+        if row[1] == '' and row[2] == '':
+            # If the subnet has no country attached to it at all (??), skip it.
+            continue
+        elif row[2] == '':
+            geo_code = location_map[int(row[1])]
+        else:
+            geo_code = location_map[int(row[2])]
+
+        if subnet_map.get(geo_code):
+            subnet_map[geo_code].append(row[0])
+        else:
+            subnet_map[geo_code] = [row[0]]
+
+# And generate the ACLs
+for k,v in sorted(subnet_map.iteritems()):
+    print 'acl "%s" {' % k
+    for subnet in v:
+        print '\t%s;' % subnet
+    print '};'
+    print ''

roles/dns/tasks/main.yml

@@ -35,6 +35,14 @@
   - config
   - dns
 
+- name: copy geoip.py
+  copy: src=geoip.py dest=/var/named/geoip.py mode=0755
+  notify:
+  - restart named
+  tags:
+  - config
+  - dns
+
 - name: copy GeoIP.sh
   copy: src=GeoIP.sh dest=/var/named/GeoIP.sh mode=0755
   notify: