Browse Source

fix(backup): [s3] use secure depends on endpoint url #1266

0xJacky 2 tuần trước cách đây
mục cha
commit
85817f5c2d

+ 0 - 2
api/analytic/nodes.go

@@ -65,8 +65,6 @@ func GetNodeStat(c *gin.Context) {
 					NodeInfo: nodeInfo,
 					NodeStat: stat,
 				}
-
-				logger.Debugf("Sending complete node info including version: %s", ver.Version)
 			}
 		} else {
 			// Send only stat information for performance

+ 2 - 2
app/src/components/ProxyTargets/ProxyTargets.vue

@@ -23,10 +23,10 @@ function getTargetText(target: ProxyTarget): string {
     return `${target.host}:${target.port}`
 
   if (result.online) {
-    return `${target.host}:${target.port} (${result.latency.toFixed(2)}ms)`
+    return `${target.host}:${target.port} · ${result.latency.toFixed(2)}ms`
   }
   else {
-    return `${target.host}:${target.port} (${$gettext('Offline')})`
+    return `${target.host}:${target.port} · ${$gettext('Offline')}`
   }
 }
 

+ 6 - 1
internal/backup/s3_client.go

@@ -38,6 +38,11 @@ func NewS3Client(autoBackup *model.AutoBackup) (*S3Client, error) {
 		endpoint = "s3.amazonaws.com"
 	}
 
+	var secure bool
+	if strings.HasPrefix(endpoint, "https://") {
+		secure = true
+	}
+
 	// Remove protocol prefix if present
 	endpoint = strings.ReplaceAll(endpoint, "https://", "")
 	endpoint = strings.ReplaceAll(endpoint, "http://", "")
@@ -45,7 +50,7 @@ func NewS3Client(autoBackup *model.AutoBackup) (*S3Client, error) {
 	// Initialize MinIO client
 	minioClient, err := minio.New(endpoint, &minio.Options{
 		Creds:  credentials.NewStaticV4(autoBackup.S3AccessKeyID, autoBackup.S3SecretAccessKey, ""),
-		Secure: true, // Use SSL by default
+		Secure: secure,
 		Region: getS3Region(autoBackup.S3Region),
 	})
 	if err != nil {