Bugfix web server

Author: jedie

src/http_set_timer.py

@@ -40,9 +40,9 @@ async def get_form(server, reader, writer, querystring, timers=None):
 
 
 async def get_submit(server, reader, writer, querystring):
-    from urllib_parse import querystring2dict
-    get_parameters = querystring2dict(querystring)
-    del querystring2dict
+    from urllib_parse import request_query2dict
+    get_parameters = request_query2dict(querystring)
+    del request_query2dict
     del sys.modules['urllib_parse']
     gc.collect()
 

src/urllib_parse.py

@@ -26,6 +26,9 @@ def unquote(string):
 
 
 def parse_qsl(qs):
+    if qs is None:
+        return ()
+    qs = str(qs)
     pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
     res = []
     for name_value in pairs:
@@ -38,5 +41,5 @@ def parse_qsl(qs):
     return res
 
 
-def querystring2dict(qs):
+def request_query2dict(qs):
     return dict(parse_qsl(qs))

src/webswitch.py

@@ -73,37 +73,49 @@ async def call_module_func(self, url, method, querystring, reader, writer):
         del sys.modules[module_name]
         gc.collect()
 
-    def parse_request(self, reader):
-        method, url, http_version = next(reader.readline()).strip().decode().split()
+    async def parse_request(self, reader):
+        method, url, http_version = (await reader.readline()).decode().strip().split()
+        # print(http_version)
+
+        if '?' in url:
+            url, querystring = url.split('?', 1)
+        else:
+            querystring = None
 
         # Consume all headers but use only content-length
         content_length = None
-        for line in reader.readline():
-            if line == b'':
-                # header ends
+        while True:
+            line = await reader.readline()
+            if line == b'\r\n':
+                break  # header ends
+
+            try:
+                header, value = line.split(b':', 1)
+            except ValueError:
                 break
-            header, value = line.split(b':', 1)
+
+            value = value.strip()
+
             if header == b'Content-Length':
                 content_length = int(value.decode())
 
+            # print(header, value)
+
+        print('content length:', content_length)
+
         # get body
         if content_length:
-            body = reader.read(content_length)
+            body = await reader.read(content_length)
         else:
             body = None
 
-        if '?' in url:
-            url, querystring = url.split('?', 1)
-        else:
-            querystring = None
-
         return method, url, querystring, body
 
     async def send_response(self, reader, writer):
-        print('\nAccepted connection from:', writer.get_extra_info('peername'))
+        print('\nRequest from:', writer.get_extra_info('peername'))
 
         try:
-            method, url, querystring, body = self.parse_request(reader)
+            method, url, querystring, body = await self.parse_request(reader)
         except ValueError as e:
             self.message = str(e)
             url = '/'  # redirect

tests/test_urllib_parse.py

@@ -1,14 +1,14 @@
 
 from unittest import TestCase
 
-from urllib_parse import querystring2dict
+from urllib_parse import request_query2dict
 
 
 class UrllibParseTestCase(TestCase):
-    def test_querystring2dict(self):
-        assert querystring2dict('timers=6%3A00-8%3A00+%0D%0A19%3A00-20%3A00&active=off') == {
+    def test_request_query2dict(self):
+        assert request_query2dict('timers=6%3A00-8%3A00+%0D%0A19%3A00-20%3A00&active=off') == {
             'timers': '6:00-8:00 \r\n19:00-20:00',
             'active': 'off'
         }
-        assert querystring2dict('foo=%%&bar=%%%') == {'bar': '%%%', 'foo': '%%'}
-        assert querystring2dict('foo=&bar=') == {'bar': '', 'foo': ''}
+        assert request_query2dict('foo=%%&bar=%%%') == {'bar': '%%%', 'foo': '%%'}
+        assert request_query2dict('foo=&bar=') == {'bar': '', 'foo': ''}