Changeset 591 in code for trunk

Timestamp:

Sep 19, 2021, 2:55:12 PM (4 years ago)

Author:

hubert

Message:

msgstore_fs: escape "." and ".."

File:

• trunk/msgstore_fs.go (modified) (4 diffs)

trunk/msgstore_fs.go

@@ -17 +17 @@
 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 {
@@ -70 +78 @@
 func newFSMessageStore(root, username string) *fsMessageStore {
         return &fsMessageStore{
-                root:  filepath.Join(root, escapeFilename.Replace(username)),
+                root:  filepath.Join(root, escapeFilename(username)),
                 files: make(map[string]*os.File),
         }
@@ -78 +86 @@
         year, month, day := t.Date()
         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)
 }
 
@@ -440 +448 @@
 
 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)
         if err != nil {