Add a Host header to pathoc requests by default.

3 files changed, 30 insertions, 21 deletions

diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py
index 8fe7b7f6..b78d986f 100644
--- a/libpathod/pathoc.py
+++ b/libpathod/pathoc.py
@@ -20,7 +20,7 @@ class Pathoc(tcp.TCPClient):
         tcp.TCPClient.__init__(self, host, port)
         self.settings = dict(
             staticdir = os.getcwd(),
-            unconstrained_file_access = True
+            unconstrained_file_access = True,
         )
 
     def request(self, spec):
@@ -31,7 +31,7 @@ class Pathoc(tcp.TCPClient):
             rparse.FileAccessDenied.
         """
         r = rparse.parse_request(self.settings, spec)
-        ret = r.serve(self.wfile)
+        ret = r.serve(self.wfile, None, self.host)
         self.wfile.flush()
         return http.read_response(self.rfile, r.method, None)
 
@@ -43,7 +43,7 @@ class Pathoc(tcp.TCPClient):
         for i in reqs:
             try:
                 r = rparse.parse_request(self.settings, i)
-                req = r.serve(self.wfile)
+                req = r.serve(self.wfile, None, self.host)
                 if reqdump:
                     print >> fp, "\n>>", req["method"], repr(req["path"])
                     for a in req["actions"]:
diff --git a/libpathod/rparse.py b/libpathod/rparse.py
index 767cb861..e56135ea 100644
--- a/libpathod/rparse.py
+++ b/libpathod/rparse.py
@@ -541,7 +541,7 @@ class Message:
                 l += len(i[2])
         return l
 
-    def serve(self, fp, check, is_request):
+    def serve(self, fp, check, request_host):
         """
             fp: The file pointer to write to.
 
@@ -550,9 +550,11 @@ class Message:
             otherwise the return is treated as an error message to be sent to
             the client, and service stops.
 
-            is_request: Is this a request? If False, we assume it's a response.
-            Used to decide what standard modifications to make if raw is not
-            set.
+            request_host: If this a request, this is the connecting host. If
+            None, we assume it's a response. Used to decide what standard
+            modifications to make if raw is not set.
+
+            Calling this function may modify the object.
         """
         started = time.time()
         if not self.raw:
@@ -563,8 +565,15 @@ class Message:
                         LiteralGenerator(str(len(self.body))),
                     )
                 )
-            if is_request:
-                pass
+            if request_host:
+                if not utils.get_header("Host", self.headers):
+                    self.headers.append(
+                        (
+                            LiteralGenerator("Host"),
+                            LiteralGenerator(request_host)
+                        )
+                    )
+
             else:
                 if not utils.get_header("Date", self.headers):
                     self.headers.append(
@@ -706,8 +715,8 @@ class CraftedRequest(Request):
         for i in tokens:
             i.accept(settings, self)
 
-    def serve(self, fp, check=None):
-        d = Request.serve(self, fp, check, True)
+    def serve(self, fp, check, host):
+        d = Request.serve(self, fp, check, host)
         d["spec"] = self.spec
         return d
 
@@ -719,8 +728,8 @@ class CraftedResponse(Response):
         for i in tokens:
             i.accept(settings, self)
 
-    def serve(self, fp, check=None):
-        d = Response.serve(self, fp, check, False)
+    def serve(self, fp, check):
+        d = Response.serve(self, fp, check, None)
         d["spec"] = self.spec
         return d
 
@@ -738,7 +747,7 @@ class PathodErrorResponse(Response):
         ]
 
     def serve(self, fp, check=None):
-        d = Response.serve(self, fp, check, False)
+        d = Response.serve(self, fp, check, None)
         d["internal"] = True
         return d
 
diff --git a/test/test_rparse.py b/test/test_rparse.py
index ef724d68..922c8fc6 100644
--- a/test/test_rparse.py
+++ b/test/test_rparse.py
@@ -210,7 +210,7 @@ class TestInject:
     def test_serve(self):
         s = cStringIO.StringIO()
         r = rparse.parse_response({}, "400:i0,'foo'")
-        assert r.serve(s)
+        assert r.serve(s, None)
 
 
 class TestShortcuts:
@@ -262,7 +262,7 @@ class TestParseRequest:
     def test_render(self):
         s = cStringIO.StringIO()
         r = rparse.parse_request({}, "GET:'/foo'")
-        assert r.serve(s)
+        assert r.serve(s, None, "foo.com")
 
     def test_str(self):
         r = rparse.parse_request({}, 'GET:"/foo"')
@@ -438,19 +438,19 @@ class TestResponse:
     def test_render(self):
         s = cStringIO.StringIO()
         r = rparse.parse_response({}, "400'msg'")
-        assert r.serve(s)
+        assert r.serve(s, None)
 
     def test_raw(self):
         s = cStringIO.StringIO()
         r = rparse.parse_response({}, "400:b'foo'")
-        r.serve(s)
+        r.serve(s, None)
         v = s.getvalue()
         assert "Content-Length" in v
         assert "Date" in v
 
         s = cStringIO.StringIO()
         r = rparse.parse_response({}, "400:b'foo':r")
-        r.serve(s)
+        r.serve(s, None)
         v = s.getvalue()
         assert not "Content-Length" in v
         assert not "Date" in v
@@ -458,7 +458,7 @@ class TestResponse:
     def test_length(self):
         def testlen(x):
             s = cStringIO.StringIO()
-            x.serve(s)
+            x.serve(s, None)
             assert x.length() == len(s.getvalue())
         testlen(rparse.parse_response({}, "400'msg'"))
         testlen(rparse.parse_response({}, "400'msg':h'foo'='bar'"))
@@ -467,7 +467,7 @@ class TestResponse:
     def test_effective_length(self):
         def testlen(x, actions):
             s = cStringIO.StringIO()
-            x.serve(s)
+            x.serve(s, None)
             assert x.effective_length(actions) == len(s.getvalue())
         actions = [