octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Prevent collisions in the progressemitter registry

Browse Source 
Using filepath.Join can cause collisions. The folder ID could be something
like ".." or "../..".

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3778
This commit is contained in:
Unrud 2016-12-01 12:34:20 +00:00 committed by Jakob Borg
parent 48a229a0cd
commit cabe94552a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/model/progressemitter.go
View File

@ -8,7 +8,6 @@ package model
import ( import (
"fmt" "fmt"
"path/filepath"
"time" "time"
"github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/config"
@ -213,7 +212,9 @@ func (t *ProgressEmitter) Register(s *sharedPullerState) {
if len(t.registry) == 0 { if len(t.registry) == 0 {
t.timer.Reset(t.interval) t.timer.Reset(t.interval)
} }
t.registry[filepath.Join(s.folder, s.file.Name)] = s // Separate the folder ID (arbitrary string) and and the file name by "//"
// because it never appears in a valid file name.
t.registry[s.folder+"//"+s.file.Name] = s
} }
// Deregister a puller which will stop broadcasting pullers state. // Deregister a puller which will stop broadcasting pullers state.
@ -223,7 +224,7 @@ func (t *ProgressEmitter) Deregister(s *sharedPullerState) {
l.Debugln("progress emitter: deregistering", s.folder, s.file.Name) l.Debugln("progress emitter: deregistering", s.folder, s.file.Name)
delete(t.registry, filepath.Join(s.folder, s.file.Name)) delete(t.registry, s.folder+"//"+s.file.Name)
} }
// BytesCompleted returns the number of bytes completed in the given folder. // BytesCompleted returns the number of bytes completed in the given folder.