extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-07 08:44:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

added disabled flag to account

Browse Source
This commit is contained in:
Cam 2024-02-19 10:37:09 -06:00
parent 778e50c056
commit d3429e2a6a
No known key found for this signature in database
GPG Key ID: 367B7C7EBD84A8BD
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/resetPassword.go
View File

@ -47,6 +47,10 @@ func (handler *resetPasswordHandler) Handle(params account.ResetPasswordParams)
logrus.Errorf("account '%v' for '%v' deleted", a.Email, a.Token)
return account.NewResetPasswordNotFound()
}
if a.Disabled {
logrus.Errorf("account '%v' for '%v' disabled", a.Email, a.Token)
return account.NewResetPasswordNotFound()
}
if err := validatePassword(handler.cfg, params.Body.Password); err != nil {
logrus.Errorf("password not valid for request '%v', (%v): %v", params.Body.Token, a.Email, err)

4
controller/resetToken.go
View File

@ -37,6 +37,10 @@ func (handler *resetTokenHandler) Handle(params account.ResetTokenParams, princi
logrus.Errorf("account '%v' for '%v' deleted", a.Email, a.Token)
return account.NewResetTokenNotFound()
}
if a.Disabled {
logrus.Errorf("account '%v' for '%v' disabled", a.Email, a.Token)
return account.NewResetTokenNotFound()
}
// Need to create new token and invalidate all other resources
token, err := CreateToken()

5
controller/store/account.go
View File

@ -13,6 +13,7 @@ type Account struct {
Token string
Limitless bool
Deleted bool
Disabled bool
}
func (str *Store) CreateAccount(a *Account, tx *sqlx.Tx) (int, error) {
@ -37,7 +38,7 @@ func (str *Store) GetAccount(id int, tx *sqlx.Tx) (*Account, error) {
func (str *Store) FindAccountWithEmail(email string, tx *sqlx.Tx) (*Account, error) {
a := &Account{}
if err := tx.QueryRowx("select * from accounts where email = lower($1) and not deleted", email).StructScan(a); err != nil {
if err := tx.QueryRowx("select * from accounts where email = lower($1) and not deleted and not disabled", email).StructScan(a); err != nil {
return nil, errors.Wrap(err, "error selecting account by email")
}
return a, nil
@ -53,7 +54,7 @@ func (str *Store) FindAccountWithEmailAndDeleted(email string, tx *sqlx.Tx) (*Ac
func (str *Store) FindAccountWithToken(token string, tx *sqlx.Tx) (*Account, error) {
a := &Account{}
if err := tx.QueryRowx("select * from accounts where token = $1 and not deleted", token).StructScan(a); err != nil {
if err := tx.QueryRowx("select * from accounts where token = $1 and not deleted and not disabled", token).StructScan(a); err != nil {
return nil, errors.Wrap(err, "error selecting account by token")
}
return a, nil

3
controller/store/sql/postgresql/019_v0_4_24_account_disable.sql Normal file
View File

@ -0,0 +1,3 @@
-- +migrate Up
ALTER TABLE accounts ADD COLUMN disabled BOOLEAN NOT NULL DEFAULT(false);

3
controller/store/sql/sqlite3/019_v0_4_23_account_disable.sql Normal file
View File

@ -0,0 +1,3 @@
-- +migrate Up
ALTER TABLE accounts ADD COLUMN disabled BOOLEAN NOT NULL DEFAULT(false);