We’ll be back soon!
+
+
+Sorry for the inconvenience but we’re performing some maintenance at the moment. We’ll be back online shortly!
+— The Team
+Sorry for the inconvenience but we’re performing some maintenance at the moment. We’ll be back online shortly!
+— The Team
+Sorry for the inconvenience") +} + +func TestErrorReporter_BadTemplate(t *testing.T) { + er := ErrorReporter{Nice: true, Template: "xxx {{."} + wr := httptest.NewRecorder() + er.Report(wr, 502) + assert.Equal(t, 502, wr.Code) + assert.Equal(t, "Server error\n", wr.Body.String()) +} diff --git a/app/proxy/proxy.go b/app/proxy/proxy.go index 3d1bd34..b465b89 100644 --- a/app/proxy/proxy.go +++ b/app/proxy/proxy.go @@ -38,6 +38,7 @@ type Http struct { // nolint golint Timeouts Timeouts CacheControl MiddlewareProvider Metrics MiddlewareProvider + Reporter Reporter } // Matcher source info (server and route) to the destination url @@ -53,6 +54,11 @@ type MiddlewareProvider interface { Middleware(next http.Handler) http.Handler } +// Reporter defines error reporting service +type Reporter interface { + Report(w http.ResponseWriter, code int) +} + // Timeouts consolidate timeouts for both server and transport type Timeouts struct { // server timeouts @@ -180,19 +186,7 @@ func (h *Http) proxyHandler() http.HandlerFunc { }, ErrorLog: log.ToStdLogger(log.Default(), "WARN"), } - - // default assetsHandler disabled, returns error on missing matches - assetsHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - log.Printf("[WARN] no match for %s %s", r.URL.Hostname(), r.URL.Path) - http.Error(w, "Server error", http.StatusBadGateway) - }) - - if h.AssetsLocation != "" && h.AssetsWebRoot != "" { - fs, err := R.FileServer(h.AssetsWebRoot, h.AssetsLocation) - if err == nil { - assetsHandler = h.CacheControl.Middleware(fs).ServeHTTP - } - } + assetsHandler := h.assetsHandler() return func(w http.ResponseWriter, r *http.Request) { @@ -201,8 +195,13 @@ func (h *Http) proxyHandler() http.HandlerFunc { server = strings.Split(r.Host, ":")[0] } u, mt, ok := h.Match(server, r.URL.Path) - if !ok { - assetsHandler.ServeHTTP(w, r) + if !ok { // no route match + if h.isAssetRequest(r) { + assetsHandler.ServeHTTP(w, r) + return + } + log.Printf("[WARN] no match for %s %s", r.URL.Hostname(), r.URL.Path) + h.Reporter.Report(w, http.StatusBadGateway) return } @@ -210,7 +209,7 @@ func (h *Http) proxyHandler() http.HandlerFunc { case discovery.MTProxy: uu, err := url.Parse(u) if err != nil { - http.Error(w, "Server error", http.StatusBadGateway) + h.Reporter.Report(w, http.StatusBadGateway) return } log.Printf("[DEBUG] proxy to %s", uu) @@ -220,12 +219,12 @@ func (h *Http) proxyHandler() http.HandlerFunc { // static match result has webroot:location, i.e. /www:/var/somedir/ ae := strings.Split(u, ":") if len(ae) != 2 { // shouldn't happen - http.Error(w, "Server error", http.StatusInternalServerError) + h.Reporter.Report(w, http.StatusInternalServerError) return } fs, err := R.FileServer(ae[0], ae[1]) if err != nil { - http.Error(w, "Server error", http.StatusInternalServerError) + h.Reporter.Report(w, http.StatusInternalServerError) return } h.CacheControl.Middleware(fs).ServeHTTP(w, r) @@ -233,6 +232,26 @@ func (h *Http) proxyHandler() http.HandlerFunc { } } +func (h *Http) assetsHandler() http.HandlerFunc { + if h.AssetsLocation == "" || h.AssetsWebRoot == "" { + return func(writer http.ResponseWriter, request *http.Request) {} + } + fs, err := R.FileServer(h.AssetsWebRoot, h.AssetsLocation) + if err != nil { + log.Printf("[WARN] can't initialize assets server, %v", err) + return func(writer http.ResponseWriter, request *http.Request) {} + } + return h.CacheControl.Middleware(fs).ServeHTTP +} + +func (h *Http) isAssetRequest(r *http.Request) bool { + if h.AssetsLocation == "" || h.AssetsWebRoot == "" { + return false + } + root := strings.TrimSuffix(h.AssetsWebRoot, "/") + return r.URL.Path == root || strings.HasPrefix(r.URL.Path, root+"/") +} + func (h *Http) toHTTP(address string, httpPort int) string { rx := regexp.MustCompile(`(.*):(\d*)`) return rx.ReplaceAllString(address, "$1:") + strconv.Itoa(httpPort) diff --git a/app/proxy/proxy_test.go b/app/proxy/proxy_test.go index bb590bd..3d79c11 100644 --- a/app/proxy/proxy_test.go +++ b/app/proxy/proxy_test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "io" + "io/ioutil" "math/rand" "net/http" "net/http/httptest" @@ -22,7 +23,8 @@ import ( func TestHttp_Do(t *testing.T) { port := rand.Intn(10000) + 40000 h := Http{Timeouts: Timeouts{ResponseHeader: 200 * time.Millisecond}, Address: fmt.Sprintf("127.0.0.1:%d", port), - AccessLog: io.Discard, Signature: true, ProxyHeaders: []string{"hh1:vv1", "hh2:vv2"}, StdOutEnabled: true} + AccessLog: io.Discard, Signature: true, ProxyHeaders: []string{"hh1:vv1", "hh2:vv2"}, StdOutEnabled: true, + Reporter: &ErrorReporter{Nice: true}} ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond) defer cancel() @@ -92,7 +94,10 @@ func TestHttp_Do(t *testing.T) { require.NoError(t, err) defer resp.Body.Close() assert.Equal(t, http.StatusBadGateway, resp.StatusCode) - + b, err := ioutil.ReadAll(resp.Body) + require.NoError(t, err) + assert.Contains(t, string(b), "Sorry for the inconvenience") + assert.Equal(t, "text/html; charset=utf-8", resp.Header.Get("Content-Type")) } } @@ -100,7 +105,7 @@ func TestHttp_DoWithAssets(t *testing.T) { port := rand.Intn(10000) + 40000 cc := NewCacheControl(time.Hour * 12) h := Http{Timeouts: Timeouts{ResponseHeader: 200 * time.Millisecond}, Address: fmt.Sprintf("127.0.0.1:%d", port), - AccessLog: io.Discard, AssetsWebRoot: "/static", AssetsLocation: "testdata", CacheControl: cc} + AccessLog: io.Discard, AssetsWebRoot: "/static", AssetsLocation: "testdata", CacheControl: cc, Reporter: &ErrorReporter{Nice: false}} ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond) defer cancel() @@ -163,13 +168,24 @@ func TestHttp_DoWithAssets(t *testing.T) { assert.Equal(t, "public, max-age=43200", resp.Header.Get("Cache-Control")) } + { + resp, err := client.Get("http://localhost:" + strconv.Itoa(port) + "/svcbad") + require.NoError(t, err) + defer resp.Body.Close() + assert.Equal(t, http.StatusBadGateway, resp.StatusCode) + body, err := io.ReadAll(resp.Body) + require.NoError(t, err) + assert.Contains(t, string(body), "Server error") + assert.Equal(t, "text/plain; charset=utf-8", resp.Header.Get("Content-Type")) + } + } func TestHttp_DoWithAssetRules(t *testing.T) { port := rand.Intn(10000) + 40000 cc := NewCacheControl(time.Hour * 12) h := Http{Timeouts: Timeouts{ResponseHeader: 200 * time.Millisecond}, Address: fmt.Sprintf("127.0.0.1:%d", port), - AccessLog: io.Discard, CacheControl: cc} + AccessLog: io.Discard, CacheControl: cc, Reporter: &ErrorReporter{}} ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond) defer cancel() @@ -256,3 +272,30 @@ func TestHttp_toHttp(t *testing.T) { } } + +func TestHttp_isAssetRequest(t *testing.T) { + tbl := []struct { + req string + assetsLocation string + assetsWebRoot string + res bool + }{ + {"/static/123.html", "/tmp", "/static", true}, + {"/static/123.html", "/tmp", "/static/", true}, + {"/static", "/tmp", "/static", true}, + {"/static/", "/tmp", "/static", true}, + {"/bad/", "/tmp", "/static", false}, + {"/static/", "", "/static", false}, + {"/static/", "/tmp", "", false}, + } + + for i, tt := range tbl { + t.Run(strconv.Itoa(i), func(t *testing.T) { + h := Http{AssetsLocation: tt.assetsLocation, AssetsWebRoot: tt.assetsWebRoot} + r, err := http.NewRequest("GET", tt.req, nil) + require.NoError(t, err) + assert.Equal(t, tt.res, h.isAssetRequest(r)) + }) + } + +} diff --git a/app/proxy/testdata/errtmpl.html b/app/proxy/testdata/errtmpl.html new file mode 100644 index 0000000..7293c19 --- /dev/null +++ b/app/proxy/testdata/errtmpl.html @@ -0,0 +1 @@ +oh my! {{.ErrCode}} - {{.ErrMessage}} \ No newline at end of file