Basic support for serving static files (based on BasicHTTPServer)

Author: happz

src/engine.py

@@ -132,10 +132,21 @@ def default_config(app_path):
       'log.access.format': '{date} {time} {request_line} {response_status} {response_length} {request_ip} {request_user}',
 
       'sessions.time': 2 * 86400,
-      'sessions.cookie_name': 'hlib_sid'
+      'sessions.cookie_name': 'hlib_sid',
+
+      'static.enabled': False,
+      'static.root': '/tmp'
     }
 
   def get_handler(self, requested):
+    def __static_fallback():
+      if 'static.enabled' in self.config and self.config['static.enabled']:
+        import hlib.handlers.static
+
+        return hlib.handlers.static.StaticHandler().generate
+
+      raise hlib.http.NotFound()
+
     h = self.root
 
     for token in requested.split('?')[0].split('/')[1:]:
@@ -146,11 +157,11 @@ def get_handler(self, requested):
         h = getattr(h, token)
         continue
 
-      raise hlib.http.NotFound()
+      return __static_fallback()
 
     if isinstance(h, hlib.handlers.GenericHandler):
       if not hasattr(h, 'index'):
-        raise hlib.http.NotFound()
+        return __static_fallback()
 
       h = h.index
 
@@ -430,6 +441,8 @@ def __init__(self):
     self.output			= None
     self.raw_output		= None
 
+    self.source_file = None
+
   def __getattr__(self, name):
     if name == 'output':
       return self._output
@@ -480,6 +493,10 @@ def dumps(self):
     for name, cookie in self.cookies.iteritems():
       self.headers['Set-Cookie'] = '%s=%s; Max-Age=%s; Path=%s' % (cookie.name, urllib.quote(cookie.value), cookie.max_age, cookie.path)
 
+    if self.source_file:
+      self.output = self.source_file.read()
+      self.source_file.close()
+
     if self.output:
       if hasattr(req.server.config, 'compress') and req.server.config.compress == True:
         compressed = hlib.compress.compress(self.output)
@@ -504,7 +521,7 @@ def dumps(self):
     if self.output != None and req.method != 'head':
       lines.append(self.output)
 
-    return '\r\n'.join(lines) + '\r\n'
+    return '\r\n'.join(lines)
 
 class DataBaseGCTask(hlib.scheduler.Task):
   def __init__(self):

src/handlers/static.py

@@ -0,0 +1,112 @@
+import mimetypes
+import os
+import os.path
+import posixpath
+import urllib
+import sys
+
+import hlib.handlers
+
+import hruntime
+
+class StaticIORegime(hlib.handlers.IORegime):
+  @staticmethod
+  def check_session():
+    hlib.auth.check_session()
+
+  @staticmethod
+  def run_handler():
+    try:
+      return hruntime.request.handler()
+
+    except hlib.http.Redirect, e:
+      hruntime.db.doom()
+      raise e
+
+    except Exception, e:
+      hruntime.db.doom()
+
+      e = hlib.error.error_from_exception(e)
+      hlib.log.log_error(e)
+
+    return ''
+
+  @staticmethod
+  def redirect(url):
+    res = hruntime.response
+
+    res.status = 301 
+    res.output = None
+    res.headers['Location'] = url
+
+    if 'Content-Type' in res.headers:
+      del res.headers['Content-Type']
+
+static = lambda f: hlib.handlers.tag_fn(f, 'ioregime', StaticIORegime)
+
+class StaticHandler(object):
+  if not mimetypes.inited:
+    mimetypes.init()
+
+  extensions_map = mimetypes.types_map.copy()
+  extensions_map.update({
+    '': 'application/octet-stream', # Default
+  })
+
+  def __init__(self):
+    super(StaticHandler, self).__init__()
+
+  def translate_path(self, path):
+    path = path.split('?',1)[0]
+    path = path.split('#',1)[0]
+    path = posixpath.normpath(urllib.unquote(path))
+    words = path.split('/')
+    words = filter(None, words)
+
+    path = hruntime.app.config.get('static.root')
+
+    for word in words:
+      drive, word = os.path.splitdrive(word)
+      head, word = os.path.split(word)
+      if word in (os.curdir, os.pardir): continue
+      path = os.path.join(path, word)
+
+    return path
+
+  def guess_type(self, path):
+    base, ext = posixpath.splitext(path)
+
+    if ext in self.extensions_map:
+      return self.extensions_map[ext]
+
+    ext = ext.lower()
+    if ext in self.extensions_map:
+      return self.extensions_map[ext]
+    else:
+      return self.extensions_map['']
+
+  @static
+  def generate(self, _version_stamp = None):
+    req = hruntime.request
+    res = hruntime.response
+
+    path = self.translate_path(req.requested)
+    content_type = self.guess_type(path)
+
+    sys.stdout.flush()
+
+    try:
+      res.source_file = open(path, 'rb')
+    except IOError:
+      res.status = 404
+      res.output = None
+      return
+
+    stat = os.fstat(res.source_file.fileno())
+
+    res.status = 200
+    res.headers['Content-Type'] = content_type
+    res.headers['Content-Length'] = stat[6]
+    res.headers['Last-Modified'] = hlib.http.stamp_to_string(stat.st_mtime)
+
+    return None

src/http/__init__.py

@@ -3,6 +3,8 @@
 __contact__ = '[email protected]'
 __license__ = 'http://www.php-suit.com/dpl'
 
+import time
+
 import hlib.error
 
 # pylint: disable-msg=F0401
@@ -46,6 +48,15 @@
   500:		'Internal Server Error'
 }
 
+def stamp_to_string(stamp):
+  weekdayname = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+  monthname = [None, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+
+  stamp = stamp or time.time()
+
+  year, month, day, hh, mm, ss, wd, y, z = time.gmtime(stamp)
+  return "%s, %02d %3s %4d %02d:%02d:%02d GMT" % (weekdayname[wd], day, monthname[month], year, hh, mm, ss)
+
 class HTTPError(hlib.error.BaseError):
   def __init__(self, *args, **kwargs):
     super(HTTPError, self).__init__(*args, **kwargs)

src/runners/__init__.py

@@ -36,7 +36,7 @@ def get(self, section, option):
       raise ConfigParser.NoSectionError(section)
 
     if option not in self.default[section]:
-      raise ConfigParser.NoOptionError(section, option)
+      raise ConfigParser.NoOptionError(option, section)
 
     return self.default[section][option]
 
@@ -121,6 +121,10 @@ def __get_channel(name):
     app.channels.add('transactions', transactions)
     app.channels.add('events', stderr, events)
 
+    if config.has_section('static'):
+      app.config['static.enabled'] = True
+      app.config['static.root'] = config.get('static', 'root')
+
     if on_app_config:
       on_app_config(app, config)