Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 10:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3785 from reasonerjt/auth-refactor

Browse Source 
Small refactory.
This commit is contained in:
Daniel Jiang 2017-12-14 14:51:40 +08:00 committed by GitHub
commit 0abd30f9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ui/auth/authenticator.go
View File

@ -37,13 +37,14 @@ const (
var lock = NewUserLock(frozenTime) var lock = NewUserLock(frozenTime)
// AuthenticateHelper provides interface to authenticate user credentials. // AuthenticateHelper provides interface for user management in different auth modes.
type AuthenticateHelper interface { type AuthenticateHelper interface {
// Authenticate ... // Authenticate ...
Authenticate(m models.AuthModel) (*models.User, error) Authenticate(m models.AuthModel) (*models.User, error)
// OnBoardUser will check if a user exists in user table, if not insert the user and // OnBoardUser will check if a user exists in user table, if not insert the user and
// put the id in the pointer of user model, if it does exist, return the user's profile. // put the id in the pointer of user model, if it does exist, fill in the user model based
// on the data record of the user
OnBoardUser(u *models.User) error OnBoardUser(u *models.User) error
// Get user information from account repository // Get user information from account repository
SearchUser(username string) (*models.User, error) SearchUser(username string) (*models.User, error)
@ -52,12 +53,12 @@ type AuthenticateHelper interface {
var registry = make(map[string]AuthenticateHelper) var registry = make(map[string]AuthenticateHelper)
// Register add different authenticators to registry map. // Register add different authenticators to registry map.
func Register(name string, AuthenticateHelper AuthenticateHelper) { func Register(name string, h AuthenticateHelper) {
if _, dup := registry[name]; dup { if _, dup := registry[name]; dup {
log.Infof("authenticator: %s has been registered", name) log.Infof("authenticator: %s has been registered", name)
return return
} }
registry[name] = AuthenticateHelper registry[name] = h
} }
// Login authenticates user credentials based on setting. // Login authenticates user credentials based on setting.
@ -89,14 +90,14 @@ func Login(m models.AuthModel) (*models.User, error) {
return user, err return user, err
} }
// getAuthenticatorByMode -- func getHelper() (AuthenticateHelper, error) {
func getAuthenticateHelperByMode(authMode string) (AuthenticateHelper, error) { authMode, err := config.AuthMode()
if authMode == "" { if err != nil {
authMode = "db_auth" return nil, err
} }
AuthenticateHelper, ok := registry[authMode] AuthenticateHelper, ok := registry[authMode]
if !ok { if !ok {
return nil, fmt.Errorf("Can not get current authenticator") return nil, fmt.Errorf("Can not get authenticator, authmode: %s", authMode)
} }
return AuthenticateHelper, nil return AuthenticateHelper, nil
} }
@ -104,26 +105,18 @@ func getAuthenticateHelperByMode(authMode string) (AuthenticateHelper, error) {
// OnBoardUser will check if a user exists in user table, if not insert the user and // OnBoardUser will check if a user exists in user table, if not insert the user and
// put the id in the pointer of user model, if it does exist, return the user's profile. // put the id in the pointer of user model, if it does exist, return the user's profile.
func OnBoardUser(user *models.User) error { func OnBoardUser(user *models.User) error {
authMode, err := config.AuthMode() helper, err := getHelper()
if err != nil { if err != nil {
return err return err
} }
auth, err := getAuthenticateHelperByMode(authMode) return helper.OnBoardUser(user)
if err != nil {
return err
}
return auth.OnBoardUser(user)
} }
// SearchUser -- // SearchUser --
func SearchUser(username string) (*models.User, error) { func SearchUser(username string) (*models.User, error) {
authMode, err := config.AuthMode() helper, err := getHelper()
if err != nil { if err != nil {
return nil, err return nil, err
} }
auth, err := getAuthenticateHelperByMode(authMode) return helper.SearchUser(username)
if err != nil {
return nil, err
}
return auth.SearchUser(username)
} }