add strip_content_disposition to copy command

Author: leafo

README.md

@@ -173,6 +173,10 @@ zipserver copy --key path/to/file.zip --target s3backup --dest-key renamed.zip
 # With HTML footer injection
 zipserver copy --key games/123/index.html --target s3backup \
   --html-footer '<script src="/analytics.js"></script>'
+
+# Strip Content-Disposition header (allow inline rendering instead of download)
+zipserver copy --key uploads/game.html --dest-key html5games/123/index.html \
+  --strip-content-disposition
 ```
 
 **HTTP API:**
@@ -194,6 +198,9 @@ curl -X POST "http://localhost:8090/copy" \
   -d "key=games/123/index.html" \
   -d "target=s3backup" \
   -d "html_footer=<script src=\"/analytics.js\"></script>"
+
+# Strip Content-Disposition header (allow inline rendering instead of download)
+curl "http://localhost:8090/copy?key=uploads/game.html&dest_key=html5games/123/index.html&strip_content_disposition=true"
 ```
 
 Either `target` or `dest_key` (or both) must be provided. When copying within the same storage (no `target`), `dest_key` must differ from `key`.

main.go

@@ -51,12 +51,13 @@ var (
 	extractHtmlFooter   = extractCmd.Flag("html-footer", "HTML snippet to append to all index.html files").String()
 
 	// Copy command
-	copyCmd        = app.Command("copy", "Copy a file to target storage or different key")
-	copyKey        = copyCmd.Flag("key", "Storage key to copy").Required().String()
-	copyDestKey    = copyCmd.Flag("dest-key", "Destination key (defaults to source key)").String()
-	copyTarget     = copyCmd.Flag("target", "Target storage name").String()
-	copyBucket     = copyCmd.Flag("bucket", "Expected bucket (optional verification)").String()
-	copyHtmlFooter = copyCmd.Flag("html-footer", "HTML snippet to append to copied file").String()
+	copyCmd                     = app.Command("copy", "Copy a file to target storage or different key")
+	copyKey                     = copyCmd.Flag("key", "Storage key to copy").Required().String()
+	copyDestKey                 = copyCmd.Flag("dest-key", "Destination key (defaults to source key)").String()
+	copyTarget                  = copyCmd.Flag("target", "Target storage name").String()
+	copyBucket                  = copyCmd.Flag("bucket", "Expected bucket (optional verification)").String()
+	copyHtmlFooter              = copyCmd.Flag("html-footer", "HTML snippet to append to copied file").String()
+	copyStripContentDisposition = copyCmd.Flag("strip-content-disposition", "Remove Content-Disposition header from copied file").Bool()
 
 	// Delete command
 	deleteCmd    = app.Command("delete", "Delete files from storage")
@@ -232,11 +233,12 @@ func runCopy(config *zipserver.Config) {
 	ops := zipserver.NewOperations(config)
 
 	params := zipserver.CopyParams{
-		Key:            *copyKey,
-		DestKey:        *copyDestKey,
-		TargetName:     *copyTarget,
-		ExpectedBucket: *copyBucket,
-		HtmlFooter:     *copyHtmlFooter,
+		Key:                     *copyKey,
+		DestKey:                 *copyDestKey,
+		TargetName:              *copyTarget,
+		ExpectedBucket:          *copyBucket,
+		HtmlFooter:              *copyHtmlFooter,
+		StripContentDisposition: *copyStripContentDisposition,
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(config.JobTimeout))

zipserver/copy_handler.go

@@ -74,9 +74,14 @@ func (o *Operations) Copy(ctx context.Context, params CopyParams) CopyResult {
 
 	mReader := newMeasuredReader(finalReader)
 
+	contentDisposition := ""
+	if !params.StripContentDisposition {
+		contentDisposition = headers.Get("Content-Disposition")
+	}
+
 	opts := PutOptions{
 		ContentType:        contentType,
-		ContentDisposition: headers.Get("Content-Disposition"),
+		ContentDisposition: contentDisposition,
 		ContentEncoding:    contentEncoding,
 		ACL:                ACLPublicRead,
 	}
@@ -181,13 +186,15 @@ func copyHandler(w http.ResponseWriter, r *http.Request) error {
 
 	expectedBucket, _ := getParam(params, "bucket")
 	htmlFooter := params.Get("html_footer")
+	stripContentDisposition := params.Get("strip_content_disposition") == "true"
 
 	copyParams := CopyParams{
-		Key:            key,
-		DestKey:        destKey,
-		TargetName:     targetName,
-		ExpectedBucket: expectedBucket,
-		HtmlFooter:     htmlFooter,
+		Key:                     key,
+		DestKey:                 destKey,
+		TargetName:              targetName,
+		ExpectedBucket:          expectedBucket,
+		HtmlFooter:              htmlFooter,
+		StripContentDisposition: stripContentDisposition,
 	}
 	if err := copyParams.Validate(globalConfig); err != nil {
 		return err

zipserver/copy_handler_test.go

@@ -195,6 +195,47 @@ func TestCopy_PreservesHeaders(t *testing.T) {
 	})
 }
 
+func TestCopy_StripContentDisposition(t *testing.T) {
+	withGoogleCloudStorage(t, func(storage Storage, config *Config) {
+		ctx := context.Background()
+		targetName := "mem-target-copy-strip-disposition"
+		defer ClearNamedMemStorage(targetName)
+
+		config.StorageTargets = []StorageConfig{{
+			Name:   targetName,
+			Type:   Mem,
+			Bucket: "target-bucket",
+		}}
+
+		testKey := "zipserver_test/copy_strip_disposition_test.html"
+		_, err := storage.PutFile(ctx, config.Bucket, testKey,
+			strings.NewReader("<html><body>test</body></html>"), PutOptions{
+				ContentType:        "text/html",
+				ContentDisposition: "attachment; filename=\"game.html\"",
+				ACL:                ACLPublicRead,
+			})
+		require.NoError(t, err)
+
+		ops := NewOperations(config)
+		result := ops.Copy(ctx, CopyParams{
+			Key:                     testKey,
+			TargetName:              targetName,
+			StripContentDisposition: true,
+		})
+
+		require.NoError(t, result.Err)
+
+		// Verify Content-Type preserved but Content-Disposition stripped
+		targetStorage := GetNamedMemStorage(targetName)
+		reader, headers, err := targetStorage.GetFile(ctx, "target-bucket", testKey)
+		require.NoError(t, err)
+		defer reader.Close()
+
+		assert.Equal(t, "text/html", headers.Get("Content-Type"))
+		assert.Empty(t, headers.Get("Content-Disposition"))
+	})
+}
+
 func TestCopy_WithHtmlFooter(t *testing.T) {
 	withGoogleCloudStorage(t, func(storage Storage, config *Config) {
 		ctx := context.Background()

zipserver/operations.go

@@ -30,11 +30,12 @@ type ExtractResult struct {
 
 // CopyParams contains parameters for the copy operation
 type CopyParams struct {
-	Key            string // Storage key to copy
-	DestKey        string // Optional: destination key (defaults to Key if empty)
-	TargetName     string // Optional: target storage name (if empty, copies within primary storage)
-	ExpectedBucket string // Optional: expected bucket for validation
-	HtmlFooter     string // Optional: HTML to append to index.html files
+	Key                     string // Storage key to copy
+	DestKey                 string // Optional: destination key (defaults to Key if empty)
+	TargetName              string // Optional: target storage name (if empty, copies within primary storage)
+	ExpectedBucket          string // Optional: expected bucket for validation
+	HtmlFooter              string // Optional: HTML to append to index.html files
+	StripContentDisposition bool   // Optional: if true, don't copy Content-Disposition header
 }
 
 // DestKeyOrKey returns the destination key, defaulting to Key when DestKey is empty.