vrr/Pulse
2
0
Fork 0
mirror of https://github.com/rcourtman/Pulse.git synced 2026-07-09 16:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Harden discovery store legacy file joins

Browse source
This commit is contained in:
rcourtman 2026-03-29 13:53:46 +01:00
parent 6817b67fbd
commit 7dcd564997
2 changed files with 71 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

53
internal/servicediscovery/store.go
View file

@ -206,9 +206,17 @@ func NewStore(dataDir string) (*Store, error) {
return store, nil
}
func (s *Store) discoveryPathForLeaf(leaf string) (string, error) {
return securityutil.JoinStorageLeaf(s.dataDir, leaf)
}
// getFilePath returns the file path for a resource ID.
func (s *Store) getFilePath(id string) string {
return filepath.Join(s.dataDir, securityutil.HashedStorageName(id)+".enc")
path, err := s.discoveryPathForLeaf(securityutil.HashedStorageName(id) + ".enc")
if err != nil {
panic(fmt.Sprintf("invalid hashed discovery storage leaf for %q: %v", id, err))
}
return path
}
func (s *Store) findLegacyDiscoveryPath(id string) (string, error) {
@ -228,7 +236,11 @@ func (s *Store) findLegacyDiscoveryPath(id string) (string, error) {
if entry.Name() == canonicalName {
continue
}
path := filepath.Join(s.dataDir, entry.Name())
path, err := s.discoveryPathForLeaf(entry.Name())
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("skipping invalid legacy discovery candidate")
continue
}
storedID, err := s.readDiscoveryIDFromPath(path)
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("failed to inspect legacy discovery candidate")
@ -521,7 +533,11 @@ func (s *Store) List() ([]*ResourceDiscovery, error) {
continue
}
filePath := filepath.Join(s.dataDir, entry.Name())
filePath, err := s.discoveryPathForLeaf(entry.Name())
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("skipping invalid discovery file leaf")
continue
}
data, migratedPlaintext, err := s.loadDiscoveryFileData(filePath, maxDiscoveryFileReadBytes)
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("failed to read discovery file")
@ -685,7 +701,11 @@ func (s *Store) NeedsRefresh(id string, maxAge time.Duration) bool {
// getFingerprintFilePath returns the file path for a fingerprint.
func (s *Store) getFingerprintFilePath(resourceID string) string {
return filepath.Join(s.fingerprintDir, securityutil.HashedStorageName(resourceID)+".json")
path, err := securityutil.JoinStorageLeaf(s.fingerprintDir, securityutil.HashedStorageName(resourceID)+".json")
if err != nil {
panic(fmt.Sprintf("invalid hashed fingerprint storage leaf for %q: %v", resourceID, err))
}
return path
}
func (s *Store) findLegacyFingerprintPath(resourceID string) (string, error) {
@ -706,7 +726,11 @@ func (s *Store) findLegacyFingerprintPath(resourceID string) (string, error) {
continue
}
path := filepath.Join(s.fingerprintDir, entry.Name())
path, err := securityutil.JoinStorageLeaf(s.fingerprintDir, entry.Name())
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("skipping invalid legacy fingerprint candidate")
continue
}
data, err := readRegularFileWithLimit(path, maxFingerprintFileReadBytes)
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("failed to inspect legacy fingerprint candidate")
@ -745,7 +769,12 @@ func (s *Store) loadFingerprints() {
continue
}
data, err := readRegularFileWithLimit(filepath.Join(s.fingerprintDir, entry.Name()), maxFingerprintFileReadBytes)
filePath, err := securityutil.JoinStorageLeaf(s.fingerprintDir, entry.Name())
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("skipping invalid fingerprint file leaf")
continue
}
data, err := readRegularFileWithLimit(filePath, maxFingerprintFileReadBytes)
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("failed to read fingerprint file")
continue
@ -975,7 +1004,11 @@ func (s *Store) CleanupOrphanedDiscoveries(currentResourceIDs map[string]bool) i
}
if !currentResourceIDs[resourceID] {
filePath := filepath.Join(s.dataDir, entry.Name())
filePath, err := s.discoveryPathForLeaf(entry.Name())
if err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("skipping invalid orphaned discovery file leaf")
continue
}
if err := os.Remove(filePath); err != nil {
log.Warn().Err(err).Str("file", entry.Name()).Msg("failed to remove orphaned discovery file")
} else {
@ -1037,7 +1070,11 @@ func (s *Store) readDiscoveryIDFromPath(filePath string) (string, error) {
}
func (s *Store) readDiscoveryIDFromFile(filename string) (string, error) {
return s.readDiscoveryIDFromPath(filepath.Join(s.dataDir, filename))
filePath, err := s.discoveryPathForLeaf(filename)
if err != nil {
return "", err
}
return s.readDiscoveryIDFromPath(filePath)
}
// ListDiscoveryIDs returns all discovery IDs currently stored.

26
internal/servicediscovery/store_test.go
View file

@ -10,6 +10,7 @@ import (
"time"
"github.com/rcourtman/pulse-go-rewrite/internal/crypto"
"github.com/rcourtman/pulse-go-rewrite/internal/securityutil"
)
type fakeCrypto struct{}
@ -292,6 +293,31 @@ func TestStore_CryptoRoundTripAndPaths(t *testing.T) {
}
}
func TestStoreDiscoveryPathForLeafRejectsTraversal(t *testing.T) {
store, err := NewStore(t.TempDir())
if err != nil {
t.Fatalf("NewStore error: %v", err)
}
if _, err := store.discoveryPathForLeaf("../evil.enc"); err == nil {
t.Fatal("expected discoveryPathForLeaf to reject traversal leaf")
}
if _, err := store.readDiscoveryIDFromFile("../evil.enc"); err == nil {
t.Fatal("expected readDiscoveryIDFromFile to reject traversal filename")
}
}
func TestStoreFingerprintPathRejectsTraversal(t *testing.T) {
store, err := NewStore(t.TempDir())
if err != nil {
t.Fatalf("NewStore error: %v", err)
}
if _, err := securityutil.JoinStorageLeaf(store.fingerprintDir, "../evil.json"); err == nil {
t.Fatal("expected fingerprint storage leaf join to reject traversal leaf")
}
}
func TestStore_PlaintextDiscoveryRewritesEncryptedStorageOnRead(t *testing.T) {
store, err := NewStore(t.TempDir())
if err != nil {