feat: configuration parameters for minio host, port, timeout;
refactor: renamed buckets; fix: corrected Host header changing behavior in minio gin endpoint; feat: function to convert local minio url to /s3/ path url with the backend host
This commit is contained in:
@@ -31,9 +31,9 @@ var Buckets map[string]string
|
||||
func setupBuckets(client *minio.Client) {
|
||||
|
||||
Buckets = map[string]string{
|
||||
"avatars": "avatars",
|
||||
"images": "images",
|
||||
"uploads": "uploads",
|
||||
"avatars": "ew-avatars",
|
||||
"images": "ew-images",
|
||||
"uploads": "ew-uploads",
|
||||
}
|
||||
|
||||
hiddenBuckets := []string{
|
||||
|
||||
@@ -18,21 +18,28 @@
|
||||
package minioclient
|
||||
|
||||
import (
|
||||
"easywish/config"
|
||||
"fmt"
|
||||
"io"
|
||||
"maps"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"time"
|
||||
"maps"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func setupGinEndpoint(router *gin.Engine) {
|
||||
|
||||
cfg := config.GetConfig()
|
||||
minioHost := fmt.Sprintf("%s:%d", cfg.MinioHost, cfg.MinioPort)
|
||||
|
||||
s3group := router.Group("/s3")
|
||||
s3group.Any("/*path", func(c *gin.Context) {
|
||||
path := c.Param("path")
|
||||
minioURL := &url.URL{
|
||||
Scheme: "http",
|
||||
Host: "minio:9000", // XXX: hardcoded minio host
|
||||
Host: minioHost,
|
||||
Path: path,
|
||||
RawQuery: c.Request.URL.RawQuery,
|
||||
}
|
||||
@@ -42,9 +49,9 @@ func setupGinEndpoint(router *gin.Engine) {
|
||||
}
|
||||
req = req.WithContext(c.Request.Context())
|
||||
maps.Copy(req.Header, c.Request.Header)
|
||||
delete(req.Header, "Host")
|
||||
req.Header.Set("Host", minioHost)
|
||||
client := &http.Client{
|
||||
Timeout: 30 * time.Second, // XXX: magic number
|
||||
Timeout: time.Duration(cfg.MinioTimeout),
|
||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||
return http.ErrUseLastResponse
|
||||
},
|
||||
|
||||
44
backend/internal/utils/minio.go
Normal file
44
backend/internal/utils/minio.go
Normal file
@@ -0,0 +1,44 @@
|
||||
// Copyright (c) 2025 Nikolai Papin
|
||||
//
|
||||
// This file is part of Easywish
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
||||
// the GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
package utils
|
||||
|
||||
import (
|
||||
"easywish/config"
|
||||
"fmt"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
func LocalizeS3Url(originalURL string) (string, error) {
|
||||
|
||||
cfg := config.GetConfig()
|
||||
newDomain := fmt.Sprintf("%s:%d", cfg.Hostname, cfg.Port)
|
||||
|
||||
parsedURL, err := url.Parse(originalURL)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("invalid URL: %w", err)
|
||||
}
|
||||
|
||||
newURL := &url.URL{
|
||||
Scheme: parsedURL.Scheme,
|
||||
Host: newDomain,
|
||||
Path: "/s3" + parsedURL.Path,
|
||||
RawQuery: parsedURL.RawQuery,
|
||||
}
|
||||
|
||||
return newURL.String(), nil
|
||||
}
|
||||
Reference in New Issue
Block a user