Merge branch 'dev'

Author: noptrix

docs/TODO

@@ -26,6 +26,12 @@ ChangeLog and TODO list for nullscan
   [ ] update man-page. add more infos etc. currently it's minimalistic
 
 
+===> 1.0.1
+
+  [x] bugfix: add try/except for now @ ipwhois if internal ip gets leaked. i
+      will deal with this leaked data, later.
+
+
 ===> 1.0.0
 
   [x] testing for 1.0.0 release

src/core/constants.py

@@ -27,7 +27,7 @@
 
 
 # nullscan version banner
-VERSION = 'nullscan v1.0.0'
+VERSION = 'nullscan v1.0.1'
 
 # our own (exit) error codes
 SUCCESS = 0

src/modules/host/whois.py

@@ -106,7 +106,6 @@ def whois_cidr(self):
         results = list(sorted(set(results)))
         self._log('whois_cidr', results, data_end='\n')
 
-
     return
 
 

src/modules/libs/tools.py

@@ -594,24 +594,27 @@ def _whois(self, _type, target=None):
     """ perform whois on domain or ipv4 addr """
 
     res = []
-    if target:
-      if _type == 'domain':
-        res.append(whois.whois(target))
-      else:
-        obj = IPWhois(target)
-        res.append(obj.lookup_rdap(depth=1))
-    else:
-      if _type == 'domain':
-        log = self._read_log('domainname')
+    try:
+      if target:
+        if _type == 'domain':
+          res.append(whois.whois(target))
+        else:
+          obj = IPWhois(target)
+          res.append(obj.lookup_rdap(depth=1))
       else:
-        log = self._read_log('ipv4addr')
-      for target in log:
-        if target:
-          if _type == 'domain':
-            res.append(whois.whois(target))
-          else:
-            obj = IPWhois(target)
-            res.append(obj.lookup_rdap(depth=1))
+        if _type == 'domain':
+          log = self._read_log('domainname')
+        else:
+          log = self._read_log('ipv4addr')
+        for target in log:
+          if target:
+            if _type == 'domain':
+              res.append(whois.whois(target))
+            else:
+              obj = IPWhois(target)
+              res.append(obj.lookup_rdap(depth=1))
+    except:
+      pass
 
     return res