Merge in DNS/adguard-home from AGDNS-2743-aghuser-session to master Squashed commit of the following: commit 74fd4bc11eaf784880855fa2c710a747428db146 Merge: 844e865f67d479babaAuthor: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 18 18:14:36 2025 +0300 Merge branch 'master' into AGDNS-2743-aghuser-session commit 844e865f647efb4de7f057c392894c8f65bab422 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 18 15:18:44 2025 +0300 aghuser: imp fmt commit 584288e0a3ddbe6d7ae31c80c22b8f397cfd0cae Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 17 20:16:54 2025 +0300 aghuser: imp tests commit ea4c8735585f6d30d6dedf2a40a8dd6b07609d07 Merge: c3fd8fe5e3521e8ed9Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 17 20:10:06 2025 +0300 Merge branch 'master' into AGDNS-2743-aghuser-session commit c3fd8fe5eabaf2022a971197c018e140c254006d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 17 15:23:45 2025 +0300 aghuser: imp tests commit dfd9aba337227a8d3edc6f5a68f3f039afd1ca0b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 16 21:40:14 2025 +0300 aghuser: imp code commit b6e75223bf7960f3a2e94c1a3ed7cc33539b9806 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 14 21:49:20 2025 +0300 aghuser: imp code commit 56d6f9d478eec399c376992ffb0f1ca5b797986d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 11 16:58:11 2025 +0300 aghuser: user db commit 6fdc2f60bf7f93e72d917abb12af8e4867143b6d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 10 14:11:22 2025 +0300 all: upd scripts commit 575946756f3f622360c5feafe3e721eee010e230 Merge: 7e1fac4ec1cc6c00e4Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 10 14:05:46 2025 +0300 Merge branch 'master' into AGDNS-2743-aghuser-session commit 7e1fac4ecb1bde0013bca3f6b64e82d81a78c9c3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 10 14:05:35 2025 +0300 aghuser: session storage commit acfb040f0bdff501c7304ea100b9faf1c07291ae Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 8 15:54:24 2025 +0300 aghuser: session
60 lines
1.5 KiB
Go
60 lines
1.5 KiB
Go
package aghuser
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"golang.org/x/crypto/bcrypt"
|
|
)
|
|
|
|
// Login is the type for web user logins.
|
|
type Login string
|
|
|
|
// NewLogin returns a web user login. The length of s must not be greater than
|
|
// [math.MaxUint16].
|
|
//
|
|
// TODO(s.chzhen): Add more constraints as needed.
|
|
func NewLogin(s string) (l Login, err error) {
|
|
if s == "" {
|
|
return "", errors.ErrEmptyValue
|
|
}
|
|
|
|
return Login(s), nil
|
|
}
|
|
|
|
// Password is an interface that defines methods for handling web user
|
|
// passwords.
|
|
type Password interface {
|
|
// Authenticate returns true if the provided password is allowed.
|
|
Authenticate(ctx context.Context, password string) (ok bool)
|
|
|
|
// Hash returns a hashed representation of the web user password.
|
|
Hash() (b []byte)
|
|
}
|
|
|
|
// DefaultPassword is the default bcrypt implementation of the [Password]
|
|
// interface.
|
|
type DefaultPassword struct {
|
|
hash []byte
|
|
}
|
|
|
|
// NewDefaultPassword returns the new properly initialized *DefaultPassword.
|
|
func NewDefaultPassword(hash string) (p *DefaultPassword) {
|
|
return &DefaultPassword{
|
|
hash: []byte(hash),
|
|
}
|
|
}
|
|
|
|
// type check
|
|
var _ Password = (*DefaultPassword)(nil)
|
|
|
|
// Authenticate implements the [Password] interface for *DefaultPassword.
|
|
func (p *DefaultPassword) Authenticate(ctx context.Context, passwd string) (ok bool) {
|
|
return bcrypt.CompareHashAndPassword([]byte(p.hash), []byte(passwd)) == nil
|
|
}
|
|
|
|
// Hash implements the [Password] interface for *DefaultPassword.
|
|
func (p *DefaultPassword) Hash() (b []byte) {
|
|
return p.hash
|
|
}
|