make goimports and add annotations

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>
kubesphere · Feb 24, 2023 · d026477 · d026477
1 parent 3e198ae
commit d026477
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/pkg/apiserver/authentication/authenticators/basic/basic.go b/pkg/apiserver/authentication/authenticators/basic/basic.go
@@ -49,7 +49,7 @@ func NewBasicAuthenticator(authenticator auth.PasswordAuthenticator, loginRecord
 }
 
 func (t *basicAuthenticator) AuthenticatePassword(ctx context.Context, username, password string) (*authenticator.Response, bool, error) {
-	authenticated, provider, err := t.authenticator.Authenticate(ctx, username, password)
+	authenticated, provider, err := t.authenticator.Authenticate(ctx, "", username, password)
 	if err != nil {
 		if t.loginRecorder != nil && err == auth.IncorrectPasswordError {
 			var sourceIP, userAgent string

diff --git a/pkg/kapis/oauth/handler.go b/pkg/kapis/oauth/handler.go
@@ -52,7 +52,6 @@ import (
 )
 
 const (
-	ldapProvider          = "LDAPIdentityProvider"
 	KindTokenReview       = "TokenReview"
 	grantTypePassword     = "password"
 	grantTypeRefreshToken = "refresh_token"

diff --git a/pkg/models/auth/authenticator.go b/pkg/models/auth/authenticator.go
@@ -46,7 +46,8 @@ var (
 )
 
 // PasswordAuthenticator is an interface implemented by authenticator which take a
-// username and password.
+// username and password. provider refers to the identity provider`s name,
+// if the provider is empty, authenticate from kubesphere account
 type PasswordAuthenticator interface {
 	Authenticate(ctx context.Context, provider, username, password string) (authuser.Info, string, error)
 }

diff --git a/pkg/models/auth/password.go b/pkg/models/auth/password.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/klog/v2"
 
 	iamv1alpha2 "kubesphere.io/api/iam/v1alpha2"
+
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication"
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider"
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"
@@ -63,6 +64,7 @@ func (p *passwordAuthenticator) Authenticate(_ context.Context, provider, userna
 	return p.accountAuthenticate(username, password)
 }
 
+// accountAuthenticate authenticate the kubesphere account
 func (p *passwordAuthenticator) accountAuthenticate(username, password string) (authuser.Info, string, error) {
 	user, err := p.userGetter.findUser(username)
 	if err != nil {