opts: MountOpt: improve validation for whitespace in options

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

opts/mount.go

@@ -79,6 +79,9 @@ func (m *MountOpt) Set(value string) error {
 
 	for _, field := range fields {
 		key, val, ok := strings.Cut(field, "=")
+		if k := strings.TrimSpace(key); k != key {
+			return fmt.Errorf("invalid option '%s' in '%s': option should not have whitespace", k, field)
+		}
 
 		// TODO(thaJeztah): these options should not be case-insensitive.
 		key = strings.ToLower(key)
@@ -167,7 +170,7 @@ func (m *MountOpt) Set(value string) error {
 			}
 			tmpfsOptions().Mode = os.FileMode(ui64)
 		default:
-			return fmt.Errorf("unexpected key '%s' in '%s'", key, field)
+			return fmt.Errorf("unknown option '%s' in '%s'", key, field)
 		}
 	}
 

opts/mount_test.go

@@ -116,17 +116,17 @@ func TestMountOptErrors(t *testing.T) {
 		{
 			doc:    "invalid key=value",
 			value:  "type=volume,target=/foo,bogus=foo",
-			expErr: "unexpected key 'bogus' in 'bogus=foo'",
+			expErr: "unknown option 'bogus' in 'bogus=foo'",
 		},
 		{
 			doc:    "invalid key with leading whitespace",
 			value:  "type=volume, src=/foo,target=/foo",
-			expErr: "unexpected key ' src' in ' src=/foo'",
+			expErr: "invalid option 'src' in ' src=/foo': option should not have whitespace",
 		},
 		{
 			doc:    "invalid key with trailing whitespace",
 			value:  "type=volume,src =/foo,target=/foo",
-			expErr: "unexpected key 'src ' in 'src =/foo'",
+			expErr: "invalid option 'src' in 'src =/foo': option should not have whitespace",
 		},
 		{
 			doc:    "missing value",