mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-07 06:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add auth_perdomain and auth_domains directives

Browse source
This commit is contained in:
fox.cpp 2019-05-23 21:17:07 +03:00 • committed by Simon Ser
parent 76e3970a96
commit ed9780a4d6
4 changed files with 95 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sql.go
View file

@ -27,7 +27,9 @@ type SQLStorage struct {
instName string
Log log.Logger
perDomain bool
storagePerDomain bool
authPerDomain bool
authDomains []string
}
type Literal struct {
@ -64,7 +66,9 @@ func (sqlm *SQLStorage) Init(cfg *config.Map) error {
cfg.String("dsn", false, true, "", &dsn)
cfg.Int64("appendlimit", false, false, 32*1024*1024, &appendlimitVal)
cfg.Bool("debug", true, &sqlm.Log.Debug)
cfg.Bool("storage_perdomain", true, &sqlm.perDomain)
cfg.Bool("storage_perdomain", true, &sqlm.storagePerDomain)
cfg.Bool("auth_perdomain", true, &sqlm.authPerDomain)
cfg.StringList("auth_domains", true, false, nil, &sqlm.authDomains)
cfg.Int("sqlite3_cache_size", false, false, 0, &opts.CacheSize)
cfg.Int("sqlite3_busy_timeout", false, false, 0, &opts.BusyTimeout)
cfg.Bool("sqlite3_exclusive_lock", false, &opts.ExclusiveLock)
@ -89,6 +93,10 @@ func (sqlm *SQLStorage) Init(cfg *config.Map) error {
return err
}
if sqlm.authPerDomain && sqlm.authDomains == nil {
return errors.New("sql: auth_domains must be set if auth_perdomain is used")
}
if fsstoreLocation != "" {
if !filepath.IsAbs(fsstoreLocation) {
fsstoreLocation = filepath.Join(StateDirectory(cfg.Globals), fsstoreLocation)
@ -130,12 +138,17 @@ func (sqlm *SQLStorage) EnableChildrenExt() bool {
}
func (sqlm *SQLStorage) CheckPlain(username, password string) bool {
return sqlm.back.CheckPlain(username, password)
accountName, ok := checkDomainAuth(username, sqlm.authPerDomain, sqlm.authDomains)
if !ok {
return false
}
return sqlm.back.CheckPlain(accountName, password)
}
func (sqlm *SQLStorage) GetOrCreateUser(username string) (backend.User, error) {
var accountName string
if sqlm.perDomain {
if sqlm.storagePerDomain {
if !strings.Contains(username, "@") {
return nil, errors.New("GetOrCreateUser: username@domain required")
}