mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-20 14:13:03 +03:00
The confirmation gate in updateSetting only covered the true -> false transition, so a settings save that kept twoFactorEnable=true while carrying a non-blank twoFactorToken silently rebound the authenticator. preserveRedactedSecrets restores the stored secret only when the submitted one is blank, so a non-blank value went straight through without any branch asking for a code. Not reachable pre-auth or cross-site (CSRFMiddleware rejects unsafe methods without the session token), but it matters after a session hijack or with an admin API token, which sets api_authed and short-circuits the CSRF check: the attacker gains persistence and locks the legitimate operator out of their own authenticator. Now a code is required whenever 2FA is currently on and the submitted secret differs from the stored one. Enabling from off is untouched, as no code exists yet to verify, and a blank secret still means "unchanged", so the panel's normal save path is unaffected. Reported by @n0ctal (GHSA-xqqw-jqqv-99h6).
173 lines
5.3 KiB
Go
173 lines
5.3 KiB
Go
package controller
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/util/crypto"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
|
|
)
|
|
|
|
func TestValidateRegex(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
router := gin.New()
|
|
NewSettingController(router.Group("/panel/api"))
|
|
|
|
tests := []struct {
|
|
name string
|
|
body string
|
|
success bool
|
|
}{
|
|
{name: "Go RE2 inline flag", body: `{"regex":"(?m)^general-purpose$"}`, success: true},
|
|
{name: "invalid expression", body: `{"regex":"["}`, success: false},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
req := httptest.NewRequest(http.MethodPost, "/panel/api/setting/validateRegex", strings.NewReader(tt.body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
resp := httptest.NewRecorder()
|
|
|
|
router.ServeHTTP(resp, req)
|
|
|
|
if resp.Code != http.StatusOK {
|
|
t.Fatalf("status = %d, want 200; body=%s", resp.Code, resp.Body.String())
|
|
}
|
|
needle := `"success":true`
|
|
if !tt.success {
|
|
needle = `"success":false`
|
|
}
|
|
if !strings.Contains(resp.Body.String(), needle) {
|
|
t.Fatalf("body = %s, want %s", resp.Body.String(), needle)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestAPITokenMutationRoutesEnforceExpectedScope(t *testing.T) {
|
|
t.Setenv("XUI_DB_FOLDER", t.TempDir())
|
|
if err := database.InitDB(filepath.Join(t.TempDir(), "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
row := &model.ApiToken{Name: "route-scope", Token: crypto.HashTokenSHA256("token"), Enabled: true, Scope: model.ApiScopeNodeSync}
|
|
if err := database.GetDB().Create(row).Error; err != nil {
|
|
t.Fatalf("seed token: %v", err)
|
|
}
|
|
|
|
gin.SetMode(gin.TestMode)
|
|
router := gin.New()
|
|
NewSettingController(router.Group("/panel/api"))
|
|
for _, path := range []string{
|
|
"/panel/api/setting/apiTokens/delete/" + strconv.Itoa(row.Id),
|
|
"/panel/api/setting/apiTokens/setEnabled/" + strconv.Itoa(row.Id),
|
|
} {
|
|
body := `{"expectedScope":"admin","enabled":false}`
|
|
req := httptest.NewRequest(http.MethodPost, path, strings.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
resp := httptest.NewRecorder()
|
|
router.ServeHTTP(resp, req)
|
|
if !strings.Contains(resp.Body.String(), `"success":false`) {
|
|
t.Fatalf("%s accepted wrong expected scope: %s", path, resp.Body.String())
|
|
}
|
|
}
|
|
var stored model.ApiToken
|
|
if err := database.GetDB().First(&stored, row.Id).Error; err != nil {
|
|
t.Fatalf("token was deleted by wrong scope: %v", err)
|
|
}
|
|
if !stored.Enabled {
|
|
t.Fatal("token was disabled by wrong scope")
|
|
}
|
|
}
|
|
|
|
// GHSA-xqqw-jqqv-99h6: a save that keeps 2FA enabled must not be able to
|
|
// rebind the authenticator without presenting a current code.
|
|
func TestUpdateSettingRequiresCodeToReplaceTwoFactorToken(t *testing.T) {
|
|
t.Setenv("XUI_DB_FOLDER", t.TempDir())
|
|
if err := database.InitDB(filepath.Join(t.TempDir(), "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
|
|
settingService := service.SettingService{}
|
|
if err := settingService.SetTwoFactorToken("ORIGINALSECRET234567"); err != nil {
|
|
t.Fatalf("seed token: %v", err)
|
|
}
|
|
if err := settingService.SetTwoFactorEnable(true); err != nil {
|
|
t.Fatalf("seed enable: %v", err)
|
|
}
|
|
|
|
post := func(t *testing.T, mutate func(map[string]any)) string {
|
|
t.Helper()
|
|
base, err := settingService.GetAllSetting()
|
|
if err != nil {
|
|
t.Fatalf("GetAllSetting: %v", err)
|
|
}
|
|
raw, err := json.Marshal(base)
|
|
if err != nil {
|
|
t.Fatalf("marshal: %v", err)
|
|
}
|
|
body := map[string]any{}
|
|
if err := json.Unmarshal(raw, &body); err != nil {
|
|
t.Fatalf("unmarshal: %v", err)
|
|
}
|
|
mutate(body)
|
|
payload, err := json.Marshal(body)
|
|
if err != nil {
|
|
t.Fatalf("marshal payload: %v", err)
|
|
}
|
|
|
|
gin.SetMode(gin.TestMode)
|
|
router := gin.New()
|
|
NewSettingController(router.Group("/panel/api"))
|
|
req := httptest.NewRequest(http.MethodPost, "/panel/api/setting/update", strings.NewReader(string(payload)))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
resp := httptest.NewRecorder()
|
|
router.ServeHTTP(resp, req)
|
|
return resp.Body.String()
|
|
}
|
|
|
|
t.Run("rebind without code is rejected", func(t *testing.T) {
|
|
got := post(t, func(body map[string]any) {
|
|
body["twoFactorEnable"] = true
|
|
body["twoFactorToken"] = "ATTACKERSECRET567890"
|
|
})
|
|
if !strings.Contains(got, `"success":false`) {
|
|
t.Fatalf("rebind without a 2FA code was accepted: %s", got)
|
|
}
|
|
stored, err := settingService.GetTwoFactorToken()
|
|
if err != nil {
|
|
t.Fatalf("GetTwoFactorToken: %v", err)
|
|
}
|
|
if stored != "ORIGINALSECRET234567" {
|
|
t.Fatalf("stored 2FA secret = %q, want it unchanged", stored)
|
|
}
|
|
})
|
|
|
|
t.Run("ordinary save with redacted token still succeeds", func(t *testing.T) {
|
|
got := post(t, func(body map[string]any) {
|
|
body["twoFactorEnable"] = true
|
|
body["twoFactorToken"] = ""
|
|
})
|
|
if !strings.Contains(got, `"success":true`) {
|
|
t.Fatalf("normal settings save was rejected: %s", got)
|
|
}
|
|
stored, err := settingService.GetTwoFactorToken()
|
|
if err != nil {
|
|
t.Fatalf("GetTwoFactorToken: %v", err)
|
|
}
|
|
if stored != "ORIGINALSECRET234567" {
|
|
t.Fatalf("stored 2FA secret = %q, want it preserved", stored)
|
|
}
|
|
})
|
|
}
|