Merge pull request containerd#3553 from apostasie/fix-overzealous-windows-path

AkihiroSuda · web-flow · commit 506d8753288d · 2024-10-17T14:30:01.000+09:00
Fix over-eager windows path restrictions
diff --git a/pkg/store/filestore_windows.go b/pkg/store/filestore_windows.go
@@ -24,7 +24,7 @@ import (
 // See https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file
 // https://stackoverflow.com/questions/1976007/what-characters-are-forbidden-in-windows-and-linux-directory-names
 var (
-	disallowedKeywords = regexp.MustCompile(`(?i)^(con|prn|nul|aux|com[1-9¹²³]|lpt[1-9¹²³])([.].*)?`)
+	disallowedKeywords = regexp.MustCompile(`(?i)^(con|prn|nul|aux|com[1-9¹²³]|lpt[1-9¹²³])([.].*)?$`)
 	reservedCharacters = regexp.MustCompile(`[\x{0}-\x{1f}<>:"/\\|?*]`)
 )
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`// See https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file`
`25`	`25`	`// https://stackoverflow.com/questions/1976007/what-characters-are-forbidden-in-windows-and-linux-directory-names`
`26`	`26`	`var (`
`27`		- disallowedKeywords = regexp.MustCompile(`(?i)^(con\|prn\|nul\|aux\|com[1-9¹²³]\|lpt[1-9¹²³])([.].*)?`)
	`27`	+ disallowedKeywords = regexp.MustCompile(`(?i)^(con\|prn\|nul\|aux\|com[1-9¹²³]\|lpt[1-9¹²³])([.].*)?$`)
`28`	`28`	reservedCharacters = regexp.MustCompile(`[\x{0}-\x{1f}<>:"/\\\|?*]`)
`29`	`29`	`)`
`30`	`30`