Skip to content

Optimize user permissions #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5 commits merged into from
Aug 25, 2021
Merged

Optimize user permissions #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f486e27
add api white list , user/role operations are controlled by admin
LordofAvernus Aug 19, 2021
3dbbf98
modify the data format of operation authority and createOrUpdate inte…
LordofAvernus Aug 19, 2021
cdfffc1
split api
LordofAvernus Aug 23, 2021
8f8cd68
modify login/reset_pwd err message
LordofAvernus Aug 23, 2021
ac86858
fix create/update job fail
LordofAvernus Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
747 changes: 642 additions & 105 deletions drivers/api/docs/docs.go
View file
Open in desktop

Large diffs are not rendered by default.

747 changes: 642 additions & 105 deletions drivers/api/docs/swagger.json
View file
Open in desktop

Large diffs are not rendered by default.

443 changes: 388 additions & 55 deletions drivers/api/docs/swagger.yaml
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions drivers/api/handler/v2/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@ func (b *BlackList) blackListExist(key string) (int, bool) {
}

// validate current user in blacklist and update blacklist
func ValidatePassword(user, operation, currentPwd, verifiedPwd string) error {
if leftMinute, exist := BL.blackListExist(fmt.Sprintf("%s:%s", user, operation)); exist {
return fmt.Errorf("the password cannot be changed temporarily, please try again after %v minute", leftMinute)
}
func ValidatePassword(blackListKey, currentPwd, verifiedPwd string) error {
realCurrentPwd, err := handler.DecryptPasswordSupportNoRsaKey(currentPwd, g.RsaPrivateKey)
if err != nil {
return fmt.Errorf("decrypt current password err")
Expand All @@ -73,7 +70,7 @@ func ValidatePassword(user, operation, currentPwd, verifiedPwd string) error {
return fmt.Errorf("decrypt verified password err")
}
if realCurrentPwd != realVerifiedPwd {
BL.setBlackList(fmt.Sprintf("%s:%s", user, operation), time.Minute*30)
BL.setBlackList(blackListKey, time.Minute*30)
return fmt.Errorf("user or password is wrong")
}
return nil
Expand Down
Loading