Pull request 2456: 7985-fix-contol-profile

Updates #7985.

Squashed commit of the following:

commit 1d5a3e66cc046ac8be6c0ebe7f5e06bc3e2a5e72
Merge: bdc76b1b1 52398e27e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Aug 28 19:05:51 2025 +0300

    Merge branch 'master' into 7985-fix-contol-profile

commit bdc76b1b10
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Aug 26 15:47:07 2025 +0300

    home: imp code

commit aef012ed02
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Aug 26 13:14:39 2025 +0300

    home: add tests

commit 799e8b49a1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Aug 25 16:59:06 2025 +0300

    all: fix control profile
This commit is contained in:
Stanislav Chzhen
2025-08-28 19:17:24 +03:00
parent 52398e27ec
commit 146b6dd094
8 changed files with 167 additions and 20 deletions

View File

@@ -178,7 +178,8 @@ func setupContext(ctx context.Context, baseLogger *slog.Logger, opts options) (e
return nil
}
err = parseConfig()
// TODO(s.chzhen): Consider adding a key prefix.
err = parseConfig(ctx, baseLogger)
if err != nil {
log.Error("parsing configuration file: %s", err)
@@ -862,7 +863,7 @@ func initUsers(
baseLogger *slog.Logger,
isGLiNet bool,
) (auth *auth, err error) {
var rateLimiter loginRaateLimiter
var rateLimiter loginRateLimiter
if config.AuthAttempts > 0 && config.AuthBlockMin > 0 {
blockDur := time.Duration(config.AuthBlockMin) * time.Minute
rateLimiter = newAuthRateLimiter(blockDur, config.AuthAttempts)