Update deps, use psslv2.

requirements.txt

@@ -5,3 +5,9 @@ flask-wtf
 rq
 redis
 pypssl
+pypdns
+pyeupi
+dnspython
+bgpranking-web
+urlquery
+beautifulsoup4

update_deps.sh

@@ -5,8 +5,8 @@ set -x
 
 DEST_DIR="web/static/"
 
-ANGULAR='1.3.15'
+ANGULAR='1.4.5'
-ANGULAR_BOOTSTRAP='0.13.0'
+ANGULAR_BOOTSTRAP='0.13.4'
 
 wget https://ajax.googleapis.com/ajax/libs/angularjs/${ANGULAR}/angular.min.js -O ${DEST_DIR}/angular.min.js
 wget https://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-${ANGULAR_BOOTSTRAP}.min.js -O ${DEST_DIR}/ui-bootstrap-tpls.min.js

url_abuse_async.py

@@ -166,7 +166,7 @@ def get_urls(url, depth=1):
 
     def meta_redirect(content):
         c = content.lower()
-        soup = BeautifulSoup(c)
+        soup = BeautifulSoup(c, "html.parser")
         for result in soup.find_all(attrs={'http-equiv': 'refresh'}):
             if result:
                 out = result["content"].split(";")
@@ -441,7 +441,13 @@ def psslcircl(url, user, passwd, q):
     psslcircl = PyPSSL(url, basic_auth=(user, passwd))
     response = psslcircl.query(q)
     if response.get(q) is not None:
-        entries = response[q]
+        certinfo = response.get(q)
+        entries = {}
+        for sha1 in certinfo['certificates']:
+            entries[sha1] = []
+            if certinfo['subjects'].get(sha1):
+                for value in certinfo['subjects'][sha1]['values']:
+                    entries[sha1].append(value)
         _cache_set(q, entries, 'pssl')
         return entries
     return None

web/static/main.js

@@ -279,7 +279,7 @@
                 };
                 globFct.query('psslcircl', {"query": scope.query}, get_response);
             },
-        template: '<div ng-show="entries" class="animate-show">SSL certificates related to this IP: <ul><div ng-repeat="entry in entries"><li>{{entry}}</li></div></ul></div>'
+            template: '<div ng-show="entries" class="animate-show">SSL certificates related to this IP: <ul><div ng-repeat="(sha1, subject) in entries"><li><b>{{sha1}}</b>: {{subject[0]}}</li></div></ul></div>'
         };
     });
     app.directive('uqBgpranking', function(globFct) {