lib/fs,model: Clarify errors for Android filenames (fixes #9395)

lib/fs/basicfs.go

@@ -24,6 +24,7 @@ var (
 	errInvalidFilenameWindowsSpacePeriod  = errors.New("name is invalid, must not end in space or period on Windows")
 	errInvalidFilenameWindowsReservedName = errors.New("name is invalid, contains Windows reserved name")
 	errInvalidFilenameWindowsReservedChar = errors.New("name is invalid, contains Windows reserved character")
+	errInvalidFilenameAndroidReservedChar = errors.New("name is invalid, contains Android reserved character")
 )
 
 type OptionJunctionsAsDirs struct{}

lib/fs/util.go

@@ -48,32 +48,44 @@ func getHomeDir() (string, error) {
 	return os.UserHomeDir()
 }
 
-const windowsDisallowedCharacters = (`<>:"|?*` +
+// On Android, the following characters are disallowed on user storage
+// even if the filesystem is not FAT. On Windows, they apply to both FAT
+// and NTFS.
+// Ref: https://cs.android.com/android/platform/superproject/main/+/main:packages/providers/MediaProvider/src/com/android/providers/media/util/FileUtils.java;drc=9d054a9eb6a8d8c3d79e007ea6d2f89c94a52f06;l=485
+const fatDisallowedCharacters = (`/\<>:"|?*` +
 	"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" +
 	"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f")
 
-func WindowsInvalidFilename(name string) error {
+func OsInvalidFilename(name string) error {
 	// The path must not contain any disallowed characters.
-	if idx := strings.IndexAny(name, windowsDisallowedCharacters); idx != -1 {
-		return fmt.Errorf("%w: %q", errInvalidFilenameWindowsReservedChar, name[idx:idx+1])
+	var errMsg error
+	if build.IsAndroid {
+		errMsg = errInvalidFilenameAndroidReservedChar
+	} else if build.IsWindows {
+		errMsg = errInvalidFilenameWindowsReservedChar
+	}
+	if idx := strings.IndexAny(name, fatDisallowedCharacters); idx != -1 && errMsg != nil {
+		return fmt.Errorf("%w: %q", errMsg, name[idx:idx+1])
 	}
 
-	// None of the path components should end in space or period, or be a
-	// reserved name.
-	for len(name) > 0 {
-		part, rest, _ := strings.Cut(name, `\`)
-		name = rest
-
-		if part == "" {
-			continue
-		}
-		switch part[len(part)-1] {
-		case ' ', '.':
-			// Names ending in space or period are not valid.
-			return errInvalidFilenameWindowsSpacePeriod
-		}
-		if reserved := windowsReservedNamePart(part); reserved != "" {
-			return fmt.Errorf("%w: %q", errInvalidFilenameWindowsReservedName, reserved)
+	if build.IsWindows {
+		// None of the path components should end in space or period, or be a
+		// reserved name.
+		for len(name) > 0 {
+			part, rest, _ := strings.Cut(name, `\`)
+			name = rest
+
+			if part == "" {
+				continue
+			}
+			switch part[len(part)-1] {
+			case ' ', '.':
+				// Names ending in space or period are not valid.
+				return errInvalidFilenameWindowsSpacePeriod
+			}
+			if reserved := windowsReservedNamePart(part); reserved != "" {
+				return fmt.Errorf("%w: %q", errInvalidFilenameWindowsReservedName, reserved)
+			}
 		}
 	}
 
@@ -102,7 +114,7 @@ func WindowsInvalidFilename(name string) error {
 func SanitizePath(path string) string {
 	var b strings.Builder
 
-	const disallowed = `'/\[]{};:!@$%&^#` + windowsDisallowedCharacters
+	const disallowed = `'[]{};!@$%&^#` + fatDisallowedCharacters
 	prev := ' '
 	for _, c := range path {
 		if !unicode.IsPrint(c) || c == unicode.ReplacementChar ||

lib/fs/util_test.go

@@ -50,7 +50,7 @@ func TestCommonPrefix(t *testing.T) {
 	test(`.`, `.`, `.`)
 }
 
-func TestWindowsInvalidFilename(t *testing.T) {
+func TestOsInvalidFilename(t *testing.T) {
 	cases := []struct {
 		name string
 		err  error
@@ -69,7 +69,7 @@ func TestWindowsInvalidFilename(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		err := WindowsInvalidFilename(tc.name)
+		err := OsInvalidFilename(tc.name)
 		if !errors.Is(err, tc.err) {
 			t.Errorf("For %q, got %v, expected %v", tc.name, err, tc.err)
 		}
@@ -121,16 +121,16 @@ func TestSanitizePathFuzz(t *testing.T) {
 	}
 }
 
-func benchmarkWindowsInvalidFilename(b *testing.B, name string) {
+func benchmarkOsInvalidFilename(b *testing.B, name string) {
 	for i := 0; i < b.N; i++ {
-		WindowsInvalidFilename(name)
+		OsInvalidFilename(name)
 	}
 }
 
-func BenchmarkWindowsInvalidFilenameValid(b *testing.B) {
-	benchmarkWindowsInvalidFilename(b, "License.txt.gz")
+func BenchmarkOsInvalidFilenameValid(b *testing.B) {
+	benchmarkOsInvalidFilename(b, "License.txt.gz")
 }
 
-func BenchmarkWindowsInvalidFilenameNUL(b *testing.B) {
-	benchmarkWindowsInvalidFilename(b, "nul.txt.gz")
+func BenchmarkOsInvalidFilenameNUL(b *testing.B) {
+	benchmarkOsInvalidFilename(b, "nul.txt.gz")
 }

lib/model/folder_sendrecv.go

@@ -348,7 +348,7 @@ func (f *sendReceiveFolder) processNeeded(snap *db.Snapshot, dbUpdateChan chan<-
 			l.Debugln(f, "Handling ignored file", file)
 			dbUpdateChan <- dbUpdateJob{file, dbUpdateInvalidate}
 
-		case build.IsWindows && fs.WindowsInvalidFilename(file.Name) != nil:
+		case (build.IsAndroid || build.IsWindows) && fs.OsInvalidFilename(file.Name) != nil:
 			if file.IsDeleted() {
 				// Just pretend we deleted it, no reason to create an error
 				// about a deleted file that we can't have anyway.
@@ -358,7 +358,7 @@ func (f *sendReceiveFolder) processNeeded(snap *db.Snapshot, dbUpdateChan chan<-
 			} else {
 				// We can't pull an invalid file. Grab the error again since
 				// we couldn't assign it directly in the case clause.
-				f.newPullError(file.Name, fs.WindowsInvalidFilename(file.Name))
+				f.newPullError(file.Name, fs.OsInvalidFilename(file.Name))
 				// No reason to retry for this
 				changed--
 			}