Merge remote-tracking branch 'gh/zorun/dn42'
Conflicts: lg.cfg lg.py toolbox.py
This commit is contained in:
commit
ee4199adf4
2 changed files with 12 additions and 2 deletions
10
lg.py
10
lg.py
|
@ -33,7 +33,6 @@ import subprocess
|
|||
|
||||
from toolbox import mask_is_valid, ipv6_is_valid, ipv4_is_valid, resolve, save_cache_pickle, load_cache_pickle, get_asname_from_whois, unescape
|
||||
|
||||
|
||||
from dns.resolver import NXDOMAIN
|
||||
from flask import Flask, render_template, jsonify, redirect, session, request, abort, Response, Markup
|
||||
import pydot
|
||||
|
@ -61,6 +60,15 @@ def get_asn_from_as(n):
|
|||
return [field.strip() for field in data.split("|")]
|
||||
|
||||
|
||||
def get_asn_from_as(n):
|
||||
asn_zone = app.config.get("ASN_ZONE", "asn.cymru.com")
|
||||
try:
|
||||
data = resolve("AS%s.%s" % (n, asn_zone) ,"TXT").replace("'","").replace('"','')
|
||||
except:
|
||||
return " "*5
|
||||
return [ field.strip() for field in data.split("|") ]
|
||||
|
||||
|
||||
def add_links(text):
|
||||
"""Browser a string and replace ipv4, ipv6, as number, with a
|
||||
whois link """
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
###
|
||||
|
||||
from dns import resolver, reversename
|
||||
from toolboxconfig import ASN_ZONE
|
||||
|
||||
import socket
|
||||
import pickle
|
||||
import xml.parsers.expat
|
||||
|
@ -39,7 +41,6 @@ app.config.from_pyfile('lg.cfg')
|
|||
def resolve(n, q):
|
||||
return str(resolv.query(n, q)[0])
|
||||
|
||||
|
||||
def resolve_ptr(ip):
|
||||
ptr = str(resolve(reversename.from_address(ip), 'PTR')).lower()
|
||||
ptr = ptr.replace(app.config.get('ROUTER_NAME_REMOVE', ''), '')
|
||||
|
@ -54,6 +55,7 @@ def get_asname_from_whois(data):
|
|||
return 'UNKNOWN-AS'
|
||||
return r.groupdict()['name']
|
||||
|
||||
|
||||
def mask_is_valid(n):
|
||||
if not n:
|
||||
return True
|
||||
|
|
Loading…
Add table
Reference in a new issue