From 37f50eebd262c192851de701cc7761d6da81d557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <haozi@loli.email>
Date: Sat, 31 Jan 2026 00:02:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DNginx=20BasicAuth?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/data/website.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/internal/data/website.go b/internal/data/website.go
index 67f4caf4..72e04b80 100644
--- a/internal/data/website.go
+++ b/internal/data/website.go
@@ -1202,10 +1202,10 @@ func (r *websiteRepo) readBasicAuthUsers(siteName string) map[string]string {
 		if line == "" || strings.HasPrefix(line, "#") {
 			continue
 		}
-		// htpasswd 格式: username:password
+		// htpasswd 格式: username:{PLAIN}password或直接username:password
 		parts := strings.SplitN(line, ":", 2)
 		if len(parts) == 2 {
-			users[parts[0]] = parts[1]
+			users[parts[0]] = strings.TrimPrefix(parts[1], "{PLAIN}")
 		}
 	}
 
@@ -1217,12 +1217,24 @@ func (r *websiteRepo) readBasicAuthUsers(siteName string) map[string]string {
 
 // writeBasicAuthUsers 将用户凭证写入 htpasswd 文件
 func (r *websiteRepo) writeBasicAuthUsers(htpasswdPath string, users map[string]string) error {
+	webServer, err := r.setting.Get(biz.SettingKeyWebserver, "unknown")
+	if err != nil {
+		return err
+	}
+
 	var lines []string
 	for username, password := range users {
 		if username == "" || password == "" {
 			continue
 		}
-		lines = append(lines, fmt.Sprintf("%s:%s", username, password))
+		switch webServer {
+		case "nginx":
+			lines = append(lines, fmt.Sprintf("%s:%s", username, "{PLAIN}"+password))
+		case "apache":
+			lines = append(lines, fmt.Sprintf("%s:%s", username, password))
+		default:
+			return errors.New(r.t.Get("unsupported web server: %s", webServer))
+		}
 	}
 
 	content := strings.Join(lines, "\n")