[Secure-testing-commits] r28797 - bin lib/python

[Holger Levsen]

Author: holger
Date: 2014-09-15 19:08:32 +0000 (Mon, 15 Sep 2014)
New Revision: 28797

Added:
   bin/tracker_service.css
Modified:
   bin/tracker_service.py
   lib/python/web_support.py
Log:
tracker_service.py: add support for external css files

Added: bin/tracker_service.css
===================================================================
Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2014-09-15 18:01:35 UTC (rev 28796)
+++ bin/tracker_service.py	2014-09-15 19:08:32 UTC (rev 28797)
@@ -160,7 +160,14 @@
         self.register('data/pts/1', self.page_data_pts)
         self.register('debsecan/**', self.page_debsecan)
         self.register('data/report', self.page_report)
+        self.register('style.css', self.page_style_css)
 
+    def page_style_css(self, path, params, url):
+        f=open('tracker_service.css', 'r')
+	content=f.read()
+	f.close()
+        return BinaryResult(content,'text/css')
+
     def page_home(self, path, params, url):
         query = params.get('query', ('',))[0]
         if query:
@@ -1197,13 +1204,13 @@
             data.append(':')
             data.append(str(bugs))
             data.append('\n')
-        return BinaryResult(''.join(data))
+        return BinaryResult(''.join(data),'application/octet-stream')
 
     def page_debsecan(self, path, params, url):
         obj = '/'.join(path)
         data = self.db.getDebsecan(obj)
         if data:
-            return BinaryResult(data)
+            return BinaryResult(data,'application/octet-stream')
         else:
             return self.create_page(
                 url, "Object not found",

Modified: lib/python/web_support.py
===================================================================
--- lib/python/web_support.py	2014-09-15 18:01:35 UTC (rev 28796)
+++ lib/python/web_support.py	2014-09-15 19:08:32 UTC (rev 28797)
@@ -625,7 +625,7 @@
 
 class HTMLResult(Result):
     """An object of this class combines a status code with HTML contents."""
-    def __init__(self, contents, status=200, doctype=''):
+    def __init__(self, contents, doctype='', status=200):
         self.contents = contents
         self.status = status
         self.doctype = doctype
@@ -654,8 +654,8 @@
 
 class BinaryResult(Result):
     """An object of this class combines a status code with HTML contents."""
-    def __init__(self, contents, status=200,
-                 mimetype='application/octet-stream'):
+    def __init__(self, contents,
+                 mimetype='application/octet-stream', status=200):
         self.contents = contents
         self.status = status
         self.mimetype = mimetype