be0508cf26
This adds error returns to model methods called by the protocol layer. Returning an error will cause the connection to be torn down as the message couldn't be handled. Using this to signal that a folder isn't currently available will then cause a reconnection a few moments later, when it'll hopefully work better. Tested manually by running with STRECHECKDBEVERY=0 on a nontrivially sized setup. This panics reliably before this patch, but just causes a disconnect/reconnect now.
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
// Copyright (C) 2014 The Protocol Authors.
|
|
|
|
// +build windows
|
|
|
|
package protocol
|
|
|
|
// Windows uses backslashes as file separator
|
|
|
|
import (
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
type nativeModel struct {
|
|
Model
|
|
}
|
|
|
|
func (m nativeModel) Index(deviceID DeviceID, folder string, files []FileInfo) error {
|
|
files = fixupFiles(files)
|
|
return m.Model.Index(deviceID, folder, files)
|
|
}
|
|
|
|
func (m nativeModel) IndexUpdate(deviceID DeviceID, folder string, files []FileInfo) error {
|
|
files = fixupFiles(files)
|
|
return m.Model.IndexUpdate(deviceID, folder, files)
|
|
}
|
|
|
|
func (m nativeModel) Request(deviceID DeviceID, folder, name string, size int32, offset int64, hash []byte, weakHash uint32, fromTemporary bool) (RequestResponse, error) {
|
|
if strings.Contains(name, `\`) {
|
|
l.Warnf("Dropping request for %s, contains invalid path separator", name)
|
|
return nil, ErrNoSuchFile
|
|
}
|
|
|
|
name = filepath.FromSlash(name)
|
|
return m.Model.Request(deviceID, folder, name, size, offset, hash, weakHash, fromTemporary)
|
|
}
|
|
|
|
func fixupFiles(files []FileInfo) []FileInfo {
|
|
var out []FileInfo
|
|
for i := range files {
|
|
if strings.Contains(files[i].Name, `\`) {
|
|
l.Warnf("Dropping index entry for %s, contains invalid path separator", files[i].Name)
|
|
if out == nil {
|
|
// Most incoming updates won't contain anything invalid, so
|
|
// we delay the allocation and copy to output slice until we
|
|
// really need to do it, then copy all the so-far valid
|
|
// files to it.
|
|
out = make([]FileInfo, i, len(files)-1)
|
|
copy(out, files)
|
|
}
|
|
continue
|
|
}
|
|
|
|
// Fixup the path separators
|
|
files[i].Name = filepath.FromSlash(files[i].Name)
|
|
|
|
if out != nil {
|
|
out = append(out, files[i])
|
|
}
|
|
}
|
|
|
|
if out != nil {
|
|
// We did some filtering
|
|
return out
|
|
}
|
|
|
|
// Unchanged
|
|
return files
|
|
}
|