zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the placeholder values in "root_url" cannot be resolved using values from environment variables, and do not allow placeholders in other options

Browse Source
This commit is contained in:
MaysWind
2026-01-19 00:29:08 +08:00
parent c9b894fdbe
commit 50b4c96a99
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/ezbookkeeping.ini
+1 -1
View File
@@ -15,7 +15,7 @@ http_port = 8080
# The domain name used to access ezBookkeeping # The domain name used to access ezBookkeeping
domain = localhost domain = localhost
# The full url used to access ezBookkeeping in browser # The full url used to access ezBookkeeping in browser, supports placeholders: %(protocol)s, %(domain)s, %(http_port)s
root_url = %(protocol)s://%(domain)s:%(http_port)s/ root_url = %(protocol)s://%(domain)s:%(http_port)s/
# https certification and its key file # https certification and its key file
pkg/settings/setting.go
+21 -9
View File
@@ -20,6 +20,7 @@ const (
ebkConfigItemValueEnvNamePrefix = "EBK" ebkConfigItemValueEnvNamePrefix = "EBK"
ebkConfigItemFilePathEnvNamePrefix = "EBKCFP" ebkConfigItemFilePathEnvNamePrefix = "EBKCFP"
defaultConfigPath = "/conf/ezbookkeeping.ini" defaultConfigPath = "/conf/ezbookkeeping.ini"
defaultRootUrl = "%(protocol)s://%(domain)s:%(http_port)s/"
defaultStaticRootPath = "public" defaultStaticRootPath = "public"
) )
@@ -627,7 +628,10 @@ func loadServerConfiguration(config *Config, configFile *ini.File, sectionName s
} }
config.Domain = getConfigItemStringValue(configFile, sectionName, "domain", defaultDomain) config.Domain = getConfigItemStringValue(configFile, sectionName, "domain", defaultDomain)
config.RootUrl = getConfigItemStringValue(configFile, sectionName, "root_url", fmt.Sprintf("%s://%s:%d/", string(config.Protocol), config.Domain, config.HttpPort)) config.RootUrl = getConfigItemStringValue(configFile, sectionName, "root_url", defaultRootUrl)
config.RootUrl = strings.ReplaceAll(config.RootUrl, "%(protocol)s", string(config.Protocol))
config.RootUrl = strings.ReplaceAll(config.RootUrl, "%(domain)s", config.Domain)
config.RootUrl = strings.ReplaceAll(config.RootUrl, "%(http_port)s", strconv.Itoa(int(config.HttpPort)))
if config.RootUrl[len(config.RootUrl)-1] != '/' { if config.RootUrl[len(config.RootUrl)-1] != '/' {
config.RootUrl += "/" config.RootUrl += "/"
@@ -1259,7 +1263,7 @@ func getConfigItemIsSet(configFile *ini.File, sectionName string, itemName strin
return false return false
} }
return section.Key(itemName).String() != "" return section.Key(itemName).Value() != ""
} }
func getConfigItemStringValue(configFile *ini.File, sectionName string, itemName string, defaultValue ...string) string { func getConfigItemStringValue(configFile *ini.File, sectionName string, itemName string, defaultValue ...string) string {
@@ -1270,11 +1274,13 @@ func getConfigItemStringValue(configFile *ini.File, sectionName string, itemName
} }
section := configFile.Section(sectionName) section := configFile.Section(sectionName)
key := section.Key(itemName)
value := key.Value()
if len(defaultValue) > 0 { if len(value) == 0 && len(defaultValue) > 0 {
return section.Key(itemName).MustString(defaultValue[0]) return defaultValue[0]
} else { } else {
return section.Key(itemName).String() return value
} }
} }
@@ -1290,7 +1296,7 @@ func getConfigItemUint8Value(configFile *ini.File, sectionName string, itemName
} }
section := configFile.Section(sectionName) section := configFile.Section(sectionName)
value, err := strconv.ParseUint(section.Key(itemName).String(), 10, 8) value, err := strconv.ParseUint(section.Key(itemName).Value(), 10, 8)
if err == nil { if err == nil {
return uint8(value) return uint8(value)
@@ -1311,7 +1317,7 @@ func getConfigItemUint16Value(configFile *ini.File, sectionName string, itemName
} }
section := configFile.Section(sectionName) section := configFile.Section(sectionName)
value, err := strconv.ParseUint(section.Key(itemName).String(), 10, 16) value, err := strconv.ParseUint(section.Key(itemName).Value(), 10, 16)
if err == nil { if err == nil {
return uint16(value) return uint16(value)
@@ -1332,7 +1338,7 @@ func getConfigItemUint32Value(configFile *ini.File, sectionName string, itemName
} }
section := configFile.Section(sectionName) section := configFile.Section(sectionName)
value, err := strconv.ParseUint(section.Key(itemName).String(), 10, 32) value, err := strconv.ParseUint(section.Key(itemName).Value(), 10, 32)
if err == nil { if err == nil {
return uint32(value) return uint32(value)
@@ -1353,7 +1359,13 @@ func getConfigItemBoolValue(configFile *ini.File, sectionName string, itemName s
} }
section := configFile.Section(sectionName) section := configFile.Section(sectionName)
return section.Key(itemName).MustBool(defaultValue) value, err := strconv.ParseBool(section.Key(itemName).Value())
if err == nil {
return value
}
return defaultValue
} }
func getConfigItemValueFromEnvironment(sectionName string, itemName string) string { func getConfigItemValueFromEnvironment(sectionName string, itemName string) string {