mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Fix all possible setting error related storages and added some tests (#23911)
Follow up #22405 Fix #20703 This PR rewrites storage configuration read sequences with some breaks and tests. It becomes more strict than before and also fixed some inherit problems. - Move storage's MinioConfig struct into setting, so after the configuration loading, the values will be stored into the struct but not still on some section. - All storages configurations should be stored on one section, configuration items cannot be overrided by multiple sections. The prioioty of configuration is `[attachment]` > `[storage.attachments]` | `[storage.customized]` > `[storage]` > `default` - For extra override configuration items, currently are `SERVE_DIRECT`, `MINIO_BASE_PATH`, `MINIO_BUCKET`, which could be configured in another section. The prioioty of the override configuration is `[attachment]` > `[storage.attachments]` > `default`. - Add more tests for storages configurations. - Update the storage documentations. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		@@ -200,7 +200,7 @@ func GetRawFileOrLFS(ctx *context.APIContext) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if setting.LFS.ServeDirect {
 | 
			
		||||
	if setting.LFS.Storage.MinioConfig.ServeDirect {
 | 
			
		||||
		// If we have a signed url (S3, object storage), redirect to this directly.
 | 
			
		||||
		u, err := storage.LFS.URL(pointer.RelativePath(), blob.Name())
 | 
			
		||||
		if u != nil && err == nil {
 | 
			
		||||
@@ -320,7 +320,7 @@ func download(ctx *context.APIContext, archiveName string, archiver *repo_model.
 | 
			
		||||
	downloadName := ctx.Repo.Repository.Name + "-" + archiveName
 | 
			
		||||
 | 
			
		||||
	rPath := archiver.RelativePath()
 | 
			
		||||
	if setting.RepoArchive.ServeDirect {
 | 
			
		||||
	if setting.RepoArchive.Storage.MinioConfig.ServeDirect {
 | 
			
		||||
		// If we have a signed url (S3, object storage), redirect to this directly.
 | 
			
		||||
		u, err := storage.RepoArchives.URL(rPath, downloadName)
 | 
			
		||||
		if u != nil && err == nil {
 | 
			
		||||
 
 | 
			
		||||
@@ -116,7 +116,7 @@ func Install(ctx *context.Context) {
 | 
			
		||||
	// Application general settings
 | 
			
		||||
	form.AppName = setting.AppName
 | 
			
		||||
	form.RepoRootPath = setting.RepoRootPath
 | 
			
		||||
	form.LFSRootPath = setting.LFS.Path
 | 
			
		||||
	form.LFSRootPath = setting.LFS.Storage.Path
 | 
			
		||||
 | 
			
		||||
	// Note(unknown): it's hard for Windows users change a running user,
 | 
			
		||||
	// 	so just use current one if config says default.
 | 
			
		||||
 
 | 
			
		||||
@@ -19,11 +19,11 @@ import (
 | 
			
		||||
	"code.gitea.io/gitea/modules/web/routing"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func storageHandler(storageSetting setting.Storage, prefix string, objStore storage.ObjectStorage) func(next http.Handler) http.Handler {
 | 
			
		||||
func storageHandler(storageSetting *setting.Storage, prefix string, objStore storage.ObjectStorage) func(next http.Handler) http.Handler {
 | 
			
		||||
	prefix = strings.Trim(prefix, "/")
 | 
			
		||||
	funcInfo := routing.GetFuncInfo(storageHandler, prefix)
 | 
			
		||||
	return func(next http.Handler) http.Handler {
 | 
			
		||||
		if storageSetting.ServeDirect {
 | 
			
		||||
		if storageSetting.MinioConfig.ServeDirect {
 | 
			
		||||
			return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 | 
			
		||||
				if req.Method != "GET" && req.Method != "HEAD" {
 | 
			
		||||
					next.ServeHTTP(w, req)
 | 
			
		||||
 
 | 
			
		||||
@@ -126,7 +126,7 @@ func ServeAttachment(ctx *context.Context, uuid string) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if setting.Attachment.ServeDirect {
 | 
			
		||||
	if setting.Attachment.Storage.MinioConfig.ServeDirect {
 | 
			
		||||
		// If we have a signed url (S3, object storage), redirect to this directly.
 | 
			
		||||
		u, err := storage.Attachments.URL(attach.RelativePath(), attach.Name)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -53,7 +53,7 @@ func ServeBlobOrLFS(ctx *context.Context, blob *git.Blob, lastModified time.Time
 | 
			
		||||
			return nil
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if setting.LFS.ServeDirect {
 | 
			
		||||
		if setting.LFS.Storage.MinioConfig.ServeDirect {
 | 
			
		||||
			// If we have a signed url (S3, object storage), redirect to this directly.
 | 
			
		||||
			u, err := storage.LFS.URL(pointer.RelativePath(), blob.Name())
 | 
			
		||||
			if u != nil && err == nil {
 | 
			
		||||
 
 | 
			
		||||
@@ -427,7 +427,7 @@ func download(ctx *context.Context, archiveName string, archiver *repo_model.Rep
 | 
			
		||||
	downloadName := ctx.Repo.Repository.Name + "-" + archiveName
 | 
			
		||||
 | 
			
		||||
	rPath := archiver.RelativePath()
 | 
			
		||||
	if setting.RepoArchive.ServeDirect {
 | 
			
		||||
	if setting.RepoArchive.Storage.MinioConfig.ServeDirect {
 | 
			
		||||
		// If we have a signed url (S3, object storage), redirect to this directly.
 | 
			
		||||
		u, err := storage.RepoArchives.URL(rPath, downloadName)
 | 
			
		||||
		if u != nil && err == nil {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user