mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-16 18:15:01 +03:00
feat(settings): add subscription format controls
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
||||
"net/http"
|
||||
"os"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -32,6 +33,13 @@ import (
|
||||
//go:embed config.json
|
||||
var xrayTemplateConfig string
|
||||
|
||||
const (
|
||||
DefaultSubClashUserAgentRegex = `(?i)(clash|mihomo|stash)`
|
||||
DefaultSubJsonUserAgentRegex = `(?i)^streisand([ /]|$)`
|
||||
DefaultRemarkTemplate = "{{INBOUND}}-{{EMAIL}}|📊{{TRAFFIC_LEFT}}|⏳{{DAYS_LEFT}}D"
|
||||
maxRegexLength = 2048
|
||||
)
|
||||
|
||||
var defaultValueMap = map[string]string{
|
||||
"xrayTemplateConfig": xrayTemplateConfig,
|
||||
"webListen": "",
|
||||
@@ -57,7 +65,7 @@ var defaultValueMap = map[string]string{
|
||||
"pageSize": "25",
|
||||
"expireDiff": "0",
|
||||
"trafficDiff": "0",
|
||||
"remarkTemplate": "{{INBOUND}}-{{EMAIL}}|📊{{TRAFFIC_LEFT}}|⏳{{DAYS_LEFT}}D",
|
||||
"remarkTemplate": DefaultRemarkTemplate,
|
||||
"timeLocation": "Local",
|
||||
"tgBotEnable": "false",
|
||||
"tgBotToken": "",
|
||||
@@ -73,6 +81,11 @@ var defaultValueMap = map[string]string{
|
||||
"twoFactorToken": "",
|
||||
"subEnable": "true",
|
||||
"subJsonEnable": "false",
|
||||
"subJsonAutoDetect": "false",
|
||||
"subJsonAlwaysArray": "false",
|
||||
"subJsonUserAgentRegex": "",
|
||||
"subClashAutoDetect": "false",
|
||||
"subClashUserAgentRegex": "",
|
||||
"subTitle": "",
|
||||
"subSupportUrl": "",
|
||||
"subProfileUrl": "",
|
||||
@@ -705,6 +718,26 @@ func (s *SettingService) GetSubJsonEnable() (bool, error) {
|
||||
return s.getBool("subJsonEnable")
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSubJsonAutoDetect() (bool, error) {
|
||||
return s.getBool("subJsonAutoDetect")
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSubJsonAlwaysArray() (bool, error) {
|
||||
return s.getBool("subJsonAlwaysArray")
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSubJsonUserAgentRegex() (string, error) {
|
||||
return s.getString("subJsonUserAgentRegex")
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSubClashAutoDetect() (bool, error) {
|
||||
return s.getBool("subClashAutoDetect")
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSubClashUserAgentRegex() (string, error) {
|
||||
return s.getString("subClashUserAgentRegex")
|
||||
}
|
||||
|
||||
func (s *SettingService) GetSubTitle() (string, error) {
|
||||
return s.getString("subTitle")
|
||||
}
|
||||
@@ -1101,6 +1134,9 @@ func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting, clears
|
||||
if err := validateSettingsURLs(allSetting); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := validateSubUserAgentRegexes(allSetting); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := allSetting.CheckValid(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -1141,6 +1177,45 @@ func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting, clears
|
||||
})
|
||||
}
|
||||
|
||||
func validateSubUserAgentRegexes(allSetting *entity.AllSetting) error {
|
||||
jsonPattern, err := validateSubUserAgentRegex("Xray JSON", allSetting.SubJsonUserAgentRegex, DefaultSubJsonUserAgentRegex)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
clashPattern, err := validateSubUserAgentRegex("Clash/Mihomo", allSetting.SubClashUserAgentRegex, DefaultSubClashUserAgentRegex)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
allSetting.SubJsonUserAgentRegex = jsonPattern
|
||||
allSetting.SubClashUserAgentRegex = clashPattern
|
||||
return nil
|
||||
}
|
||||
|
||||
func validateSubUserAgentRegex(name, pattern, defaultPattern string) (string, error) {
|
||||
pattern = strings.TrimSpace(pattern)
|
||||
effectivePattern := pattern
|
||||
if effectivePattern == "" {
|
||||
effectivePattern = defaultPattern
|
||||
}
|
||||
if len(effectivePattern) > maxRegexLength {
|
||||
return "", common.NewErrorf("%s User-Agent regex must not exceed %d characters", name, maxRegexLength)
|
||||
}
|
||||
if _, err := regexp.Compile(effectivePattern); err != nil {
|
||||
return "", common.NewError(name+" User-Agent regex is invalid:", err)
|
||||
}
|
||||
return pattern, nil
|
||||
}
|
||||
|
||||
func ValidateRegex(pattern string) error {
|
||||
if len(pattern) > maxRegexLength {
|
||||
return common.NewErrorf("Regular expression must not exceed %d characters", maxRegexLength)
|
||||
}
|
||||
if _, err := regexp.Compile(pattern); err != nil {
|
||||
return common.NewError("Regular expression is invalid:", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *SettingService) preserveRedactedSecrets(allSetting *entity.AllSetting, clears SecretClears) error {
|
||||
if !clears.TgBotToken && strings.TrimSpace(allSetting.TgBotToken) == "" {
|
||||
value, err := s.GetTgBotToken()
|
||||
|
||||
Reference in New Issue
Block a user