mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all: sync hotfix

This commit is contained in:
Eugene Burkov 2024-11-05 19:32:44 +03:00
parent 44cebc06ec
commit 54f3a5f990
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/aghos/os.go
View File

@ -20,9 +20,10 @@ import (
"github.com/AdguardTeam/golibs/log" "github.com/AdguardTeam/golibs/log"
) )
// Default file and directory permissions. // Default file, binary, and directory permissions.
const ( const (
DefaultPermDir fs.FileMode = 0o700 DefaultPermDir fs.FileMode = 0o700
DefaultPermExe fs.FileMode = 0o700
DefaultPermFile fs.FileMode = 0o600 DefaultPermFile fs.FileMode = 0o600
) )

20
internal/updater/updater.go
View File

@ -7,6 +7,7 @@ import (
"compress/gzip" "compress/gzip"
"fmt" "fmt"
"io" "io"
"io/fs"
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
@ -240,7 +241,7 @@ func (u *Updater) unpack() error {
func (u *Updater) check() (err error) { func (u *Updater) check() (err error) {
log.Debug("updater: checking configuration") log.Debug("updater: checking configuration")
err = copyFile(u.confName, filepath.Join(u.updateDir, "AdGuardHome.yaml")) err = copyFile(u.confName, filepath.Join(u.updateDir, "AdGuardHome.yaml"), aghos.DefaultPermFile)
if err != nil { if err != nil {
return fmt.Errorf("copyFile() failed: %w", err) return fmt.Errorf("copyFile() failed: %w", err)
} }
@ -266,7 +267,7 @@ func (u *Updater) backup(firstRun bool) (err error) {
log.Debug("updater: backing up current configuration") log.Debug("updater: backing up current configuration")
_ = aghos.Mkdir(u.backupDir, aghos.DefaultPermDir) _ = aghos.Mkdir(u.backupDir, aghos.DefaultPermDir)
if !firstRun { if !firstRun {
err = copyFile(u.confName, filepath.Join(u.backupDir, "AdGuardHome.yaml")) err = copyFile(u.confName, filepath.Join(u.backupDir, "AdGuardHome.yaml"), aghos.DefaultPermFile)
if err != nil { if err != nil {
return fmt.Errorf("copyFile() failed: %w", err) return fmt.Errorf("copyFile() failed: %w", err)
} }
@ -296,8 +297,8 @@ func (u *Updater) replace() error {
} }
if u.goos == "windows" { if u.goos == "windows" {
// rename fails with "File in use" error // Use copy, since renaming fails with "File in use" error.
err = copyFile(u.updateExeName, u.currentExeName) err = copyFile(u.updateExeName, u.currentExeName, aghos.DefaultPermExe)
} else { } else {
err = os.Rename(u.updateExeName, u.currentExeName) err = os.Rename(u.updateExeName, u.currentExeName)
} }
@ -521,15 +522,15 @@ func zipFileUnpack(zipfile, outDir string) (files []string, err error) {
return files, err return files, err
} }
// Copy file on disk // copyFile copies a file from src to dst with the specified permissions.
func copyFile(src, dst string) (err error) { func copyFile(src, dst string, perm fs.FileMode) (err error) {
d, err := os.ReadFile(src) d, err := os.ReadFile(src)
if err != nil { if err != nil {
// Don't wrap the error, since it's informative enough as is. // Don't wrap the error, since it's informative enough as is.
return err return err
} }
err = aghos.WriteFile(dst, d, aghos.DefaultPermFile) err = aghos.WriteFile(dst, d, perm)
if err != nil { if err != nil {
// Don't wrap the error, since it's informative enough as is. // Don't wrap the error, since it's informative enough as is.
return err return err
@ -538,6 +539,9 @@ func copyFile(src, dst string) (err error) {
return nil return nil
} }
// copySupportingFiles copies each file specified in files from srcdir to
// dstdir. If a file specified as a path, only the name of the file is used.
// It skips AdGuardHome, AdGuardHome.exe, and AdGuardHome.yaml.
func copySupportingFiles(files []string, srcdir, dstdir string) error { func copySupportingFiles(files []string, srcdir, dstdir string) error {
for _, f := range files { for _, f := range files {
_, name := filepath.Split(f) _, name := filepath.Split(f)
@ -548,7 +552,7 @@ func copySupportingFiles(files []string, srcdir, dstdir string) error {
src := filepath.Join(srcdir, name) src := filepath.Join(srcdir, name)
dst := filepath.Join(dstdir, name) dst := filepath.Join(dstdir, name)
err := copyFile(src, dst) err := copyFile(src, dst, aghos.DefaultPermFile)
if err != nil && !errors.Is(err, os.ErrNotExist) { if err != nil && !errors.Is(err, os.ErrNotExist) {
return err return err
} }