日常更新

leafcoder · leafcoder · commit abcec1a0b08c · 2018-02-28T16:38:52.000+08:00
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 
-1. 快速启动
-==============
+# 1. 快速启动
 
 1.1 启动脚本
 ---------------
@@ -38,3 +37,58 @@
     Hit Ctrl-C to quit.
 
 运行启动脚本后，访问 http://0.0.0.0:8080/example，您会看到 `Hello world!`。
+
+
+# 2. CGI 规则
+
+2.1 httpfile 对象是服务器上下文接口，接口如下：
+--------------------------------------
+
+接口类型 | 接口使用 | 接口描述
+---- | --- | ----
+环境变量（只读） | httpfile.environ | 环境变量
+某环境变量 | httpfile.environ`[`_*envname*_`]` | 获取某环境变量
+Session | httpfile.session | session 对象，可临时保存或获取内存数据
+Session ID | httpfile.session_id | session 对象 ID，将通过 SET_COOKIE 环境变量返回给客户端浏览器
+Form | httpfile.form | form 为字典对象，保存您提交到服务器的数据
+Config | httpfile.config | 服务器的配置对象，可获取初始化服务器的配置信息
+files | httpfile.files | 字典对象，保存上传的文件，格式为：{ *filename1*: *\<StringIO object\>*, *filename2*: *\<StringIO object\>* }
+cookie | httpfile.cookie | SimpleCookie 对象，获取 Cookie 数据
+页面跳转 | httpfile.redirect(url=None) | 跳转到某一页面
+HTTP头部 | httpfile.start_response(status_code=200, headers=None) | HTTP 返回码和头部
+
+2.2 以下为 httpfile 对象中环境变量（environ）包含的变量对应表
+---------------------------------------------------
+
+环境变量 | 描述 | 例子
+------- | ------ | ----
+REQUEST_METHOD | 请求方法 | GET、POST、PUT、HEAD等
+SERVER_PROTOCOL | 请求协议/版本 | HTTP/1.1"
+REMOTE_ADDR | 请求客户端的IP地址 | 192.168.1.5
+REMOTE_PORT | 请求客户端的端口 | 9999
+REQUEST_URI | 完整 uri | /user_info?name=li&age=20
+PATH_INFO | 页面地址 | /user_info
+QUERY_STRING | 请求参数 | name=li&age=20
+CONTENT_TYPE | POST 等报文类型 | application/x-www-form-urlencoded 或 text/html;charset=utf-8
+CONTENT_LENGTH | POST 等报文长度 | 1024
+HTTP_*_HEADERNAME_* | 其他请求头部 | 如 HTTP_REFERER：https://www.baidu.com/
+
+2.3 部分环境变量也可以使用 httpfile 属性的方式获取
+------------------------------------------
+
+环境变量 | 对应属性
+------- | -------
+PATH_INFO | httpfile.path_Info
+QUERY_STRING | httpfile.query_string
+REQUEST_URI | httpfile.request_uri
+REFERER | httpfile.referer
+REQUEST_METHOD | httpfile.request_method
+SERVER_PROTOCOL | httpfile.server_protocol
+
+# 3. Mako 文件支持
+
+TODO
+
+# 4. CGI 支持
+
+TODO
diff --git a/litefs.py b/litefs.py
@@ -48,7 +48,6 @@
 from subprocess import Popen, PIPE
 from tempfile import NamedTemporaryFile, TemporaryFile
 from time import time, strftime, gmtime
-from traceback import print_exc
 from urllib import splitport, unquote_plus
 from UserDict import UserDict
 from uuid import uuid4
@@ -614,10 +613,42 @@ def session_id(self):
     def session(self):
         return self._session
 
+    @property
+    def request_method(self):
+        return self.environ['REQUEST_METHOD']
+
+    @property
+    def server_protocol(self):
+        return self.environ['SERVER_PROTOCOL']
+
     @property
     def path_info(self):
         return self.environ['PATH_INFO']
 
+    @property
+    def query_string(self):
+        return self.environ['QUERY_STRING']
+
+    @property
+    def request_uri(self):
+        environ = self.environ
+        path_info    = environ['PATH_INFO']
+        query_string = environ['QUERY_STRING']
+        if not query_string:
+            return path_info
+        return '?'.join((path_info, query_string))
+
+    @property
+    def referer(self):
+        return self.environ.get('HTTP_REFERER')
+
+    @property
+    def cookie(self):
+        cookie_str = self.environ.get('HTTP_COOKIE', '')
+        cookie = SimpleCookie()
+        cookie.load(cookie_str)
+        return cookie
+
     def start_response(self, status_code=200, headers=None):
         buffers = self._buffers
         if self._headers_responsed:
@@ -1033,7 +1064,7 @@ class Litefs(object):
 
     def __init__(self, **kwargs):
         self.config = config = make_config(**kwargs)
-        level = logging.ERROR if config.debug else logging.DEBUG
+        level = logging.DEBUG if config.debug else logging.ERROR
         self.logger = make_logger(__name__, level=level)
         self.server_info = server_info = make_server(
             config.address, request_size=config.request_size
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
     long_description=litefs.__doc__,
     author=__author__,
     author_email='leafcoder@gmail.com',
-    url='https://coding.net/u/leafcoder/p/litefs',
+    url='https://github.com/leafcoder/litefs',
     py_modules=['litefs'],
     ext_modules=cythonize('litefs.py'),
     scripts=['litefs.py'],
diff --git a/site/helloword.mako b/site/helloword.mako
@@ -1,5 +1,10 @@
-<%def name="handler(self)">
-    hello world
 
-    {{'Good'}}
-</%def>
+<pre>
+PATH_INFO   : ${http.path_info}
+QUERY_STRING: ${http.query_string}
+REQUEST_URI : ${http.request_uri}
+REFERER     : ${http.referer}
+COOKIE      : ${http.cookie}
+
+hello world
+</pre>
diff --git a/site/index.html.py b/site/index.html.py
@@ -1,2 +1,7 @@
 def handler(self):
-    return 'ok'
+    return '''
+    <a href="helloword">helloword</a>
+    <a href="pathinfo">pathinfo</a>
+    <a href="upload.html">upload.html</a>
+    <a href="form.html">form.html</a>
+    '''
