Implement {proxy,wai}Request roundtrip

Signed-off-by: Erik de Castro Lopo <[email protected]>
restaumatic · Aug 15, 2015 · e302eef · e302eef
1 parent 5f885da
commit e302eef
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/Network/HTTP/Proxy/Request.hs b/Network/HTTP/Proxy/Request.hs
@@ -15,8 +15,10 @@ module Network.HTTP.Proxy.Request
     where
 
 import Data.ByteString.Char8 (ByteString)
+
 import Data.Maybe
 
+import           Network.HTTP.Types (Method)
 import qualified Network.HTTP.Types as HT
 import qualified Network.Wai as Wai
 
@@ -27,13 +29,9 @@ type Port = Int
 data Request = Request
     {
     -- | Request method such as GET.
-      requestMethod :: HT.Method
+      requestMethod :: Method
     -- | HTTP version such as 1.1.
     , httpVersion :: HT.HttpVersion
-    -- | The upstream host name.
-    , requestHost :: ByteString
-    -- | The port number of the upstream host.
-    , requestPort :: Port
     -- | A list of header (a pair of key and value) in an HTTP request.
     , requestHeaders :: HT.RequestHeaders
     -- | The part of the URL after the hostname (and optional port number) and
@@ -43,12 +41,27 @@ data Request = Request
     , queryString :: HT.Query
     }
 
-
 proxyRequest :: Wai.Request -> Request
-proxyRequest = error "proxyRequest"
+proxyRequest w = Request method'
+                         version'
+                         headers'
+                         path'
+                         query'
+         where
+    method'  = Wai.requestMethod w
+    version' = Wai.httpVersion w
+    headers' = Wai.requestHeaders w
+    path'    = Wai.rawPathInfo w
+    query'   = Wai.queryString w
 
 waiRequest :: Request -> Wai.Request
-waiRequest = error "waiRequest"
+waiRequest r = Wai.defaultRequest
+    { Wai.requestMethod  = requestMethod r
+    , Wai.httpVersion    = httpVersion r
+    , Wai.requestHeaders = requestHeaders r
+    , Wai.rawPathInfo    = requestPath r
+    , Wai.queryString    = queryString r
+    }
 
 waiRequestHost :: Wai.Request -> ByteString
 waiRequestHost req = fromMaybe "???" $ Wai.requestHeaderHost req
diff --git a/http-proxy.cabal b/http-proxy.cabal
@@ -40,6 +40,7 @@ Library
                    , mtl                     >= 2.1
                    , resourcet               >= 1.1
                    , tls                     >= 1.2
+                   , text                    >= 1.2
                    , transformers            >= 0.3
                    , wai                     >= 3.0
                    , wai-conduit             >= 3.0
@@ -69,8 +70,10 @@ Test-Suite testsuite
                    , http-conduit
                    , http-types
                    , hspec                   >= 2.1
+                   , network
                    , random                  >= 1.1
                    , resourcet
+                   , text
                    , wai
                    , wai-conduit
                    , warp