migrate legacy API

Signed-off-by: hongming <talonwan@yunify.com>
2020-04-20 07:01:43 +08:00
parent 3f89eaef7e
commit 7db2ba662c
103 changed files with 5962 additions and 2363 deletions
--- a/pkg/models/iam/im/im.go
+++ b/pkg/models/iam/im/im.go
@@ -19,11 +19,20 @@ package im

 import (
 	"github.com/pkg/errors"
+	"golang.org/x/crypto/bcrypt"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/klog"
+	"kubesphere.io/kubesphere/pkg/api"
 	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
+	"kubesphere.io/kubesphere/pkg/apiserver/query"
+	kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
+	"kubesphere.io/kubesphere/pkg/informers"
+	resourcev1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource"
 )

 type IdentityManagementInterface interface {
 	CreateUser(user *iamv1alpha2.User) (*iamv1alpha2.User, error)
+	ListUsers(query *query.Query) (*api.ListResult, error)
 	DeleteUser(username string) error
 	ModifyUser(user *iamv1alpha2.User) (*iamv1alpha2.User, error)
 	DescribeUser(username string) (*iamv1alpha2.User, error)
@@ -36,3 +45,75 @@ var (
 	UserAlreadyExists           = errors.New("user already exists")
 	UserNotExists               = errors.New("user not exists")
 )
+
+func NewOperator(ksClient kubesphereclient.Interface, factory informers.InformerFactory) IdentityManagementInterface {
+
+	return &defaultIMOperator{
+		ksClient:       ksClient,
+		resourceGetter: resourcev1alpha3.NewResourceGetter(factory),
+	}
+
+}
+
+type defaultIMOperator struct {
+	ksClient       kubesphereclient.Interface
+	resourceGetter *resourcev1alpha3.ResourceGetter
+}
+
+func (im *defaultIMOperator) ModifyUser(user *iamv1alpha2.User) (*iamv1alpha2.User, error) {
+	return im.ksClient.IamV1alpha2().Users().Update(user)
+}
+
+func (im *defaultIMOperator) Authenticate(username, password string) (*iamv1alpha2.User, error) {
+
+	user, err := im.DescribeUser(username)
+
+	if err != nil {
+		klog.Error(err)
+		return nil, err
+	}
+	if checkPasswordHash(password, user.Spec.EncryptedPassword) {
+		return user, nil
+	}
+	return nil, AuthFailedIncorrectPassword
+}
+
+func (im *defaultIMOperator) ListUsers(query *query.Query) (*api.ListResult, error) {
+
+	result, err := im.resourceGetter.List(iamv1alpha2.ResourcesPluralUser, "", query)
+
+	if err != nil {
+		klog.Error(err)
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func checkPasswordHash(password, hash string) bool {
+	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
+	return err == nil
+}
+
+func (im *defaultIMOperator) DescribeUser(username string) (*iamv1alpha2.User, error) {
+	user, err := im.resourceGetter.Get(iamv1alpha2.ResourcesPluralUser, "", username)
+
+	if err != nil {
+		klog.Error(err)
+		return nil, err
+	}
+	return user.(*iamv1alpha2.User), nil
+}
+
+func (im *defaultIMOperator) DeleteUser(username string) error {
+	return im.ksClient.IamV1alpha2().Users().Delete(username, metav1.NewDeleteOptions(0))
+}
+
+func (im *defaultIMOperator) CreateUser(user *iamv1alpha2.User) (*iamv1alpha2.User, error) {
+	user, err := im.ksClient.IamV1alpha2().Users().Create(user)
+	if err != nil {
+		klog.Error(err)
+		return nil, err
+	}
+	return user, nil
+}
--- a/pkg/models/iam/im/im_operator.go
+++ b/pkg/models/iam/im/im_operator.go
@@ -1,85 +0,0 @@
-/*
- *
- * Copyright 2020 The KubeSphere Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * /
- */
-
-package im
-
-import (
-	"golang.org/x/crypto/bcrypt"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
-	kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
-	informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions"
-)
-
-func NewOperator(ksClient kubesphereclient.Interface, informer informers.SharedInformerFactory) IdentityManagementInterface {
-
-	return &defaultIMOperator{
-		ksClient: ksClient,
-		informer: informer,
-	}
-
-}
-
-type defaultIMOperator struct {
-	ksClient kubesphereclient.Interface
-	informer informers.SharedInformerFactory
-}
-
-func (im *defaultIMOperator) ModifyUser(user *iamv1alpha2.User) (*iamv1alpha2.User, error) {
-	return im.ksClient.IamV1alpha2().Users().Update(user)
-}
-
-func (im *defaultIMOperator) Authenticate(username, password string) (*iamv1alpha2.User, error) {
-
-	user, err := im.ksClient.IamV1alpha2().Users().Get(username, metav1.GetOptions{})
-
-	if err != nil {
-		return nil, err
-	}
-	if checkPasswordHash(password, user.Spec.EncryptedPassword) {
-		return user, nil
-	}
-	return nil, AuthFailedIncorrectPassword
-}
-
-func checkPasswordHash(password, hash string) bool {
-	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
-	return err == nil
-}
-
-func (im *defaultIMOperator) DescribeUser(username string) (*iamv1alpha2.User, error) {
-	user, err := im.ksClient.IamV1alpha2().Users().Get(username, metav1.GetOptions{})
-
-	if err != nil {
-		return nil, err
-	}
-	return user, nil
-}
-
-func (im *defaultIMOperator) DeleteUser(username string) error {
-	return im.ksClient.IamV1alpha2().Users().Delete(username, metav1.NewDeleteOptions(0))
-}
-
-func (im *defaultIMOperator) CreateUser(user *iamv1alpha2.User) (*iamv1alpha2.User, error) {
-	user, err := im.ksClient.IamV1alpha2().Users().Create(user)
-	if err != nil {
-		return nil, err
-	}
-
-	return user, nil
-}
--- a/pkg/models/iam/im/ldap_operator.go
+++ b/pkg/models/iam/im/ldap_operator.go
@@ -19,7 +19,9 @@
 package im

 import (
+	"kubesphere.io/kubesphere/pkg/api"
 	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
+	"kubesphere.io/kubesphere/pkg/apiserver/query"
 	"kubesphere.io/kubesphere/pkg/simple/client/ldap"
 )

@@ -31,7 +33,6 @@ func NewLDAPOperator(ldapClient ldap.Interface) IdentityManagementInterface {
 	return &ldapOperator{
 		ldapClient: ldapClient,
 	}
-
 }

 func (im *ldapOperator) ModifyUser(user *iamv1alpha2.User) (*iamv1alpha2.User, error) {
@@ -78,3 +79,7 @@ func (im *ldapOperator) CreateUser(user *iamv1alpha2.User) (*iamv1alpha2.User, e

 	return user, nil
 }
+
+func (im *ldapOperator) ListUsers(query *query.Query) (*api.ListResult, error) {
+	panic("not implement")
+}