Skip to content

Commit

Permalink
cmd: upgrade: inherit the permissions of the original executable (#4160)
Browse files Browse the repository at this point in the history
  • Loading branch information
mohammed90 authored May 11, 2021
1 parent dbe164d commit 2aefe15
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion cmd/commandfuncs.go
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,10 @@ func cmdUpgrade(_ Flags) (int, error) {
if err != nil {
return caddy.ExitCodeFailedStartup, fmt.Errorf("determining current executable path: %v", err)
}
thisExecStat, err := os.Stat(thisExecPath)
if err != nil {
return caddy.ExitCodeFailedStartup, fmt.Errorf("retrieving current executable permission bits: %v", err)
}
l.Info("this executable will be replaced", zap.String("path", thisExecPath))

// get the list of nonstandard plugins
Expand Down Expand Up @@ -654,7 +658,7 @@ func cmdUpgrade(_ Flags) (int, error) {

// download the file; do this in a closure to close reliably before we execute it
writeFile := func() error {
destFile, err := os.OpenFile(thisExecPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0770)
destFile, err := os.OpenFile(thisExecPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, thisExecStat.Mode())
if err != nil {
return fmt.Errorf("unable to open destination file: %v", err)
}
Expand Down

0 comments on commit 2aefe15

Please sign in to comment.