Remove builder's specific path from panic

Also fix the index out of range caused panic
soitun · Jul 17, 2019 · 2a42f44 · 2a42f44
1 parent c0c17ca
commit 2a42f44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/corehttp/proxy.go b/core/corehttp/proxy.go
@@ -65,7 +65,7 @@ func parseRequest(request *http.Request) (*proxyRequest, error) {
  }
 
  split = strings.SplitN(path, "/", 7)
- if split[3] != "x" || split[5] != "http" {
+ if len(split) < 7 || split[3] != "x" || split[5] != "http" {
  return nil, fmt.Errorf("Invalid request path '%s'", path)
  }
 

diff --git a/mk/golang.mk b/mk/golang.mk
@@ -10,6 +10,9 @@ unexport GOFLAGS
 GOFLAGS ?=
 GOTFLAGS ?=
 
+# Try to make building as reproducible as possible by stripping the go path.
+GOFLAGS += -asmflags=all=-trimpath="$(GOPATH)" -gcflags=all=-trimpath="$(GOPATH)"
+
 ifeq ($(tarball-is),1)
  GOFLAGS += -mod=vendor
 endif