Upgrade by replacement if executable is in temp dir

twpayne · May 3, 2019 · c86e2ba · c86e2ba
1 parent c56f61d
commit c86e2ba
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -353,14 +353,18 @@ func getMethod(fs vfs.FS, executableFilename string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	executableIsInTempDir, err := vfs.Contains(fs, executableFilename, os.TempDir())
+	if err != nil {
+		return "", err
+	}
 	executableStat := info.Sys().(*syscall.Stat_t)
 	uid := os.Getuid()
 	switch runtime.GOOS {
 	case "darwin":
 		if int(executableStat.Uid) != uid {
 			return "", fmt.Errorf("%s: cannot upgrade executable owned by non-current user", executableFilename)
 		}
-		if executableInUserHomeDir {
+		if executableInUserHomeDir || executableIsInTempDir {
 			return methodReplaceExecutable, nil
 		}
 		return methodUpgradePackage, nil
@@ -371,7 +375,7 @@ func getMethod(fs vfs.FS, executableFilename string) (string, error) {
 			if executableStat.Uid != 0 {
 				return "", fmt.Errorf("%s: cannot upgrade executable owned by non-root user when running as root", executableFilename)
 			}
-			if executableInUserHomeDir {
+			if executableInUserHomeDir || executableIsInTempDir {
 				return methodReplaceExecutable, nil
 			}
 			return methodUpgradePackage, nil