fix chownR, skip invalid symlink

et-nik · et-nik · commit 4dc442a9570f · 2023-05-01T20:31:18.000+02:00
diff --git a/internal/app/game_server_commands/os_utils_unix.go b/internal/app/game_server_commands/os_utils_unix.go
@@ -20,11 +20,16 @@ func chownR(path string, uid, gid int) error {
 		}
 
 		if info.Mode()&os.ModeSymlink != 0 {
-			_, err = os.Readlink(name)
+			symlinkFile, err := os.Readlink(name)
 			if err != nil {
 				// Ignore invalid symlink
 				return nil
 			}
+
+			if _, err = os.Stat(symlinkFile); err != nil {
+				// Ignore invalid symlink
+				return nil
+			}
 		}
 
 		return os.Chown(name, uid, gid)

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,16 @@ func chownR(path string, uid, gid int) error {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`if info.Mode()&os.ModeSymlink != 0 {`
`23`		`- _, err = os.Readlink(name)`
	`23`	`+ symlinkFile, err := os.Readlink(name)`
`24`	`24`	`if err != nil {`
`25`	`25`	`// Ignore invalid symlink`
`26`	`26`	`return nil`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ if _, err = os.Stat(symlinkFile); err != nil {`
	`30`	`+ // Ignore invalid symlink`
	`31`	`+ return nil`
	`32`	`+ }`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`return os.Chown(name, uid, gid)`