Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-27 11:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🔒 Randomly generate the cookie key https://github.com/siyuan-note/siyuan/issues/16690

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-26 11:21:47 +08:00
parent cef8ca8cf7
commit a65dcd220f
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
5 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/harmony/kernel.go
View file

@ -37,7 +37,7 @@ import (
//export StartKernelFast
func StartKernelFast(container, appDir, workspaceBaseDir, localIPs *C.char) {
go server.Serve(true)
go server.Serve(true, model.Conf.CookieKey)
}
//export StartKernel
@ -49,7 +49,7 @@ func StartKernel(container, appDir, workspaceBaseDir, timezoneID, localIPs, lang
util.BootMobile(C.GoString(container), C.GoString(appDir), C.GoString(workspaceBaseDir), C.GoString(lang))
model.InitConf()
go server.Serve(false)
go server.Serve(false, model.Conf.CookieKey)
go func() {
model.InitAppearance()
sql.InitDatabase(false)

2
kernel/main.go
View file

@ -31,7 +31,7 @@ func main() {
util.Boot()
model.InitConf()
go server.Serve(false)
go server.Serve(false, model.Conf.CookieKey)
model.InitAppearance()
sql.InitDatabase(false)
sql.InitHistoryDatabase(false)

4
kernel/mobile/kernel.go
View file

@ -197,7 +197,7 @@ func VerifyAppStoreTransaction(accountToken, transactionID string) (retCode int)
}
func StartKernelFast(container, appDir, workspaceBaseDir, localIPs string) {
go server.Serve(true)
go server.Serve(true, model.Conf.CookieKey)
}
func StartKernel(container, appDir, workspaceBaseDir, timezoneID, localIPs, lang, osVer string) {
@ -208,7 +208,7 @@ func StartKernel(container, appDir, workspaceBaseDir, timezoneID, localIPs, lang
util.BootMobile(container, appDir, workspaceBaseDir, lang)
model.InitConf()
go server.Serve(false)
go server.Serve(false, model.Conf.CookieKey)
go func() {
model.InitAppearance()
sql.InitDatabase(false)

5
kernel/model/conf.go
View file

@ -82,6 +82,7 @@ type AppConf struct {
CloudRegion int `json:"cloudRegion"` // 云端区域，0：中国大陆，1：北美
Snippet *conf.Snpt `json:"snippet"` // 代码片段
DataIndexState int `json:"dataIndexState"` // 数据索引状态，0：已索引，1：未索引
CookieKey string `json:"cookieKey"` // 用于加密 Cookie 的密钥
m *sync.RWMutex // 配置数据锁
userLock *sync.RWMutex // 用户数据独立锁，避免与配置保存操作竞争
@ -579,6 +580,10 @@ func InitConf() {
Conf.DataIndexState = 0
if "" == Conf.CookieKey {
Conf.CookieKey = gulu.Rand.String(16)
}
Conf.Save()
logging.SetLogLevel(Conf.LogLevel)

5
kernel/server/serve.go
View file

@ -62,7 +62,7 @@ const (
)
var (
sessionStore = cookie.NewStore([]byte("ATN51UlxVq1Gcvdf"))
sessionStore cookie.Store
HttpMethods = []string{
http.MethodGet,
@ -129,7 +129,7 @@ var (
}
)
func Serve(fastMode bool) {
func Serve(fastMode bool, cookieKey string) {
gin.SetMode(gin.ReleaseMode)
ginServer := gin.New()
ginServer.UseH2C = true
@ -143,6 +143,7 @@ func Serve(fastMode bool) {
gzip.Gzip(gzip.DefaultCompression, gzip.WithExcludedExtensions([]string{".pdf", ".mp3", ".wav", ".ogg", ".mov", ".weba", ".mkv", ".mp4", ".webm", ".flac"})),
)
sessionStore = cookie.NewStore([]byte(cookieKey))
sessionStore.Options(sessions.Options{
Path: "/",
Secure: util.SSL,