mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-27 12:53:57 +01: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.
170 lines
4.4 KiB
Go
170 lines
4.4 KiB
Go
// Copyright 2014 The Gogs Authors. All rights reserved.
|
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"path"
|
|
"time"
|
|
|
|
git_model "code.gitea.io/gitea/models/git"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/httpcache"
|
|
"code.gitea.io/gitea/modules/lfs"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/storage"
|
|
"code.gitea.io/gitea/routers/common"
|
|
"code.gitea.io/gitea/services/context"
|
|
)
|
|
|
|
// ServeBlobOrLFS download a git.Blob redirecting to LFS if necessary
|
|
func ServeBlobOrLFS(ctx *context.Context, blob *git.Blob, lastModified *time.Time) error {
|
|
if httpcache.HandleGenericETagTimeCache(ctx.Req, ctx.Resp, `"`+blob.ID.String()+`"`, lastModified) {
|
|
return nil
|
|
}
|
|
|
|
dataRc, err := blob.DataAsync()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
closed := false
|
|
defer func() {
|
|
if closed {
|
|
return
|
|
}
|
|
if err = dataRc.Close(); err != nil {
|
|
log.Error("ServeBlobOrLFS: Close: %v", err)
|
|
}
|
|
}()
|
|
|
|
pointer, _ := lfs.ReadPointer(dataRc)
|
|
if pointer.IsValid() {
|
|
meta, _ := git_model.GetLFSMetaObjectByOid(ctx, ctx.Repo.Repository.ID, pointer.Oid)
|
|
if meta == nil {
|
|
if err = dataRc.Close(); err != nil {
|
|
log.Error("ServeBlobOrLFS: Close: %v", err)
|
|
}
|
|
closed = true
|
|
return common.ServeBlob(ctx.Base, ctx.Repo.TreePath, blob, lastModified)
|
|
}
|
|
if httpcache.HandleGenericETagCache(ctx.Req, ctx.Resp, `"`+pointer.Oid+`"`) {
|
|
return nil
|
|
}
|
|
|
|
if setting.LFS.Storage.MinioConfig.ServeDirect {
|
|
// If we have a signed url (S3, object storage, blob storage), redirect to this directly.
|
|
u, err := storage.LFS.URL(pointer.RelativePath(), blob.Name(), nil)
|
|
if u != nil && err == nil {
|
|
ctx.Redirect(u.String())
|
|
return nil
|
|
}
|
|
}
|
|
|
|
lfsDataRc, err := lfs.ReadMetaObject(meta.Pointer)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() {
|
|
if err = lfsDataRc.Close(); err != nil {
|
|
log.Error("ServeBlobOrLFS: Close: %v", err)
|
|
}
|
|
}()
|
|
common.ServeContentByReadSeeker(ctx.Base, ctx.Repo.TreePath, lastModified, lfsDataRc)
|
|
return nil
|
|
}
|
|
if err = dataRc.Close(); err != nil {
|
|
log.Error("ServeBlobOrLFS: Close: %v", err)
|
|
}
|
|
closed = true
|
|
|
|
return common.ServeBlob(ctx.Base, ctx.Repo.TreePath, blob, lastModified)
|
|
}
|
|
|
|
func getBlobForEntry(ctx *context.Context) (blob *git.Blob, lastModified *time.Time) {
|
|
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)
|
|
if err != nil {
|
|
if git.IsErrNotExist(err) {
|
|
ctx.NotFound("GetTreeEntryByPath", err)
|
|
} else {
|
|
ctx.ServerError("GetTreeEntryByPath", err)
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
if entry.IsDir() || entry.IsSubModule() {
|
|
ctx.NotFound("getBlobForEntry", nil)
|
|
return nil, nil
|
|
}
|
|
|
|
info, _, err := git.Entries([]*git.TreeEntry{entry}).GetCommitsInfo(ctx, ctx.Repo.Commit, path.Dir("/" + ctx.Repo.TreePath)[1:])
|
|
if err != nil {
|
|
ctx.ServerError("GetCommitsInfo", err)
|
|
return nil, nil
|
|
}
|
|
|
|
if len(info) == 1 {
|
|
// Not Modified
|
|
lastModified = &info[0].Commit.Committer.When
|
|
}
|
|
blob = entry.Blob()
|
|
|
|
return blob, lastModified
|
|
}
|
|
|
|
// SingleDownload download a file by repos path
|
|
func SingleDownload(ctx *context.Context) {
|
|
blob, lastModified := getBlobForEntry(ctx)
|
|
if blob == nil {
|
|
return
|
|
}
|
|
|
|
if err := common.ServeBlob(ctx.Base, ctx.Repo.TreePath, blob, lastModified); err != nil {
|
|
ctx.ServerError("ServeBlob", err)
|
|
}
|
|
}
|
|
|
|
// SingleDownloadOrLFS download a file by repos path redirecting to LFS if necessary
|
|
func SingleDownloadOrLFS(ctx *context.Context) {
|
|
blob, lastModified := getBlobForEntry(ctx)
|
|
if blob == nil {
|
|
return
|
|
}
|
|
|
|
if err := ServeBlobOrLFS(ctx, blob, lastModified); err != nil {
|
|
ctx.ServerError("ServeBlobOrLFS", err)
|
|
}
|
|
}
|
|
|
|
// DownloadByID download a file by sha1 ID
|
|
func DownloadByID(ctx *context.Context) {
|
|
blob, err := ctx.Repo.GitRepo.GetBlob(ctx.Params("sha"))
|
|
if err != nil {
|
|
if git.IsErrNotExist(err) {
|
|
ctx.NotFound("GetBlob", nil)
|
|
} else {
|
|
ctx.ServerError("GetBlob", err)
|
|
}
|
|
return
|
|
}
|
|
if err = common.ServeBlob(ctx.Base, ctx.Repo.TreePath, blob, nil); err != nil {
|
|
ctx.ServerError("ServeBlob", err)
|
|
}
|
|
}
|
|
|
|
// DownloadByIDOrLFS download a file by sha1 ID taking account of LFS
|
|
func DownloadByIDOrLFS(ctx *context.Context) {
|
|
blob, err := ctx.Repo.GitRepo.GetBlob(ctx.Params("sha"))
|
|
if err != nil {
|
|
if git.IsErrNotExist(err) {
|
|
ctx.NotFound("GetBlob", nil)
|
|
} else {
|
|
ctx.ServerError("GetBlob", err)
|
|
}
|
|
return
|
|
}
|
|
if err = ServeBlobOrLFS(ctx, blob, nil); err != nil {
|
|
ctx.ServerError("ServeBlob", err)
|
|
}
|
|
}
|