Merge pull request #2910 from cloudfoundry-incubator/apply-cache-cont…

…rol-non-static Update cache-control header
cloudfoundry · Aug 24, 2018 · 8e99ca3 · 8e99ca3
2 parents f3df0c6 + 3717766
commit 8e99ca3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
@@ -643,6 +643,8 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, addSetupMiddleware *setupMidd
 		pp = e.Group("")
 	}
 
+	pp.Use(p.setSecureCacheContentMiddleware)
+
 	// Add middleware to block requests if unconfigured
 	if addSetupMiddleware.addSetup {
 		go p.SetupPoller(addSetupMiddleware)
@@ -730,6 +732,7 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, addSetupMiddleware *setupMidd
 
 	// Serve up static resources
 	if err == nil {
+		e.Use(p.setStaticCacheContentMiddleware)
 		log.Debug("Add URL Check Middleware")
 		e.Use(p.urlCheckMiddleware)
 		e.Use(middleware.Gzip())

diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
@@ -135,6 +135,21 @@ func (p *portalProxy) urlCheckMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
 	}
 }
 
+func (p *portalProxy) setStaticCacheContentMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		log.Debug("setStaticContentHeadersMiddleware")
+		c.Response().Header().Set("cache-control", "no-cache")
+		return h(c)
+	}
+}
+
+func (p *portalProxy) setSecureCacheContentMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		c.Response().Header().Set("cache-control", "no-store")
+		return h(c)
+	}
+}
+
 func (p *portalProxy) adminMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		// if user is an admin, passthrough request