sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msgstore_fs: escape "." and ".."

Browse Source
This commit is contained in:
Hubert Hirtz 2021-09-17 23:29:33 +02:00 committed by Simon Ser
parent 2554c92df7
commit ba19d44cf9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
msgstore_fs.go
View File

@ -16,7 +16,15 @@ import (
const fsMessageStoreMaxTries = 100 const fsMessageStoreMaxTries = 100
var escapeFilename = strings.NewReplacer("/", "-", "\\", "-") func escapeFilename(unsafe string) (safe string) {
if unsafe == "." {
return "-"
} else if unsafe == ".." {
return "--"
} else {
return strings.NewReplacer("/", "-", "\\", "-").Replace(unsafe)
}
}
type date struct { type date struct {
Year, Month, Day int Year, Month, Day int
@ -69,7 +77,7 @@ var _ chatHistoryMessageStore = (*fsMessageStore)(nil)
func newFSMessageStore(root, username string) *fsMessageStore { func newFSMessageStore(root, username string) *fsMessageStore {
return &fsMessageStore{ return &fsMessageStore{
root: filepath.Join(root, escapeFilename.Replace(username)), root: filepath.Join(root, escapeFilename(username)),
files: make(map[string]*os.File), files: make(map[string]*os.File),
} }
} }
@ -77,7 +85,7 @@ func newFSMessageStore(root, username string) *fsMessageStore {
func (ms *fsMessageStore) logPath(network *network, entity string, t time.Time) string { func (ms *fsMessageStore) logPath(network *network, entity string, t time.Time) string {
year, month, day := t.Date() year, month, day := t.Date()
filename := fmt.Sprintf("%04d-%02d-%02d.log", year, month, day) filename := fmt.Sprintf("%04d-%02d-%02d.log", year, month, day)
return filepath.Join(ms.root, escapeFilename.Replace(network.GetName()), escapeFilename.Replace(entity), filename) return filepath.Join(ms.root, escapeFilename(network.GetName()), escapeFilename(entity), filename)
} }
// nextMsgID queries the message ID for the next message to be written to f. // nextMsgID queries the message ID for the next message to be written to f.
@ -439,7 +447,7 @@ func (ms *fsMessageStore) LoadLatestID(network *network, entity, id string, limi
} }
func (ms *fsMessageStore) ListTargets(network *network, start, end time.Time, limit int) ([]chatHistoryTarget, error) { func (ms *fsMessageStore) ListTargets(network *network, start, end time.Time, limit int) ([]chatHistoryTarget, error) {
rootPath := filepath.Join(ms.root, escapeFilename.Replace(network.GetName())) rootPath := filepath.Join(ms.root, escapeFilename(network.GetName()))
root, err := os.Open(rootPath) root, err := os.Open(rootPath)
if err != nil { if err != nil {
return nil, err return nil, err