Changeset 1438

Timestamp:

11/18/06 13:57:28

Author:

fumanchu

Message:

Added AUTH_TYPE, REMOTE_USER, and SERVER_SOFTWARE to wsgi environ. See #601.

Files:

• trunk/cherrypy/_cpwsgiserver.py (modified) (3 diffs)

trunk/cherrypy/_cpwsgiserver.py

@@ -1 +1 @@
-"""A high-speed, production ready, thread pooled, generic WSGI server."""
-
+import base64
-import mimetools # todo: use email
-import Queue
@@ -76 +77 @@
-        
-        server = self.connection.server
+        self.environ["SERVER_SOFTWARE"] = "%s WSGI Server" % server.version
-        
-        method, path, req_protocol = request_line.strip().split(" ", 2)
@@ -156 +158 @@
-        headers = mimetools.Message(self.rfile)
-        self.environ.update(self.parse_headers(headers))
+        
+        creds = headers.getheader("Authorization", "").split(" ", 1)
+        self.environ["AUTH_TYPE"] = creds[0]
+        if creds[0].lower() == 'basic':
+            user, pw = base64.decodestring(creds[1]).split(":", 1)
+            self.environ["REMOTE_USER"] = user
-        
-        # Persistent connection support