diff --git a/backend/config/config.go b/backend/config/config.go
index ec47c35..03f8e06 100644
--- a/backend/config/config.go
+++ b/backend/config/config.go
@@ -1,17 +1,17 @@
// 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 .
@@ -20,6 +20,7 @@ package config
import (
"fmt"
"strings"
+ "time"
"github.com/spf13/viper"
)
@@ -31,6 +32,9 @@ type Config struct {
DatabaseUrl string `mapstructure:"POSTGRES_URL"`
RedisUrl string `mapstructure:"REDIS_URL"`
MinioUrl string `mapstructure:"MINIO_URL"`
+ MinioHost string `mapstructure:"MINIO_HOST"`
+ MinioPort uint16 `mapstructure:"MINIO_PORT"`
+ MinioTimeout int64 `mapstructure:"MINIO_TIMEOUT"`
JwtAlgorithm string `mapstructure:"JWT_ALGORITHM"`
JwtSecret string `mapstructure:"JWT_SECRET"`
@@ -65,6 +69,8 @@ func Load() (*Config, error) {
viper.SetDefault("HOSTNAME", "localhost")
viper.SetDefault("PORT", "8080")
+ viper.SetDefault("MINIO_TIMEOUT", 90 * time.Second)
+
viper.SetDefault("JWT_ALGORITHM", "HS256")
viper.SetDefault("JWT_SECRET", "default_jwt_secret_please_change")
viper.SetDefault("JWT_EXP_ACCESS", 5)
@@ -97,9 +103,13 @@ func Load() (*Config, error) {
viper.BindEnv("HOSTNAME")
viper.BindEnv("PORT")
+ viper.BindEnv("MINIO_TIMEOUT")
+
viper.BindEnv("POSTGRES_URL")
viper.BindEnv("REDIS_URL")
viper.BindEnv("MINIO_URL")
+ viper.BindEnv("MINIO_HOST")
+ viper.BindEnv("MINIO_PORT")
viper.BindEnv("JWT_ALGORITHM")
viper.BindEnv("JWT_SECRET")
@@ -132,6 +142,8 @@ func Load() (*Config, error) {
"POSTGRES_URL",
"REDIS_URL",
"MINIO_URL",
+ "MINIO_HOST",
+ "MINIO_PORT",
}
var missing []string
for _, key := range required {
diff --git a/backend/internal/minioClient/buckets.go b/backend/internal/minioClient/buckets.go
index eccc890..f652297 100644
--- a/backend/internal/minioClient/buckets.go
+++ b/backend/internal/minioClient/buckets.go
@@ -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{
diff --git a/backend/internal/minioClient/ginEndpoint.go b/backend/internal/minioClient/ginEndpoint.go
index 32e0766..39084ce 100644
--- a/backend/internal/minioClient/ginEndpoint.go
+++ b/backend/internal/minioClient/ginEndpoint.go
@@ -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
},
diff --git a/backend/internal/utils/minio.go b/backend/internal/utils/minio.go
new file mode 100644
index 0000000..8d200d4
--- /dev/null
+++ b/backend/internal/utils/minio.go
@@ -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 .
+
+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
+}
diff --git a/dev-compose.yml b/dev-compose.yml
index a0fcdf0..f2eea8f 100644
--- a/dev-compose.yml
+++ b/dev-compose.yml
@@ -22,6 +22,8 @@ services:
POSTGRES_URL: ${POSTGRES_URL}
REDIS_URL: ${REDIS_URL}
MINIO_URL: ${MINIO_URL}
+ MINIO_HOST: ${MINIO_HOST}
+ MINIO_PORT: ${MINIO_PORT}
JWT_ALGORITHM: ${JWT_ALGORITHM}
JWT_SECRET: ${JWT_SECRET}
JWT_ISSUER: ${JWT_ISSUER}
diff --git a/docker-compose.yml b/docker-compose.yml
index c388cde..0a4995d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,8 @@ services:
POSTGRES_URL: ${POSTGRES_URL}
REDIS_URL: ${REDIS_URL}
MINIO_URL: ${MINIO_URL}
+ MINIO_HOST: ${MINIO_HOST}
+ MINIO_PORT: ${MINIO_PORT}
JWT_ALGORITHM: ${JWT_ALGORITHM}
JWT_SECRET: ${JWT_SECRET}
JWT_ISSUER: ${JWT_ISSUER}