mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-14 11:48:09 -05:00
6b74043b85
Fix #28121 I did some tests and found that the `missing signature key` error is caused by an incorrect `Content-Type` header. Gitea correctly sets the `Content-Type` header when serving files.348d1d0f32/routers/api/packages/container/container.go (L712-L717)However, when `SERVE_DIRECT` is enabled, the `Content-Type` header may be set to an incorrect value by the storage service. To fix this issue, we can use query parameters to override response header values. https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html <img width="600px" src="https://github.com/user-attachments/assets/f2ff90f0-f1df-46f9-9680-b8120222c555" /> In this PR, I introduced a new parameter to the `URL` method to support additional parameters. ``` URL(path, name string, reqParams url.Values) (*url.URL, error) ``` --- Most S3-like services support specifying the content type when storing objects. However, Gitea always use `application/octet-stream`. Therefore, I believe we also need to improve the `Save` method to support storing objects with the correct content type.b7fb20e73e/modules/storage/minio.go (L214-L221)(cherry picked from commit 0690cb076bf63f71988a709f62a9c04660b51a4f) Conflicts: - modules/storage/azureblob.go Dropped the change, as we do not support Azure blob storage. - modules/storage/helper.go Resolved by adjusting their `discardStorage` to our `DiscardStorage` - routers/api/actions/artifacts.go routers/api/actions/artifactsv4.go routers/web/repo/actions/view.go routers/web/repo/download.go Resolved the conflicts by manually adding the new `nil` parameter to the `storage.Attachments.URL()` calls. Originally conflicted due to differences in the if expression above these calls.
51 lines
1.1 KiB
Go
51 lines
1.1 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package storage
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func Test_discardStorage(t *testing.T) {
|
|
tests := []DiscardStorage{
|
|
UninitializedStorage,
|
|
DiscardStorage("empty"),
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(string(tt), func(t *testing.T) {
|
|
{
|
|
got, err := tt.Open("path")
|
|
assert.Nil(t, got)
|
|
require.Error(t, err, string(tt))
|
|
}
|
|
{
|
|
got, err := tt.Save("path", bytes.NewReader([]byte{0}), 1)
|
|
assert.Equal(t, int64(0), got)
|
|
require.Error(t, err, string(tt))
|
|
}
|
|
{
|
|
got, err := tt.Stat("path")
|
|
assert.Nil(t, got)
|
|
require.Error(t, err, string(tt))
|
|
}
|
|
{
|
|
err := tt.Delete("path")
|
|
require.Error(t, err, string(tt))
|
|
}
|
|
{
|
|
got, err := tt.URL("path", "name", nil)
|
|
assert.Nil(t, got)
|
|
require.Errorf(t, err, string(tt))
|
|
}
|
|
{
|
|
err := tt.IterateObjects("", func(_ string, _ Object) error { return nil })
|
|
require.Error(t, err, string(tt))
|
|
}
|
|
})
|
|
}
|
|
}
|