 6b74043b85
			
		
	
	
	
	
	6b74043b85Fix #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.
		
			
				
	
	
		
			98 lines
		
	
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			98 lines
		
	
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2020 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package web
 | |
| 
 | |
| import (
 | |
| 	"errors"
 | |
| 	"fmt"
 | |
| 	"net/http"
 | |
| 	"os"
 | |
| 	"path"
 | |
| 	"strings"
 | |
| 
 | |
| 	"code.gitea.io/gitea/modules/httpcache"
 | |
| 	"code.gitea.io/gitea/modules/log"
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| 	"code.gitea.io/gitea/modules/storage"
 | |
| 	"code.gitea.io/gitea/modules/util"
 | |
| 	"code.gitea.io/gitea/modules/web/routing"
 | |
| )
 | |
| 
 | |
| func storageHandler(storageSetting *setting.Storage, prefix string, objStore storage.ObjectStorage) http.HandlerFunc {
 | |
| 	prefix = strings.Trim(prefix, "/")
 | |
| 	funcInfo := routing.GetFuncInfo(storageHandler, prefix)
 | |
| 
 | |
| 	if storageSetting.MinioConfig.ServeDirect {
 | |
| 		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 | |
| 			if req.Method != "GET" && req.Method != "HEAD" {
 | |
| 				http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
 | |
| 				return
 | |
| 			}
 | |
| 
 | |
| 			if !strings.HasPrefix(req.URL.Path, "/"+prefix+"/") {
 | |
| 				http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 | |
| 				return
 | |
| 			}
 | |
| 			routing.UpdateFuncInfo(req.Context(), funcInfo)
 | |
| 
 | |
| 			rPath := strings.TrimPrefix(req.URL.Path, "/"+prefix+"/")
 | |
| 			rPath = util.PathJoinRelX(rPath)
 | |
| 
 | |
| 			u, err := objStore.URL(rPath, path.Base(rPath), nil)
 | |
| 			if err != nil {
 | |
| 				if os.IsNotExist(err) || errors.Is(err, os.ErrNotExist) {
 | |
| 					log.Warn("Unable to find %s %s", prefix, rPath)
 | |
| 					http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 | |
| 					return
 | |
| 				}
 | |
| 				log.Error("Error whilst getting URL for %s %s. Error: %v", prefix, rPath, err)
 | |
| 				http.Error(w, fmt.Sprintf("Error whilst getting URL for %s %s", prefix, rPath), http.StatusInternalServerError)
 | |
| 				return
 | |
| 			}
 | |
| 
 | |
| 			http.Redirect(w, req, u.String(), http.StatusTemporaryRedirect)
 | |
| 		})
 | |
| 	}
 | |
| 
 | |
| 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 | |
| 		if req.Method != "GET" && req.Method != "HEAD" {
 | |
| 			http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
 | |
| 			return
 | |
| 		}
 | |
| 
 | |
| 		if !strings.HasPrefix(req.URL.Path, "/"+prefix+"/") {
 | |
| 			http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 | |
| 			return
 | |
| 		}
 | |
| 		routing.UpdateFuncInfo(req.Context(), funcInfo)
 | |
| 
 | |
| 		rPath := strings.TrimPrefix(req.URL.Path, "/"+prefix+"/")
 | |
| 		rPath = util.PathJoinRelX(rPath)
 | |
| 		if rPath == "" || rPath == "." {
 | |
| 			http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 | |
| 			return
 | |
| 		}
 | |
| 
 | |
| 		fi, err := objStore.Stat(rPath)
 | |
| 		if err != nil {
 | |
| 			if os.IsNotExist(err) || errors.Is(err, os.ErrNotExist) {
 | |
| 				log.Warn("Unable to find %s %s", prefix, rPath)
 | |
| 				http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 | |
| 				return
 | |
| 			}
 | |
| 			log.Error("Error whilst opening %s %s. Error: %v", prefix, rPath, err)
 | |
| 			http.Error(w, fmt.Sprintf("Error whilst opening %s %s", prefix, rPath), http.StatusInternalServerError)
 | |
| 			return
 | |
| 		}
 | |
| 
 | |
| 		fr, err := objStore.Open(rPath)
 | |
| 		if err != nil {
 | |
| 			log.Error("Error whilst opening %s %s. Error: %v", prefix, rPath, err)
 | |
| 			http.Error(w, fmt.Sprintf("Error whilst opening %s %s", prefix, rPath), http.StatusInternalServerError)
 | |
| 			return
 | |
| 		}
 | |
| 		defer fr.Close()
 | |
| 		httpcache.ServeContentWithCacheControl(w, req, path.Base(rPath), fi.ModTime(), fr)
 | |
| 	})
 | |
| }
 |