serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: upgrade: inherit the permissions of the original executable (#4160)

Browse source
This commit is contained in:
Mohammed Al Sahaf 2021-05-11 22:11:27 +00:00 committed by GitHub
parent dbe164d98a
commit 2aefe15686
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/commandfuncs.go
View file

@ -577,6 +577,10 @@ func cmdUpgrade(_ Flags) (int, error) {
if err != nil { if err != nil {
return caddy.ExitCodeFailedStartup, fmt.Errorf("determining current executable path: %v", err) 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)) l.Info("this executable will be replaced", zap.String("path", thisExecPath))
// get the list of nonstandard plugins // get the list of nonstandard plugins
@ -654,7 +658,7 @@ func cmdUpgrade(_ Flags) (int, error) {
// download the file; do this in a closure to close reliably before we execute it // download the file; do this in a closure to close reliably before we execute it
writeFile := func() error { 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 { if err != nil {
return fmt.Errorf("unable to open destination file: %v", err) return fmt.Errorf("unable to open destination file: %v", err)
} }