mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 22:17:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fully separate authentication from IMAP access

Browse source 
Now imapsql module does not handle authentication. (it was not doing it so well
anyway)

sql_table module was introduced and used in the default configuration as
a replacement for functionality that was implemented by imapsql before.

Parts of maddyctl code were rewritten to make it work transparently with
any IMAP backend or credentials store.

Closes #212.
This commit is contained in:
fox.cpp 2020-04-13 23:01:17 +03:00
parent 609a8fd235
commit e19d21dfcb
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
29 changed files with 867 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

49
internal/storage/imapsql/maddyctl.go
View file

@ -1,47 +1,26 @@
package imapsql
import (
"errors"
"github.com/emersion/go-imap/backend"
"golang.org/x/text/secure/precis"
)
// These methods wrap corresponding go-imap-sql methods, but also apply
// maddy-specific credentials rules.
func (store *Storage) ListUsers() ([]string, error) {
func (store *Storage) ListIMAPAccts() ([]string, error) {
return store.Back.ListUsers()
}
func (store *Storage) CreateUser(username, password string) error {
func (store *Storage) CreateIMAPAcct(username string) error {
accountName, err := prepareUsername(username)
if err != nil {
return err
}
password, err = precis.OpaqueString.CompareKey(password)
if err != nil {
return err
}
if len(password) == 0 {
return errors.New("sql: empty passwords are not allowed")
}
return store.Back.CreateUser(accountName, password)
return store.Back.CreateUser(accountName)
}
func (store *Storage) CreateUserNoPass(username string) error {
accountName, err := prepareUsername(username)
if err != nil {
return err
}
return store.Back.CreateUserNoPass(accountName)
}
func (store *Storage) DeleteUser(username string) error {
func (store *Storage) DeleteIMAPAcct(username string) error {
accountName, err := prepareUsername(username)
if err != nil {
return err
@ -50,25 +29,7 @@ func (store *Storage) DeleteUser(username string) error {
return store.Back.DeleteUser(accountName)
}
func (store *Storage) SetUserPassword(username, newPassword string) error {
accountName, err := prepareUsername(username)
if err != nil {
return err
}
newPassword, err = precis.OpaqueString.CompareKey(newPassword)
if err != nil {
return err
}
if len(newPassword) == 0 {
return errors.New("sql: empty passwords are not allowed")
}
return store.Back.SetUserPassword(accountName, newPassword)
}
func (store *Storage) GetUser(username string) (backend.User, error) {
func (store *Storage) GetIMAPAcct(username string) (backend.User, error) {
accountName, err := prepareUsername(username)
if err != nil {
return nil, err