diff options
| author | Zettat123 <zettat123@gmail.com> | 2024-10-31 23:28:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 15:28:25 +0000 |
| commit | 0690cb076bf63f71988a709f62a9c04660b51a4f (patch) | |
| tree | 476e377eff422fd86c11c78f49b0ef3b7f3e9fc3 /modules/packages | |
| parent | 810782302652d73c4f7249c4c3df8a7e85bae5f0 (diff) | |
| download | gitea-0690cb076bf63f71988a709f62a9c04660b51a4f.tar.gz gitea-0690cb076bf63f71988a709f62a9c04660b51a4f.zip | |
Fix `missing signature key` error when pulling Docker images with `SERVE_DIRECT` enabled (#32365)
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.
https://github.com/go-gitea/gitea/blob/348d1d0f322ca57c459acd902f54821d687ca804/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.
https://github.com/go-gitea/gitea/blob/b7fb20e73e63b8edc9b90c52073e248bef428fcc/modules/storage/minio.go#L214-L221
Diffstat (limited to 'modules/packages')
| -rw-r--r-- | modules/packages/content_store.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/packages/content_store.go b/modules/packages/content_store.go index 2108be64d2..37612556d7 100644 --- a/modules/packages/content_store.go +++ b/modules/packages/content_store.go @@ -37,8 +37,8 @@ func (s *ContentStore) ShouldServeDirect() bool { return setting.Packages.Storage.ServeDirect() } -func (s *ContentStore) GetServeDirectURL(key BlobHash256Key, filename string) (*url.URL, error) { - return s.store.URL(KeyToRelativePath(key), filename) +func (s *ContentStore) GetServeDirectURL(key BlobHash256Key, filename string, reqParams url.Values) (*url.URL, error) { + return s.store.URL(KeyToRelativePath(key), filename, reqParams) } // FIXME: Workaround to be removed in v1.20 |