Revert "merge upstream"

This reverts commit c5db3a6, reversing
changes made to bfed10b.

README.md

@@ -202,8 +202,6 @@ There are two ways to set cache duration:
 1. A single value for all static assets. This is as simple as `--assets.cache=48h`.
 2. Custom duration for different mime types. It should include two parts - the default value and the pairs of mime:duration. In command line this looks like multiple `--assets.cache` options, i.e. `--assets.cache=48h --assets.cache=text/html:24h --assets.cache=image/png:2h`. Environment values should be comma-separated, i.e. `ASSETS_CACHE=48h,text/html:24h,image/png:2h`
 
-Custom 404 (not found) page can be set with `--assets.404=<path>` parameter. The path should be relative to the assets root.
-
 ## Using reproxy as a base image
 
 Serving purely static content is one of the popular use cases. Usually this used for the separate frontend container providing UI only. With the assets server such a container is almost trivial to make. This is an example from the container serving [reproxy.io](http://reproxy.io)
@@ -376,7 +374,6 @@ assets:
  --assets.root= assets web root (default: /) [$ASSETS_ROOT]
  --assets.spa spa treatment for assets [$ASSETS_SPA]
  --assets.cache= cache duration for assets [$ASSETS_CACHE]
- --assets.not-found= path to file to serve on 404, relative to location [$ASSETS_NOT_FOUND]
 
 logger:
  --logger.stdout enable stdout logging [$LOGGER_STDOUT]

app/main.go

@@ -37,7 +37,7 @@ var opts struct {
  DropHeaders []string `long:"drop-header" env:"DROP_HEADERS" description:"incoming headers to drop" env-delim:","`
  AuthBasicHtpasswd string `long:"basic-htpasswd" env:"BASIC_HTPASSWD" description:"htpasswd file for basic auth"`
 
- LBType string `long:"lb-type" env:"LB_TYPE" description:"load balancer type" choice:"random" choice:"failover" default:"random"` // nolint
+ LBType string `long:"lb-type" env:"LB_TYPE" description:"load balancer type" choice:"random" choice:"failover" default:"random"` //nolint
 
  SSL struct {
  Type string `long:"type" env:"TYPE" description:"ssl (auto) support" choice:"none" choice:"static" choice:"auto" default:"none"` //nolint
@@ -57,7 +57,6 @@ var opts struct {
  WebRoot string `long:"root" env:"ROOT" default:"/" description:"assets web root"`
  SPA bool `long:"spa" env:"SPA" description:"spa treatment for assets"`
  CacheControl []string `long:"cache" env:"CACHE" description:"cache duration for assets" env-delim:","`
- NotFound string `long:"not-found" env:"NOT_FOUND" description:"path to file to serve on 404, relative to location"`
  } `group:"assets" namespace:"assets" env-namespace:"ASSETS"`
 
  Logger struct {
@@ -251,7 +250,6 @@ func run() error {
  MaxBodySize: int64(maxBodySize),
  AssetsLocation: opts.Assets.Location,
  AssetsWebRoot: opts.Assets.WebRoot,
- Assets404: opts.Assets.NotFound,
  AssetsSPA: opts.Assets.SPA,
  CacheControl: cacheControl,
  GzEnabled: opts.GzipEnabled,

app/proxy/proxy.go

@@ -1,7 +1,6 @@
 package proxy
 
 import (
- "bytes"
  "context"
  "fmt"
  "io"
@@ -10,8 +9,6 @@ import (
  "net/http"
  "net/http/httputil"
  "net/url"
- "os"
- "path/filepath"
  "regexp"
  "strconv"
  "strings"
@@ -31,7 +28,6 @@ type Http struct { // nolint golint
  Address string
  AssetsLocation string
  AssetsWebRoot string
- Assets404 string
  AssetsSPA bool
  MaxBodySize int64
  GzEnabled bool
@@ -95,9 +91,6 @@ func (h *Http) Run(ctx context.Context) error {
 
  if h.AssetsLocation != "" {
  log.Printf("[DEBUG] assets file server enabled for %s, webroot %s", h.AssetsLocation, h.AssetsWebRoot)
- if h.Assets404 != "" {
- log.Printf("[DEBUG] assets 404 file enabled for %s", h.Assets404)
- }
  }
 
  if h.LBSelector == nil {
@@ -267,7 +260,7 @@ func (h *Http) proxyHandler() http.HandlerFunc {
  h.Reporter.Report(w, http.StatusInternalServerError)
  return
  }
- fs, err := h.fileServer(ae[0], ae[1], ae[2] == "spa", nil)
+ fs, err := h.fileServer(ae[0], ae[1], ae[2] == "spa")
  if err != nil {
  log.Printf("[WARN] file server error, %v", err)
  h.Reporter.Report(w, http.StatusInternalServerError)
@@ -334,36 +327,20 @@ func (h *Http) assetsHandler() http.HandlerFunc {
  if h.AssetsLocation == "" || h.AssetsWebRoot == "" {
  return func(writer http.ResponseWriter, request *http.Request) {}
  }
-
- var notFound []byte
- var err error
- if h.Assets404 != "" {
- if notFound, err = os.ReadFile(filepath.Join(h.AssetsLocation, h.Assets404)); err != nil {
- log.Printf("[WARN] can't read 404 file %s, %v", h.Assets404, err)
- notFound = nil
- }
- }
-
- log.Printf("[DEBUG] shared assets server enabled for %s %s, spa=%v, not-found=%q",
- h.AssetsLocation, h.AssetsWebRoot, h.AssetsSPA, h.Assets404)
-
- fs, err := h.fileServer(h.AssetsWebRoot, h.AssetsLocation, h.AssetsSPA, notFound)
+ log.Printf("[DEBUG] shared assets server enabled for %s %s, spa=%v", h.AssetsWebRoot, h.AssetsLocation, h.AssetsSPA)
+ fs, err := h.fileServer(h.AssetsWebRoot, h.AssetsLocation, h.AssetsSPA)
  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) fileServer(assetsWebRoot, assetsLocation string, spa bool, notFound []byte) (http.Handler, error) {
- var notFoundReader io.Reader
- if notFound != nil {
- notFoundReader = bytes.NewReader(notFound)
- }
+func (h *Http) fileServer(assetsWebRoot, assetsLocation string, spa bool) (http.Handler, error) {
  if spa {
- return R.NewFileServer(assetsWebRoot, assetsLocation, R.FsOptCustom404(notFoundReader), R.FsOptSPA)
+ return R.FileServerSPA(assetsWebRoot, assetsLocation, nil)
  }
- return R.NewFileServer(assetsWebRoot, assetsLocation, R.FsOptCustom404(notFoundReader))
+ return R.FileServer(assetsWebRoot, assetsLocation, nil)
 }
 
 func (h *Http) isAssetRequest(r *http.Request) bool {

app/proxy/proxy_test.go

@@ -189,9 +189,6 @@ func TestHttp_DoWithAssets(t *testing.T) {
  require.NoError(t, err)
  defer resp.Body.Close()
  assert.Equal(t, http.StatusNotFound, resp.StatusCode)
- body, err := io.ReadAll(resp.Body)
- require.NoError(t, err)
- assert.Equal(t, "404 page not found\n", string(body))
  }
 
  {
@@ -206,99 +203,6 @@ func TestHttp_DoWithAssets(t *testing.T) {
  }
 }
 
-func TestHttp_DoWithAssetsCustom404(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", Assets404: "404.html",
- CacheControl: cc, Reporter: &ErrorReporter{Nice: false}}
- ctx, cancel := context.WithTimeout(context.Background(), 1000*time.Millisecond)
- defer cancel()
-
- ds := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- t.Logf("req: %v", r)
- w.Header().Add("h1", "v1")
- require.Equal(t, "127.0.0.1", r.Header.Get("X-Real-IP"))
- fmt.Fprintf(w, "response %s", r.URL.String())
- }))
-
- svc := discovery.NewService([]discovery.Provider{
- &provider.Static{Rules: []string{
- "localhost,^/api/(.*)," + ds.URL + "/123/$1,",
- "127.0.0.1,^/api/(.*)," + ds.URL + "/567/$1,",
- },
- }}, time.Millisecond*10)
-
- go func() {
- _ = svc.Run(context.Background())
- }()
- time.Sleep(50 * time.Millisecond)
- h.Matcher = svc
- h.Metrics = mgmt.NewMetrics()
-
- go func() {
- _ = h.Run(ctx)
- }()
- time.Sleep(50 * time.Millisecond)
-
- client := http.Client{}
-
- {
- req, err := http.NewRequest("GET", "http://127.0.0.1:"+strconv.Itoa(port)+"/api/something", http.NoBody)
- require.NoError(t, err)
- resp, err := client.Do(req)
- require.NoError(t, err)
- defer resp.Body.Close()
- assert.Equal(t, http.StatusOK, resp.StatusCode)
- t.Logf("%+v", resp.Header)
-
- body, err := io.ReadAll(resp.Body)
- require.NoError(t, err)
- assert.Equal(t, "response /567/something", string(body))
- assert.Equal(t, "", resp.Header.Get("App-Method"))
- assert.Equal(t, "v1", resp.Header.Get("h1"))
- }
-
- {
- resp, err := client.Get("http://localhost:" + strconv.Itoa(port) + "/static/1.html")
- require.NoError(t, err)
- defer resp.Body.Close()
- assert.Equal(t, http.StatusOK, resp.StatusCode)
- t.Logf("%+v", resp.Header)
-
- body, err := io.ReadAll(resp.Body)
- require.NoError(t, err)
- assert.Equal(t, "test html", string(body))
- assert.Equal(t, "", resp.Header.Get("App-Method"))
- assert.Equal(t, "", resp.Header.Get("h1"))
- assert.Equal(t, "public, max-age=43200", resp.Header.Get("Cache-Control"))
- }
-
- {
- resp, err := client.Get("http://localhost:" + strconv.Itoa(port) + "/static/bad.html")
- require.NoError(t, err)
- defer resp.Body.Close()
- assert.Equal(t, http.StatusNotFound, resp.StatusCode)
- body, err := io.ReadAll(resp.Body)
- require.NoError(t, err)
- assert.Equal(t, "not found! blah blah blah\nthere is no spoon", string(body))
- t.Logf("%+v", resp.Header)
- assert.Equal(t, "text/html; charset=utf-8", resp.Header.Get("Content-Type"))
- }
-
- {
- resp, err := client.Get("http://localhost:" + strconv.Itoa(port) + "/static/bad2.html")
- require.NoError(t, err)
- defer resp.Body.Close()
- assert.Equal(t, http.StatusNotFound, resp.StatusCode)
- body, err := io.ReadAll(resp.Body)
- require.NoError(t, err)
- assert.Equal(t, "not found! blah blah blah\nthere is no spoon", string(body))
- t.Logf("%+v", resp.Header)
- assert.Equal(t, "text/html; charset=utf-8", resp.Header.Get("Content-Type"))
- }
-}
-
 func TestHttp_DoWithSpaAssets(t *testing.T) {
  port := rand.Intn(10000) + 40000
  cc := NewCacheControl(time.Hour * 12)

go.mod

@@ -8,19 +8,19 @@ require (
  github.com/felixge/httpsnoop v1.0.2 // indirect
  github.com/go-pkgz/lgr v0.10.4
  github.com/go-pkgz/repeater v1.1.3
- github.com/go-pkgz/rest v1.12.2
+ github.com/go-pkgz/rest v1.11.0
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/gorilla/handlers v1.5.1
  github.com/prometheus/client_golang v1.11.0
- github.com/prometheus/common v0.32.1 // indirect
+ github.com/prometheus/common v0.30.0 // indirect
  github.com/prometheus/procfs v0.7.3 // indirect
  github.com/stretchr/testify v1.7.0
  github.com/umputun/go-flags v1.5.1
  golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
  golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
  golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 // indirect
  golang.org/x/text v0.3.7 // indirect
- golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
+ golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
  google.golang.org/protobuf v1.27.1 // indirect
  gopkg.in/natefinch/lumberjack.v2 v2.0.0
  gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b

go.sum

@@ -81,12 +81,6 @@ github.com/go-pkgz/repeater v1.1.3 h1:q6+JQF14ESSy28Dd7F+wRelY4F+41HJ0LEy/szNnMi
 github.com/go-pkgz/repeater v1.1.3/go.mod h1:hVTavuO5x3Gxnu8zW7d6sQBfAneKV8X2FjU48kGfpKw=
 github.com/go-pkgz/rest v1.11.0 h1:Z//qgmM0NhBYfhXYEP/aJtDVLK5XlJGxqcb4sHFNN0E=
 github.com/go-pkgz/rest v1.11.0/go.mod h1:wZ/dGipZUaF9to0vIQl7PwDHgWQDB0jsrFg1xnAKLDw=
-github.com/go-pkgz/rest v1.12.0 h1:zabW9ZLZzSyGsrTtEgzGUhGCfqcPnCr5nhfrap96mU4=
-github.com/go-pkgz/rest v1.12.0/go.mod h1:KUWAqbDteYGS/CiXftomQsKjtEOifXsJ36Ka0skYbmk=
-github.com/go-pkgz/rest v1.12.1 h1:s5EoHrHknaioHT/mGWaRMDk9GH2U/FmGMWQsCMj6III=
-github.com/go-pkgz/rest v1.12.1/go.mod h1:KUWAqbDteYGS/CiXftomQsKjtEOifXsJ36Ka0skYbmk=
-github.com/go-pkgz/rest v1.12.2 h1:AQ7uuBmMcufbiUBc4IS8aqDNMvRJlhtRpXLSNRitjVo=
-github.com/go-pkgz/rest v1.12.2/go.mod h1:KUWAqbDteYGS/CiXftomQsKjtEOifXsJ36Ka0skYbmk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -193,8 +187,6 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.30.0 h1:JEkYlQnpzrzQFxi6gnukFPdQ+ac82oRhzMcIduJu/Ug=
 github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
@@ -351,8 +343,6 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 h1:xrCZDmdtoloIiooiA9q0OQb9r8HejIHYoHGhGCe1pGg=
 golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -368,8 +358,6 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=