Updates the source of AS numbers

harpoon/commands/ip.py

@@ -1,7 +1,6 @@
 #! /usr/bin/env python
 import glob
 import os
-import re
 import shutil
 import socket
 import subprocess
@@ -56,26 +55,24 @@ def add_arguments(self, parser):
  def update(self):
  print("Downloading AS data")
  file_name, headers = urllib.request.urlretrieve(
- "http://www.cidr-report.org/as2.0/autnums.html"
+ "https://ftp.ripe.net/ripe/asnames/asn.txt"
  )
+ if os.path.isfile(self.asnname):
+ os.remove(self.asnname)
  fin = open(file_name, "r", encoding="latin-1", errors="ignore")
  fout = open(self.asnname, "w+")
  line = fin.readline()
- reg = re.compile(
- r'^<a href="/cgi-bin/as-report\?as=AS\d+&view=2.0">AS(\d+)\s*</a> (.+)$'
- )
  while line != "":
- res = reg.match(line)
- if res:
-  fout.write("%s|%s\n" % (res.group(1), res.group(2)))
+ asn = line.split(" ")[0]
+ asname = " ".join(line.split(" ")[1:]).strip()
+ fout.write("{}|{}\n".format(asn, asname))
  line = fin.readline()
  fin.close()
  fout.close()
+
  print("Downloading CIDR data")
- try:
+ if os.path.isfile(self.asncidr):
  os.remove(self.asncidr)
- except OSError:
- pass
  os.chdir("/tmp")
  subprocess.call(["pyasn_util_download.py", "--latest"])
  ls = glob.glob("rib*.bz2")[0]