mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 13:34:43 +01:00 
			
		
		
		
	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)
		
			
				
	
	
		
			155 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			155 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2020 The Gitea Authors. All rights reserved.
 | 
						|
// SPDX-License-Identifier: MIT
 | 
						|
 | 
						|
package storage
 | 
						|
 | 
						|
import (
 | 
						|
	"context"
 | 
						|
	"fmt"
 | 
						|
	"io"
 | 
						|
	"net/url"
 | 
						|
	"os"
 | 
						|
	"path/filepath"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/modules/log"
 | 
						|
	"code.gitea.io/gitea/modules/setting"
 | 
						|
	"code.gitea.io/gitea/modules/util"
 | 
						|
)
 | 
						|
 | 
						|
var _ ObjectStorage = &LocalStorage{}
 | 
						|
 | 
						|
// LocalStorage represents a local files storage
 | 
						|
type LocalStorage struct {
 | 
						|
	ctx    context.Context
 | 
						|
	dir    string
 | 
						|
	tmpdir string
 | 
						|
}
 | 
						|
 | 
						|
// NewLocalStorage returns a local files
 | 
						|
func NewLocalStorage(ctx context.Context, config *setting.Storage) (ObjectStorage, error) {
 | 
						|
	if !filepath.IsAbs(config.Path) {
 | 
						|
		return nil, fmt.Errorf("LocalStorageConfig.Path should have been prepared by setting/storage.go and should be an absolute path, but not: %q", config.Path)
 | 
						|
	}
 | 
						|
	log.Info("Creating new Local Storage at %s", config.Path)
 | 
						|
	if err := os.MkdirAll(config.Path, os.ModePerm); err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	if config.TemporaryPath == "" {
 | 
						|
		config.TemporaryPath = filepath.Join(config.Path, "tmp")
 | 
						|
	}
 | 
						|
	if !filepath.IsAbs(config.TemporaryPath) {
 | 
						|
		return nil, fmt.Errorf("LocalStorageConfig.TemporaryPath should be an absolute path, but not: %q", config.TemporaryPath)
 | 
						|
	}
 | 
						|
 | 
						|
	return &LocalStorage{
 | 
						|
		ctx:    ctx,
 | 
						|
		dir:    config.Path,
 | 
						|
		tmpdir: config.TemporaryPath,
 | 
						|
	}, nil
 | 
						|
}
 | 
						|
 | 
						|
func (l *LocalStorage) buildLocalPath(p string) string {
 | 
						|
	return util.FilePathJoinAbs(l.dir, p)
 | 
						|
}
 | 
						|
 | 
						|
// Open a file
 | 
						|
func (l *LocalStorage) Open(path string) (Object, error) {
 | 
						|
	return os.Open(l.buildLocalPath(path))
 | 
						|
}
 | 
						|
 | 
						|
// Save a file
 | 
						|
func (l *LocalStorage) Save(path string, r io.Reader, size int64) (int64, error) {
 | 
						|
	p := l.buildLocalPath(path)
 | 
						|
	if err := os.MkdirAll(filepath.Dir(p), os.ModePerm); err != nil {
 | 
						|
		return 0, err
 | 
						|
	}
 | 
						|
 | 
						|
	// Create a temporary file to save to
 | 
						|
	if err := os.MkdirAll(l.tmpdir, os.ModePerm); err != nil {
 | 
						|
		return 0, err
 | 
						|
	}
 | 
						|
	tmp, err := os.CreateTemp(l.tmpdir, "upload-*")
 | 
						|
	if err != nil {
 | 
						|
		return 0, err
 | 
						|
	}
 | 
						|
	tmpRemoved := false
 | 
						|
	defer func() {
 | 
						|
		if !tmpRemoved {
 | 
						|
			_ = util.Remove(tmp.Name())
 | 
						|
		}
 | 
						|
	}()
 | 
						|
 | 
						|
	n, err := io.Copy(tmp, r)
 | 
						|
	if err != nil {
 | 
						|
		return 0, err
 | 
						|
	}
 | 
						|
 | 
						|
	if err := tmp.Close(); err != nil {
 | 
						|
		return 0, err
 | 
						|
	}
 | 
						|
 | 
						|
	if err := util.Rename(tmp.Name(), p); err != nil {
 | 
						|
		return 0, err
 | 
						|
	}
 | 
						|
	// Golang's tmp file (os.CreateTemp) always have 0o600 mode, so we need to change the file to follow the umask (as what Create/MkDir does)
 | 
						|
	// but we don't want to make these files executable - so ensure that we mask out the executable bits
 | 
						|
	if err := util.ApplyUmask(p, os.ModePerm&0o666); err != nil {
 | 
						|
		return 0, err
 | 
						|
	}
 | 
						|
 | 
						|
	tmpRemoved = true
 | 
						|
 | 
						|
	return n, nil
 | 
						|
}
 | 
						|
 | 
						|
// Stat returns the info of the file
 | 
						|
func (l *LocalStorage) Stat(path string) (os.FileInfo, error) {
 | 
						|
	return os.Stat(l.buildLocalPath(path))
 | 
						|
}
 | 
						|
 | 
						|
// Delete delete a file
 | 
						|
func (l *LocalStorage) Delete(path string) error {
 | 
						|
	return util.Remove(l.buildLocalPath(path))
 | 
						|
}
 | 
						|
 | 
						|
// URL gets the redirect URL to a file
 | 
						|
func (l *LocalStorage) URL(path, name string, reqParams url.Values) (*url.URL, error) {
 | 
						|
	return nil, ErrURLNotSupported
 | 
						|
}
 | 
						|
 | 
						|
// IterateObjects iterates across the objects in the local storage
 | 
						|
func (l *LocalStorage) IterateObjects(dirName string, fn func(path string, obj Object) error) error {
 | 
						|
	dir := l.buildLocalPath(dirName)
 | 
						|
	return filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
 | 
						|
		if err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		select {
 | 
						|
		case <-l.ctx.Done():
 | 
						|
			return l.ctx.Err()
 | 
						|
		default:
 | 
						|
		}
 | 
						|
		if path == l.dir {
 | 
						|
			return nil
 | 
						|
		}
 | 
						|
		if d.IsDir() {
 | 
						|
			return nil
 | 
						|
		}
 | 
						|
		relPath, err := filepath.Rel(l.dir, path)
 | 
						|
		if err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		obj, err := os.Open(path)
 | 
						|
		if err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		defer obj.Close()
 | 
						|
		return fn(relPath, obj)
 | 
						|
	})
 | 
						|
}
 | 
						|
 | 
						|
func init() {
 | 
						|
	RegisterStorageType(setting.LocalStorageType, NewLocalStorage)
 | 
						|
}
 |