python: Correctly set log level for root logger

[location/libloc.git] / src / python / location-importer.in

diff --git a/src/python/location-importer.in b/src/python/location-importer.in
index 645144acc2e627ba9703233e0de937714be9c784..45cacad81c58db8b0aeed25cac7333092c54049e 100644 (file)
--- a/src/python/location-importer.in
+++ b/src/python/location-importer.in
@@ -93,7 +93,7 @@ class CLI(object):
 
                # Enable debug logging
                if args.debug:
-                       log.setLevel(logging.DEBUG)
+                       location.logger.set_level(logging.DEBUG)
 
                # Print usage if no action was given
                if not "func" in args:
@@ -216,20 +216,54 @@ class CLI(object):
                # Select all known networks
                rows = self.db.query("""
                        SELECT
+                               DISTINCT ON (announcements.network)
                                announcements.network AS network,
                                announcements.autnum AS autnum,
-                               (
-                                       SELECT networks.country FROM networks
-                                               WHERE announcements.network <<= networks.network
-                                               ORDER BY masklen(networks.network) DESC
-                                               LIMIT 1
-                               ) AS country,
+                               networks.country AS country,
+
+                               -- Must be part of returned values for ORDER BY clause
+                               masklen(networks.network) AS sort,
 
                                -- Flags
-                               FALSE AS is_anonymous_proxy,
-                               FALSE AS is_satellite_provider,
-                               FALSE AS is_anycast
+                               COALESCE(
+                                       (
+                                               SELECT is_anonymous_proxy FROM network_overrides overrides
+                                                       WHERE announcements.network <<= overrides.network
+                                                       ORDER BY masklen(overrides.network) DESC
+                                                       LIMIT 1
+                                       ),
+                                       (
+                                               SELECT is_anonymous_proxy FROM autnum_overrides overrides
+                                                       WHERE announcements.autnum = overrides.number
+                                       )
+                               ) AS is_anonymous_proxy,
+                               COALESCE(
+                                       (
+                                               SELECT is_satellite_provider FROM network_overrides overrides
+                                                       WHERE announcements.network <<= overrides.network
+                                                       ORDER BY masklen(overrides.network) DESC
+                                                       LIMIT 1
+                                       ),
+                                       (
+                                               SELECT is_satellite_provider FROM autnum_overrides overrides
+                                                       WHERE announcements.autnum = overrides.number
+                                       )
+                               ) AS is_satellite_provider,
+                               COALESCE(
+                                       (
+                                               SELECT is_anycast FROM network_overrides overrides
+                                                       WHERE announcements.network <<= overrides.network
+                                                       ORDER BY masklen(overrides.network) DESC
+                                                       LIMIT 1
+                                       ),
+                                       (
+                                               SELECT is_anycast FROM autnum_overrides overrides
+                                                       WHERE announcements.autnum = overrides.number
+                                       )
+                               ) AS is_anycast
                        FROM announcements
+                               LEFT JOIN networks ON announcements.network <<= networks.network
+                       ORDER BY announcements.network, sort DESC
                """)
 
                for row in rows:
@@ -389,6 +423,7 @@ class CLI(object):
                        prefix = int(prefix)
                except:
                        log.warning("Invalid prefix: %s" % prefix)
+                       return
 
                # Fix prefix length for IPv4
                if type == "ipv4":
@@ -458,6 +493,10 @@ class CLI(object):
                                                        # Convert network to string
                                                        network = network.decode()
 
+                                                       # Append /24 for IPv4 addresses
+                                                       if not "/" in network and not ":" in network:
+                                                               network = "%s/24" % network
+
                                                        # Convert AS number to integer
                                                        autnum = int(autnum)
 
@@ -479,11 +518,37 @@ class CLI(object):
                                        -- Delete anything that is not global unicast address space
                                        DELETE FROM announcements WHERE family(network) = 6 AND NOT network <<= '2000::/3';
 
-                                       -- DELETE RFC1918 address space
+                                       -- DELETE "current network" address space
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '0.0.0.0/8';
+
+                                       -- DELETE local loopback address space
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '127.0.0.0/8';
+
+                                       -- DELETE RFC 1918 address space
                                        DELETE FROM announcements WHERE family(network) = 4 AND network <<= '10.0.0.0/8';
                                        DELETE FROM announcements WHERE family(network) = 4 AND network <<= '172.16.0.0/12';
                                        DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.168.0.0/16';
 
+                                       -- DELETE test, benchmark and documentation address space
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.0.0.0/24';
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.0.2.0/24';
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '198.18.0.0/15';
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '198.51.100.0/24';
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '203.0.113.0/24';
+
+                                       -- DELETE CGNAT address space (RFC 6598)
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '100.64.0.0/10';
+
+                                       -- DELETE link local address space
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '169.254.0.0/16';
+
+                                       -- DELETE IPv6 to IPv4 (6to4) address space
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.88.99.0/24';
+
+                                       -- DELETE multicast and reserved address space
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '224.0.0.0/4';
+                                       DELETE FROM announcements WHERE family(network) = 4 AND network <<= '240.0.0.0/4';
+
                                        -- Delete networks that are too small to be in the global routing table
                                        DELETE FROM announcements WHERE family(network) = 6 AND masklen(network) > 48;
                                        DELETE FROM announcements WHERE family(network) = 4 AND masklen(network) > 24;
@@ -530,7 +595,7 @@ class CLI(object):
                                                                        is_anonymous_proxy,
                                                                        is_satellite_provider,
                                                                        is_anycast
-                                                               ) VALUES (%s, %s, %s, %s)
+                                                               ) VALUES (%s, %s, %s, %s, %s)
                                                                ON CONFLICT (network) DO NOTHING""",
                                                                "%s" % network,
                                                                block.get("country"),