Pull request 2312: 7400 Windows permcheck
Updates #7400.
Squashed commit of the following:
commit f50d7c200de545dc6c8ef70b39208f522033fb90
Merge: 47040a14c 37b16bcf7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 3 18:09:23 2024 +0300
Merge branch 'master' into 7400-chown-permcheck
commit 47040a14cd50bf50429f44eba0acdcf736412b61
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 3 14:26:43 2024 +0300
permcheck: fix nil entries
commit e1d21c576d75a903b88db3b7beb82348cdcf60c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 2 15:37:58 2024 +0300
permcheck: fix nil owner
commit b1fc67c4d189293d0aee90c1905f7f387840643b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 29 18:07:15 2024 +0300
permcheck: imp doc
commit 0b6a71326e249f0923e389aa1f6f164b02802a24
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 29 17:16:24 2024 +0300
permcheck: imp code
commit 7dfbeda179d0ddb81db54fa4e0dcff189b400215
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 29 14:28:17 2024 +0300
permcheck: imp code
commit 3a5b6aced948a2d09fdae823fc986266c9984b3d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 28 19:21:03 2024 +0300
all: imp code, docs
commit c076c9366934303fa8c5909bd13770e367dca72e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 28 15:14:06 2024 +0300
permcheck: imp code, docs
commit 09e4ae1ba12e195454f1db11fa2f5c9e8e170f06
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 27 19:19:11 2024 +0300
all: implement windows permcheck
commit b75ed7d4d30e289b8a99e68e6a5e94ab74cf49cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Nov 25 18:01:47 2024 +0300
all: revert permissions
This commit is contained in:
66
internal/permcheck/migrate_unix.go
Normal file
66
internal/permcheck/migrate_unix.go
Normal file
@@ -0,0 +1,66 @@
|
||||
//go:build unix
|
||||
|
||||
package permcheck
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"github.com/AdguardTeam/AdGuardHome/internal/aghos"
|
||||
"github.com/AdguardTeam/golibs/errors"
|
||||
"github.com/AdguardTeam/golibs/logutil/slogutil"
|
||||
)
|
||||
|
||||
// needsMigration is a Unix-specific implementation of [NeedsMigration].
|
||||
//
|
||||
// TODO(a.garipov): Consider ways to detect this better.
|
||||
func needsMigration(ctx context.Context, l *slog.Logger, _, confFilePath string) (ok bool) {
|
||||
s, err := os.Stat(confFilePath)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
// Likely a first run. Don't check.
|
||||
return false
|
||||
}
|
||||
|
||||
l.ErrorContext(ctx, "checking a need for permission migration", slogutil.KeyError, err)
|
||||
|
||||
// Unexpected error. Try to migrate just in case.
|
||||
return true
|
||||
}
|
||||
|
||||
return s.Mode().Perm() != aghos.DefaultPermFile
|
||||
}
|
||||
|
||||
// migrate is a Unix-specific implementation of [Migrate].
|
||||
func migrate(
|
||||
ctx context.Context,
|
||||
l *slog.Logger,
|
||||
workDir string,
|
||||
dataDir string,
|
||||
statsDir string,
|
||||
querylogDir string,
|
||||
confFilePath string,
|
||||
) {
|
||||
dirLoggger, fileLogger := l.With("type", typeDir), l.With("type", typeFile)
|
||||
|
||||
for _, ent := range entities(workDir, dataDir, statsDir, querylogDir, confFilePath) {
|
||||
if ent.Value {
|
||||
chmodDir(ctx, dirLoggger, ent.Key)
|
||||
} else {
|
||||
chmodFile(ctx, fileLogger, ent.Key)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// chmodDir changes the permissions of a single directory. The results are
|
||||
// logged at the appropriate level.
|
||||
func chmodDir(ctx context.Context, l *slog.Logger, dirPath string) {
|
||||
chmodPath(ctx, l, dirPath, aghos.DefaultPermDir)
|
||||
}
|
||||
|
||||
// chmodFile changes the permissions of a single file. The results are logged
|
||||
// at the appropriate level.
|
||||
func chmodFile(ctx context.Context, l *slog.Logger, filePath string) {
|
||||
chmodPath(ctx, l, filePath, aghos.DefaultPermFile)
|
||||
}
|
||||
Reference in New Issue
Block a user