From: "Peter Müller" <peter.mueller@ipfire.org>
To: location@lists.ipfire.org
Subject: [PATCH 2/2] importer.py: add source information for RIR data feeds
Date: Sat, 15 May 2021 11:57:05 +0000 [thread overview]
Message-ID: <20210515115705.9794-2-peter.mueller@ipfire.org> (raw)
In-Reply-To: <20210515115705.9794-1-peter.mueller@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 3846 bytes --]
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
src/python/importer.py | 66 +++++++++++++++++++++++++++---------------
1 file changed, 42 insertions(+), 24 deletions(-)
diff --git a/src/python/importer.py b/src/python/importer.py
index 5f46bc3..4c8406c 100644
--- a/src/python/importer.py
+++ b/src/python/importer.py
@@ -25,50 +25,68 @@ import urllib.request
log = logging.getLogger("location.importer")
log.propagate = 1
-WHOIS_SOURCES = (
+WHOIS_SOURCES = {
# African Network Information Centre
- "https://ftp.afrinic.net/pub/pub/dbase/afrinic.db.gz",
+ "AFRINIC": [
+ "https://ftp.afrinic.net/pub/pub/dbase/afrinic.db.gz"
+ ],
# Asia Pacific Network Information Centre
- "https://ftp.apnic.net/apnic/whois/apnic.db.inet6num.gz",
- "https://ftp.apnic.net/apnic/whois/apnic.db.inetnum.gz",
- #"https://ftp.apnic.net/apnic/whois/apnic.db.route6.gz",
- #"https://ftp.apnic.net/apnic/whois/apnic.db.route.gz",
- "https://ftp.apnic.net/apnic/whois/apnic.db.aut-num.gz",
- "https://ftp.apnic.net/apnic/whois/apnic.db.organisation.gz",
+ "APNIC": [
+ "https://ftp.apnic.net/apnic/whois/apnic.db.inet6num.gz",
+ "https://ftp.apnic.net/apnic/whois/apnic.db.inetnum.gz",
+ #"https://ftp.apnic.net/apnic/whois/apnic.db.route6.gz",
+ #"https://ftp.apnic.net/apnic/whois/apnic.db.route.gz",
+ "https://ftp.apnic.net/apnic/whois/apnic.db.aut-num.gz",
+ "https://ftp.apnic.net/apnic/whois/apnic.db.organisation.gz"
+ ],
# American Registry for Internet Numbers
# XXX there is nothing useful for us in here
- #"https://ftp.arin.net/pub/rr/arin.db",
+ # ARIN: [
+ # "https://ftp.arin.net/pub/rr/arin.db"
+ # ],
# Latin America and Caribbean Network Information Centre
# XXX ???
# Réseaux IP Européens
- "https://ftp.ripe.net/ripe/dbase/split/ripe.db.inet6num.gz",
- "https://ftp.ripe.net/ripe/dbase/split/ripe.db.inetnum.gz",
- #"https://ftp.ripe.net/ripe/dbase/split/ripe.db.route6.gz",
- #"https://ftp.ripe.net/ripe/dbase/split/ripe.db.route.gz",
- "https://ftp.ripe.net/ripe/dbase/split/ripe.db.aut-num.gz",
- "https://ftp.ripe.net/ripe/dbase/split/ripe.db.organisation.gz",
-)
-
-EXTENDED_SOURCES = (
+ "RIPE": [
+ "https://ftp.ripe.net/ripe/dbase/split/ripe.db.inet6num.gz",
+ "https://ftp.ripe.net/ripe/dbase/split/ripe.db.inetnum.gz",
+ #"https://ftp.ripe.net/ripe/dbase/split/ripe.db.route6.gz",
+ #"https://ftp.ripe.net/ripe/dbase/split/ripe.db.route.gz",
+ "https://ftp.ripe.net/ripe/dbase/split/ripe.db.aut-num.gz",
+ "https://ftp.ripe.net/ripe/dbase/split/ripe.db.organisation.gz"
+ ],
+}
+
+EXTENDED_SOURCES = {
# African Network Information Centre
- #"https://ftp.afrinic.net/pub/stats/afrinic/delegated-afrinic-extended-latest",
+ # "ARIN": [
+ # "https://ftp.afrinic.net/pub/stats/afrinic/delegated-afrinic-extended-latest"
+ # ],
# Asia Pacific Network Information Centre
- #"https://ftp.apnic.net/apnic/stats/apnic/delegated-apnic-extended-latest",
+ # "APNIC": [
+ # "https://ftp.apnic.net/apnic/stats/apnic/delegated-apnic-extended-latest"
+ # ],
# American Registry for Internet Numbers
- "https://ftp.arin.net/pub/stats/arin/delegated-arin-extended-latest",
+ "ARIN": [
+ "https://ftp.arin.net/pub/stats/arin/delegated-arin-extended-latest"
+ ],
# Latin America and Caribbean Network Information Centre
- "https://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-extended-latest",
+ "LACNIC": [
+ "https://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-extended-latest"
+ ],
# Réseaux IP Européens
- #"https://ftp.ripe.net/pub/stats/ripencc/delegated-ripencc-extended-latest",
-)
+ # "RIPE": [
+ # "https://ftp.ripe.net/pub/stats/ripencc/delegated-ripencc-extended-latest"
+ # ],
+}
class Downloader(object):
def __init__(self):
--
2.20.1
next prev parent reply other threads:[~2021-05-15 11:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 11:57 [PATCH 1/2] location-importer.in: keep track of sources for networks, ASNs, and organisations Peter Müller
2021-05-15 11:57 ` Peter Müller [this message]
2021-05-21 10:00 ` Peter Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210515115705.9794-2-peter.mueller@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=location@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox