Skip to content

issue #15034 half fix #15041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
88250 merged 1 commit into from
Jun 16, 2025
Merged

issue #15034 half fix #15041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions kernel/api/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,14 @@ func getEmojiConf(c *gin.Context) {
}

if !util.IsValidUploadFileName(html.UnescapeString(name)) {
emojiFullName := customConfDir + "/" + name
fullPathFilteredName := customConfDir + "/" + util.FilterUploadFileName(name)
// XSS through emoji name https://github.com/siyuan-note/siyuan/issues/15034
logging.LogWarnf("invalid custom emoji name [%s]", name)
continue
logging.LogErrorf("renaming invalid file to [%s] in emojis", fullPathFilteredName)
if removeErr := os.Rename(emojiFullName, fullPathFilteredName); nil != removeErr {
logging.LogErrorf("renaming invalid file to [%s] failed: %s", fullPathFilteredName, removeErr)
}
}

if customEmoji.IsDir() {
Expand All @@ -195,9 +200,14 @@ func getEmojiConf(c *gin.Context) {
}

if !util.IsValidUploadFileName(html.UnescapeString(name)) {
emojiFullName := customConfDir + "/" + name
fullPathFilteredName := customConfDir + "/" + util.FilterUploadFileName(name)
// XSS through emoji name https://github.com/siyuan-note/siyuan/issues/15034
logging.LogWarnf("invalid custom emoji name [%s]", name)
continue
logging.LogErrorf("renaming invalid file to [%s] in emojis", fullPathFilteredName)
if removeErr := os.Rename(emojiFullName, fullPathFilteredName); nil != removeErr {
logging.LogErrorf("renaming invalid file to [%s] failed: %s", fullPathFilteredName, removeErr)
}
}

addCustomEmoji(customEmoji.Name()+"/"+name, &items)
Expand Down
10 changes: 6 additions & 4 deletions kernel/model/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,13 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
// 将包含的自定义表情统一移动到 data/emojis/ 下
filelock.Walk(filepath.Join(unzipRootPath, "emojis"), func(path string, d fs.DirEntry, err error) error {
if !util.IsValidUploadFileName(d.Name()) {
emojiFullName := unzipRootPath + "emojis/" + name
fullPathFilteredName := unzipRootPath + "emojis/" + util.FilterUploadFileName(name)
// XSS through emoji name https://github.com/siyuan-note/siyuan/issues/15034
logging.LogErrorf("remove invalid file [%s] in emojis", path)
if removeErr := os.Remove(path); nil != removeErr {
logging.LogErrorf("remove invalid file [%s] failed: %s", path, removeErr)
return nil
logging.LogWarnf("invalid custom emoji name [%s]", name)
logging.LogErrorf("renaming invalid file to [%s] in emojis", fullPathFilteredName)
if removeErr := os.Rename(emojiFullName, fullPathFilteredName); nil != removeErr {
logging.LogErrorf("renaming invalid file to [%s] failed: %s", fullPathFilteredName, removeErr)
}
}
return nil
Expand Down
1 change: 1 addition & 0 deletions kernel/util/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ func FilterUploadFileName(name string) string {
ret = strings.ReplaceAll(ret, "#", "")
ret = strings.ReplaceAll(ret, "%", "")
ret = strings.ReplaceAll(ret, "$", "")
ret = strings.ReplaceAll(ret, ";", "")
ret = TruncateLenFileName(ret)
return ret
}
Expand Down