Skip to content

Improve File System Path Handling #274

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
AlexVulaj merged 2 commits into from
Apr 17, 2024
Merged

Improve File System Path Handling #274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3f387
Fix path traversal
moloch-- Apr 16, 2024
020a64f
Ensure session file prefix is added to file name
moloch-- Apr 17, 2024
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
11 changes: 8 additions & 3 deletions store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ import (
"github.com/gorilla/securecookie"
)

const (
// File name prefix for session files.
sessionFilePrefix = "session_"
)

// Store is an interface for custom session stores.
//
// See CookieStore and FilesystemStore for examples.
Expand Down Expand Up @@ -257,15 +262,15 @@ func (s *FilesystemStore) save(session *Session) error {
if err != nil {
return err
}
filename := filepath.Join(s.path, "session_"+session.ID)
filename := filepath.Join(s.path, sessionFilePrefix+filepath.Base(session.ID))
fileMutex.Lock()
defer fileMutex.Unlock()
return os.WriteFile(filename, []byte(encoded), 0600)
}

// load reads a file and decodes its content into session.Values.
func (s *FilesystemStore) load(session *Session) error {
filename := filepath.Join(s.path, "session_"+session.ID)
filename := filepath.Join(s.path, sessionFilePrefix+filepath.Base(session.ID))
fileMutex.RLock()
defer fileMutex.RUnlock()
fdata, err := os.ReadFile(filepath.Clean(filename))
Expand All @@ -281,7 +286,7 @@ func (s *FilesystemStore) load(session *Session) error {

// delete session file
func (s *FilesystemStore) erase(session *Session) error {
filename := filepath.Join(s.path, "session_"+session.ID)
filename := filepath.Join(s.path, sessionFilePrefix+filepath.Base(session.ID))

fileMutex.RLock()
defer fileMutex.RUnlock()
Expand Down