Api update with safe browsing

Author: goors

controllers/__init__.pyc

@@ -2,13 +2,15 @@
 from flask import json, redirect
 from UrlGenerator import encode_url
 import time
-
+import requests
 
 class model:
 
-    def is_safe(key, url):
+    def is_safe(self, key, url):
+        URL = 'https://sb-ssl.google.com/safebrowsing/api/lookup?client=Safe&key={key}&appver=1.5.2&pver=3.1&url={url}'
         response = requests.get(URL.format(key=key, url=url))
 
+        #print response.text
         return response.text != 'malware'
 
     def get_url_stats(self, short_url):
@@ -30,14 +32,9 @@ def get_url_stats(self, short_url):
 
 
     def make_short_url(self, url):
-    
-        import requests
 
         key = 'AIzaSyBwCHhPcVAdwZJH-hlTU4WM_sHe8-_SGYU'
-        URL = 'https://sb-ssl.google.com/safebrowsing/api/lookup?client=Safe&key={key}&appver=1.5.2&pver=3.1&url={url}'
-
-
-        if(is_safe(key, url))
+        if(self.is_safe(key, url) == True):
 
             db = DB()
 
@@ -63,6 +60,7 @@ def make_short_url(self, url):
                 db.query(sql, (url, short_url, 0, 2, time.strftime('%Y-%m-%d %H:%M:%S') ))
 
             return self.format_result("http://goo.rs/"+short_url, 1, 'Url created')
+        return self.format_result({}, 0, "This url contains malware and can not be shortened.")
 
 
 
@@ -72,7 +70,6 @@ def format_result(self, result, status, message):
 
     def redirect(self, url):
 
-
         db = DB()
 
         sql = '''SELECT id, long_url FROM links WHERE short_url=%s'''
@@ -86,9 +83,10 @@ def redirect(self, url):
             db.query(sql, (link['id'], ))
             db.close()
 
-
-            return (link['long_url'])
-
+            key = 'AIzaSyBwCHhPcVAdwZJH-hlTU4WM_sHe8-_SGYU'
+            if(self.is_safe(key, link['long_url']) == True):
+                return (link['long_url'])
+            return False
         return False
 
 

controllers/api.pyc

@@ -16,6 +16,14 @@
         </div>
     </div>
 
+    <div class="sixteen columns" style="text-align: center">
+        <span>
+            <br /><br />
+            Goo.rs has implemented Google Safe Browsing api. <br />Any url that is reported by Google Safe Browsing as malware website
+            will not be redirected or shortened.
+        </span>
+    </div>
+
     {% block js %}
         <script>