added no-cache for 404 responses

oxyno-zeta · May 21, 2024 · d22b0e9 · d22b0e9
1 parent bd49f2a
commit d22b0e9
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/pkg/s3-proxy/response-handler/error-handlers.go b/pkg/s3-proxy/response-handler/error-handlers.go
@@ -157,6 +157,9 @@ func (h *handler) NotFoundError(
 	// Get configuration
 	cfg := h.cfgManager.GetConfig()
 
+	// force no-cache headers for 404 status codes
+	h.res.Header().Set("Cache-Control", "no-cache, no-store, no-transform, must-revalidate, private, max-age=0")
+
 	// Create specific error
 	err := errors.New("Not Found")
 

diff --git a/pkg/s3-proxy/server/server_integration_test.go b/pkg/s3-proxy/server/server_integration_test.go
@@ -483,6 +483,58 @@ func TestPublicRouter(t *testing.T) {
 				"X-Accel-Expires": "0",
 			},
 		},
+		{
+			name: "GET a file with cache management enabled, but not found",
+			args: args{
+				cfg: &config.Config{
+					Server: &config.ServerConfig{
+						Cache: &config.CacheConfig{
+							Expires:       "expires",
+							CacheControl:  "must-revalidate, max-age=0",
+							Pragma:        "pragma",
+							XAccelExpires: "xaccelexpires",
+						},
+						Compress: svrCfg.Compress,
+					},
+					ListTargets: &config.ListTargetsConfig{},
+					Tracing:     tracingConfig,
+					Templates:   testsDefaultGeneralTemplateConfig,
+					Targets: map[string]*config.TargetConfig{
+						"target1": {
+							Name: "target1",
+							Bucket: &config.BucketConfig{
+								Name:       bucket,
+								Region:     region,
+								S3Endpoint: s3server.URL,
+								Credentials: &config.BucketCredentialConfig{
+									AccessKey: &config.CredentialConfig{Value: accessKey},
+									SecretKey: &config.CredentialConfig{Value: secretAccessKey},
+								},
+								DisableSSL: true,
+							},
+							Mount: &config.MountConfig{
+								Path: []string{"/mount/"},
+							},
+							Actions: &config.ActionsConfig{
+								GET: &config.GetActionConfig{Enabled: true},
+							},
+						},
+					},
+				},
+			},
+			inputMethod:  "GET",
+			inputURL:     "http://localhost/mount/folder1/test.txt-not-existing",
+			expectedCode: 404,
+			expectedBody: `<!DOCTYPE html>
+<html>
+  <body>
+    <h1>Not Found /mount/folder1/test.txt-not-existing</h1>
+  </body>
+</html>`,
+			expectedHeaders: map[string]string{
+				"Cache-Control": "no-cache, no-store, no-transform, must-revalidate, private, max-age=0",
+			},
+		},
 		{
 			name: "GET a file with cache management enabled",
 			args: args{