Changeset 397 in code for trunk

Timestamp:

Aug 19, 2020, 10:22:32 AM (5 years ago)

Author:

contact

Message:

Escape user/network/entity characters in log file path

ZNC replaces slashes and backslashes with a dashes.

File:

• trunk/logger.go (modified) (1 diff)

trunk/logger.go

@@ -29 +29 @@
 }
 
+var escapeFilename = strings.NewReplacer("/", "-", "\\", "-")
+
 func logPath(network *network, entity string, t time.Time) string {
         user := network.user
         srv := user.srv
 
-        // TODO: handle/forbid network/entity names with illegal path characters
         year, month, day := t.Date()
         filename := fmt.Sprintf("%04d-%02d-%02d.log", year, month, day)
-        return filepath.Join(srv.LogPath, user.Username, network.GetName(), entity, filename)
+        return filepath.Join(srv.LogPath, escapeFilename.Replace(user.Username), escapeFilename.Replace(network.GetName()), escapeFilename.Replace(entity), filename)
 }