mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-22 05:45:10 +01:00
0690cb076b
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)
76 lines
2.2 KiB
Go
76 lines
2.2 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package packages
|
|
|
|
import (
|
|
"io"
|
|
"net/url"
|
|
"path"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/storage"
|
|
"code.gitea.io/gitea/modules/util"
|
|
)
|
|
|
|
// BlobHash256Key is the key to address a blob content
|
|
type BlobHash256Key string
|
|
|
|
// ContentStore is a wrapper around ObjectStorage
|
|
type ContentStore struct {
|
|
store storage.ObjectStorage
|
|
}
|
|
|
|
// NewContentStore creates the default package store
|
|
func NewContentStore() *ContentStore {
|
|
contentStore := &ContentStore{storage.Packages}
|
|
return contentStore
|
|
}
|
|
|
|
// Get gets a package blob
|
|
func (s *ContentStore) Get(key BlobHash256Key) (storage.Object, error) {
|
|
return s.store.Open(KeyToRelativePath(key))
|
|
}
|
|
|
|
func (s *ContentStore) ShouldServeDirect() bool {
|
|
return setting.Packages.Storage.ServeDirect()
|
|
}
|
|
|
|
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
|
|
// https://github.com/go-gitea/gitea/issues/19586
|
|
func (s *ContentStore) Has(key BlobHash256Key) error {
|
|
_, err := s.store.Stat(KeyToRelativePath(key))
|
|
return err
|
|
}
|
|
|
|
// Save stores a package blob
|
|
func (s *ContentStore) Save(key BlobHash256Key, r io.Reader, size int64) error {
|
|
_, err := s.store.Save(KeyToRelativePath(key), r, size)
|
|
return err
|
|
}
|
|
|
|
// Delete deletes a package blob
|
|
func (s *ContentStore) Delete(key BlobHash256Key) error {
|
|
return s.store.Delete(KeyToRelativePath(key))
|
|
}
|
|
|
|
// KeyToRelativePath converts the sha256 key aabb000000... to aa/bb/aabb000000...
|
|
func KeyToRelativePath(key BlobHash256Key) string {
|
|
return path.Join(string(key)[0:2], string(key)[2:4], string(key))
|
|
}
|
|
|
|
// RelativePathToKey converts a relative path aa/bb/aabb000000... to the sha256 key aabb000000...
|
|
func RelativePathToKey(relativePath string) (BlobHash256Key, error) {
|
|
parts := strings.SplitN(relativePath, "/", 3)
|
|
if len(parts) != 3 || len(parts[0]) != 2 || len(parts[1]) != 2 || len(parts[2]) < 4 || parts[0]+parts[1] != parts[2][0:4] {
|
|
return "", util.ErrInvalidArgument
|
|
}
|
|
|
|
return BlobHash256Key(parts[2]), nil
|
|
}
|