1
0
Fork 0
mirror of https://github.com/sileht/bird-lg.git synced 2024-11-25 16:24:43 +01:00

Use service cymru.com service instead of whois

This commit is contained in:
Mehdi Abaakouk 2012-07-18 23:46:44 +02:00
parent d148daf4e2
commit 63a6f32d5f
2 changed files with 20 additions and 1 deletions

17
lg.py
View file

@ -27,7 +27,7 @@ from urllib import quote, unquote
import json import json
import random import random
from toolbox import mask_is_valid, ipv6_is_valid, ipv4_is_valid, resolve, save_cache_pickle, load_cache_pickle from toolbox import mask_is_valid, ipv6_is_valid, ipv4_is_valid, resolve, save_cache_pickle, load_cache_pickle, get_asn_from_as
import pydot import pydot
from flask import Flask, render_template, jsonify, redirect, session, request, abort, Response from flask import Flask, render_template, jsonify, redirect, session, request, abort, Response
@ -315,10 +315,15 @@ def get_as_name(_as):
It's the use whois database informations It's the use whois database informations
# Warning, the server can be blacklisted from ripe is too many requests are done # Warning, the server can be blacklisted from ripe is too many requests are done
""" """
if not _as:
return "AS?????"
if not _as.isdigit(): if not _as.isdigit():
return _as.strip() return _as.strip()
name = get_asn_from_as(_as)[-1].replace(" ","\r",1)
return "AS%s | %s" % (_as, name)
if _as not in ASNAME_CACHE: if _as not in ASNAME_CACHE:
whois_answer = whois_command("as%s" % _as) whois_answer = whois_command("as%s" % _as)
as_name = re.search('(as-name|ASName): (.*)', whois_answer) as_name = re.search('(as-name|ASName): (.*)', whois_answer)
@ -468,6 +473,16 @@ def build_as_tree_from_raw_bird_ouput(host, proto, text):
path = [ peer_protocol_name ] path = [ peer_protocol_name ]
# path = ["%s\r%s" % (peer_protocol_name, get_as_name(get_as_number_from_protocol_name(host, proto, peer_protocol_name)))] # path = ["%s\r%s" % (peer_protocol_name, get_as_name(get_as_number_from_protocol_name(host, proto, peer_protocol_name)))]
expr2 = re.search(r'(.*)unreachable\s+\[(\w+)\s+', line)
if expr2:
if path:
path.append(net_dest)
paths.append(path)
path = None
if expr2.group(1).strip():
net_dest = expr2.group(1).strip()
if line.startswith("BGP.as_path:"): if line.startswith("BGP.as_path:"):
path.extend(line.replace("BGP.as_path:", "").strip().split(" ")) path.extend(line.replace("BGP.as_path:", "").strip().split(" "))

View file

@ -27,6 +27,10 @@ import pickle
def resolve(n, q): def resolve(n, q):
return str(resolver.query(n,q)[0]) return str(resolver.query(n,q)[0])
def get_asn_from_as(n):
data = resolve("AS%s.asn.cymru.com" % n ,"TXT").replace("'","").replace('"','')
return [ field.strip() for field in data.split("|") ]
def mask_is_valid(n): def mask_is_valid(n):
if not n: if not n:
return True return True