From c67c9f2b300f5c76cb402e81293d8fa647fb4af2 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (VMware)" Date: Sat, 15 Sep 2018 14:40:22 +0100 Subject: [PATCH] Fix issue with direct_functions and path behaviour - The path clipping / transforming behaviour must be turned-off when we are not using direct_functions as is used in faas-nomad and faas-ecs. This will need a change in each provider to strip paths, but fixes a 404 error these users will see if they upgrade to 0.9.2 or newer. 0.9.3 will have a this fix meaning the whole un-edited path is passed to the provider when direct_functions is set to false. Signed-off-by: Alex Ellis (VMware) --- gateway/handlers/forwarding_proxy.go | 5 +++++ gateway/server.go | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gateway/handlers/forwarding_proxy.go b/gateway/handlers/forwarding_proxy.go index 345fdcef..d5f6b1c2 100644 --- a/gateway/handlers/forwarding_proxy.go +++ b/gateway/handlers/forwarding_proxy.go @@ -9,6 +9,7 @@ import ( "io" "log" "net/http" + "os" "regexp" "strconv" "strings" @@ -100,6 +101,10 @@ func forwardRequest(w http.ResponseWriter, r *http.Request, proxyClient *http.Cl defer upstreamReq.Body.Close() } + if _, exists := os.LookupEnv("write_request_uri"); exists { + log.Printf("forwardRequest: %s %s\n", upstreamReq.Host, upstreamReq.URL.String()) + } + ctx, cancel := context.WithTimeout(context.Background(), timeout) defer cancel() diff --git a/gateway/server.go b/gateway/server.go index 4d5351d2..65060b74 100644 --- a/gateway/server.go +++ b/gateway/server.go @@ -68,16 +68,17 @@ func main() { urlResolver := handlers.SingleHostBaseURLResolver{BaseURL: config.FunctionsProviderURL.String()} var functionURLResolver handlers.BaseURLResolver + var functionURLTransformer handlers.URLPathTransformer + nilURLTransformer := handlers.TransparentURLPathTransformer{} if config.DirectFunctions { functionURLResolver = handlers.FunctionAsHostBaseURLResolver{FunctionSuffix: config.DirectFunctionsSuffix} + functionURLTransformer = handlers.FunctionPrefixTrimmingURLPathTransformer{} } else { functionURLResolver = urlResolver + functionURLTransformer = nilURLTransformer } - nilURLTransformer := handlers.TransparentURLPathTransformer{} - functionURLTransformer := handlers.FunctionPrefixTrimmingURLPathTransformer{} - faasHandlers.Proxy = handlers.MakeForwardingProxyHandler(reverseProxy, functionNotifiers, functionURLResolver, functionURLTransformer) faasHandlers.RoutelessProxy = handlers.MakeForwardingProxyHandler(reverseProxy, forwardingNotifiers, urlResolver, nilURLTransformer)