Added development mode and serve assets with cache enabled

development.go

+package main
+
+import "net/http"
+
+func handleDevelopmentMode(developmentMode *bool, handler serviceHandleFunc) serviceHandleFunc {
+	return func(w http.ResponseWriter, r *gitRequest) {
+		if !*developmentMode {
+			http.NotFound(w, r.Request)
+			return
+		}
+
+		handler(w, r)
+	}
+}

development_test.go

+package main
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestDevelopmentModeEnabled(t *testing.T) {
+	developmentMode := true
+
+	r, _ := http.NewRequest("GET", "/something", nil)
+	w := httptest.NewRecorder()
+
+	executed := false
+	handleDevelopmentMode(&developmentMode, func(w http.ResponseWriter, r *gitRequest) {
+		executed = true
+	})(w, &gitRequest{Request: r})
+	if !executed {
+		t.Error("The handler should get executed")
+	}
+}
+
+func TestDevelopmentModeDisabled(t *testing.T) {
+	developmentMode := false
+
+	r, _ := http.NewRequest("GET", "/something", nil)
+	w := httptest.NewRecorder()
+
+	executed := false
+	handleDevelopmentMode(&developmentMode, func(w http.ResponseWriter, r *gitRequest) {
+		executed = true
+	})(w, &gitRequest{Request: r})
+	if executed {
+		t.Error("The handler should not get executed")
+	}
+	assertResponseCode(t, w, 404)
+}

helpers_test.go

@@ -16,3 +16,9 @@ func assertResponseBody(t *testing.T, response *httptest.ResponseRecorder, expec
 		t.Fatalf("for HTTP request expected to receive %q, got %q instead as body", expectedBody, response.Body.String())
 	}
 }
+
+func assertResponseHeader(t *testing.T, response *httptest.ResponseRecorder, header string, expectedValue string) {
+	if response.Header().Get(header) != expectedValue {
+		t.Fatalf("for HTTP request expected to receive the header %q with %q, got %q", header, expectedValue, response.Header().Get(header))
+	}
+}

main.go

@@ -39,6 +39,7 @@ var pprofListenAddr = flag.String("pprofListenAddr", "", "pprof listening addres
 var relativeURLRoot = flag.String("relativeURLRoot", "/", "GitLab relative URL root")
 var documentRoot = flag.String("documentRoot", "public", "Path to static files content")
 var responseHeadersTimeout = flag.Duration("proxyHeadersTimeout", time.Minute, "How long to wait for response headers when proxying the request")
+var developmentMode = flag.Bool("developmentMode", false, "Allow to serve assets from Rails app")
 
 type httpRoute struct {
 	method     string
@@ -85,6 +86,19 @@ var httpRoutes = [...]httpRoute{
 	httpRoute{"", regexp.MustCompile(apiPattern), proxyRequest},
 	httpRoute{"", regexp.MustCompile(ciAPIPattern), proxyRequest},
 
+	// Serve assets
+	httpRoute{"", regexp.MustCompile(`^/assets/`),
+		handleServeFile(documentRoot, CacheExpireMax,
+			handleDevelopmentMode(developmentMode,
+				handleDeployPage(documentRoot,
+					handleRailsError(documentRoot,
+						proxyRequest,
+					),
+				),
+			),
+		),
+	},
+
 	// Serve static files or forward the requests
 	httpRoute{"", nil,
 		handleServeFile(documentRoot, CacheDisabled,