Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-04 20:00:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

♻️ Clean code

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2026-03-01 10:13:48 +08:00
parent 815e5b0711
commit 7c3536cb18
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/session.go
View file

@ -250,7 +250,7 @@ func CheckAuth(c *gin.Context) {
// 未设置访问授权码
if "" == Conf.AccessAuthCode {
// Skip the empty access authorization code check https://github.com/siyuan-note/siyuan/issues/9709
if util.SiyuanAccessAuthCodeBypass {
if util.SiYuanAccessAuthCodeBypass {
c.Set(RoleContextKey, RoleAdministrator)
c.Next()
return

23
kernel/util/working.go
View file

@ -48,26 +48,19 @@ var Mode = "prod"
const (
Ver = "3.5.8"
IsInsider = false
// env vars as fallback for commandline parameters
SIYUAN_ACCESS_AUTH_CODE = "SIYUAN_ACCESS_AUTH_CODE"
SIYUAN_WORKSPACE = "SIYUAN_WORKSPACE_PATH"
SIYUAN_LANG = "SIYUAN_LANG"
)
var (
RunInContainer = false // 是否运行在容器中
SiyuanAccessAuthCodeBypass = false // 是否跳过空访问授权码检查
SiyuanAccessAuthCodeViaEnvvar = "" // Fallback auth code via env var (SIYUAN_ACCESS_AUTH_CODE)
RunInContainer = false // 是否运行在容器中
SiYuanAccessAuthCodeBypass = false // 是否跳过空访问授权码检查
)
func initEnvVars() {
RunInContainer = isRunningInDockerContainer()
var err error
if SiyuanAccessAuthCodeBypass, err = strconv.ParseBool(os.Getenv("SIYUAN_ACCESS_AUTH_CODE_BYPASS")); err != nil {
SiyuanAccessAuthCodeBypass = false
if SiYuanAccessAuthCodeBypass, err = strconv.ParseBool(os.Getenv("SIYUAN_ACCESS_AUTH_CODE_BYPASS")); err != nil {
SiYuanAccessAuthCodeBypass = false
}
SiyuanAccessAuthCodeViaEnvvar = os.Getenv("SIYUAN_ACCESS_AUTH_CODE")
}
var (
@ -110,9 +103,9 @@ func Boot() {
// Fallback to env vars if commandline args are not set
// valid only for CLI args that default to "", as the
// others have explicit (sane) defaults
workspacePath = coalesceToEnvVar(workspacePath, SIYUAN_WORKSPACE)
accessAuthCode = coalesceToEnvVar(accessAuthCode, SIYUAN_ACCESS_AUTH_CODE)
lang = coalesceToEnvVar(lang, SIYUAN_LANG)
workspacePath = coalesceToEnvVar(workspacePath, "SIYUAN_WORKSPACE_PATH")
accessAuthCode = coalesceToEnvVar(accessAuthCode, "SIYUAN_ACCESS_AUTH_CODE")
lang = coalesceToEnvVar(lang, "SIYUAN_LANG")
if "" != *wdPath {
WorkingDir = *wdPath
@ -133,7 +126,7 @@ func Boot() {
interruptBoot := true
// Set the env `SIYUAN_ACCESS_AUTH_CODE_BYPASS=true` to skip checking empty access auth code https://github.com/siyuan-note/siyuan/issues/9709
if SiyuanAccessAuthCodeBypass {
if SiYuanAccessAuthCodeBypass {
interruptBoot = false
fmt.Println("bypass access auth code check since the env [SIYUAN_ACCESS_AUTH_CODE_BYPASS] is set to [true]")
}