ParseRestartPolicy: validate for missing policy-names

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker · Aug 28, 2023 · 167632b · 167632b
1 parent 4a763bf
commit 167632b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cli/command/container/opts_test.go b/cli/command/container/opts_test.go
@@ -712,6 +712,10 @@ func TestParseRestartPolicy(t *testing.T) {
 				MaximumRetryCount: 0,
 			},
 		},
+		{
+			input:       ":1",
+			expectedErr: "invalid restart policy format: no policy provided before colon",
+		},
 		{
 			input: "always",
 			expected: container.RestartPolicy{

diff --git a/opts/parse.go b/opts/parse.go
@@ -77,7 +77,10 @@ func ParseRestartPolicy(policy string) (container.RestartPolicy, error) {
 		return p, nil
 	}
 
-	k, v, _ := strings.Cut(policy, ":")
+	k, v, ok := strings.Cut(policy, ":")
+	if ok && k == "" {
+		return container.RestartPolicy{}, fmt.Errorf("invalid restart policy format: no policy provided before colon")
+	}
 	if v != "" {
 		count, err := strconv.Atoi(v)
 		if err != nil {