improve identity provider plugin

Signed-off-by: hongming <[email protected]>
hongzhouzi · Dec 10, 2020 · dfaefa5 · dfaefa5
1 parent 91c2e05
commit dfaefa5
Show file tree

Hide file tree

Showing 63 changed files with 3,647 additions and 1,737 deletions.
diff --git a/api/ks-openapi-spec/swagger.json b/api/ks-openapi-spec/swagger.json
@@ -3775,7 +3775,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/auth.LoginRequest"
+              "$ref": "#/definitions/oauth.LoginRequest"
             }
           }
         ],
@@ -4524,7 +4524,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/iam.PasswordReset"
+              "$ref": "#/definitions/v1alpha2.PasswordReset"
             }
           },
           {
@@ -12627,15 +12627,15 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/auth.TokenReview"
+              "$ref": "#/definitions/oauth.TokenReview"
             }
           }
         ],
         "responses": {
           "200": {
             "description": "ok",
             "schema": {
-              "$ref": "#/definitions/auth.TokenReview"
+              "$ref": "#/definitions/oauth.TokenReview"
             }
           }
         }
@@ -13296,71 +13296,6 @@
         }
       }
     },
-    "auth.LoginRequest": {
-      "required": [
-        "username",
-        "password"
-      ],
-      "properties": {
-        "password": {
-          "description": "password",
-          "type": "string"
-        },
-        "username": {
-          "description": "username",
-          "type": "string"
-        }
-      }
-    },
-    "auth.Spec": {
-      "required": [
-        "token"
-      ],
-      "properties": {
-        "token": {
-          "description": "access token",
-          "type": "string"
-        }
-      }
-    },
-    "auth.Status": {
-      "required": [
-        "authenticated"
-      ],
-      "properties": {
-        "authenticated": {
-          "description": "is authenticated",
-          "type": "boolean"
-        },
-        "user": {
-          "description": "user info",
-          "type": "object"
-        }
-      }
-    },
-    "auth.TokenReview": {
-      "required": [
-        "apiVersion",
-        "kind"
-      ],
-      "properties": {
-        "apiVersion": {
-          "description": "Kubernetes API version",
-          "type": "string"
-        },
-        "kind": {
-          "description": "kind of the API object",
-          "type": "string"
-        },
-        "spec": {
-          "$ref": "#/definitions/auth.Spec"
-        },
-        "status": {
-          "description": "token review status",
-          "$ref": "#/definitions/auth.Status"
-        }
-      }
-    },
     "big.Int": {
       "required": [
         "neg",
@@ -15275,20 +15210,6 @@
         }
       }
     },
-    "iam.PasswordReset": {
-      "required": [
-        "currentPassword",
-        "password"
-      ],
-      "properties": {
-        "currentPassword": {
-          "type": "string"
-        },
-        "password": {
-          "type": "string"
-        }
-      }
-    },
     "inf.Dec": {
       "required": [
         "unscaled",
@@ -15674,6 +15595,48 @@
         }
       }
     },
+    "oauth.LoginRequest": {
+      "required": [
+        "username",
+        "password"
+      ],
+      "properties": {
+        "password": {
+          "description": "password",
+          "type": "string"
+        },
+        "username": {
+          "description": "username",
+          "type": "string"
+        }
+      }
+    },
+    "oauth.Spec": {
+      "required": [
+        "token"
+      ],
+      "properties": {
+        "token": {
+          "description": "access token",
+          "type": "string"
+        }
+      }
+    },
+    "oauth.Status": {
+      "required": [
+        "authenticated"
+      ],
+      "properties": {
+        "authenticated": {
+          "description": "is authenticated",
+          "type": "boolean"
+        },
+        "user": {
+          "description": "user info",
+          "type": "object"
+        }
+      }
+    },
     "oauth.Token": {
       "required": [
         "access_token"
@@ -15694,6 +15657,29 @@
         }
       }
     },
+    "oauth.TokenReview": {
+      "required": [
+        "apiVersion",
+        "kind"
+      ],
+      "properties": {
+        "apiVersion": {
+          "description": "Kubernetes API version",
+          "type": "string"
+        },
+        "kind": {
+          "description": "kind of the API object",
+          "type": "string"
+        },
+        "spec": {
+          "$ref": "#/definitions/oauth.Spec"
+        },
+        "status": {
+          "description": "token review status",
+          "$ref": "#/definitions/oauth.Status"
+        }
+      }
+    },
     "openpitrix.App": {
       "required": [
         "category_set"
@@ -21672,6 +21658,20 @@
         }
       }
     },
+    "v1alpha2.PasswordReset": {
+      "required": [
+        "currentPassword",
+        "password"
+      ],
+      "properties": {
+        "currentPassword": {
+          "type": "string"
+        },
+        "password": {
+          "type": "string"
+        }
+      }
+    },
     "v1alpha2.Row": {
       "required": [
         "id",

diff --git a/cmd/controller-manager/app/controllers.go b/cmd/controller-manager/app/controllers.go
@@ -34,6 +34,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/controller/group"
 	"kubesphere.io/kubesphere/pkg/controller/groupbinding"
 	"kubesphere.io/kubesphere/pkg/controller/job"
+	"kubesphere.io/kubesphere/pkg/controller/loginrecord"
 	"kubesphere.io/kubesphere/pkg/controller/network/ippool"
 	"kubesphere.io/kubesphere/pkg/controller/network/nsnetworkpolicy"
 	"kubesphere.io/kubesphere/pkg/controller/network/nsnetworkpolicy/provider"
@@ -208,19 +209,19 @@ func addControllers(
 		go fedWorkspaceRoleBindingCacheController.Run(stopCh)
 	}
 
-	userController := user.NewUserController(client.Kubernetes(), client.KubeSphere(),
-		client.Config(),
+	userController := user.NewUserController(client.Kubernetes(), client.KubeSphere(), client.Config(),
 		kubesphereInformer.Iam().V1alpha2().Users(),
-		fedUserCache, fedUserCacheController,
 		kubesphereInformer.Iam().V1alpha2().LoginRecords(),
+		fedUserCache, fedUserCacheController,
 		kubernetesInformer.Core().V1().ConfigMaps(),
 		ldapClient, devopsClient,
 		authenticationOptions, multiClusterEnabled)
 
-	loginRecordController := user.NewLoginRecordController(
+	loginRecordController := loginrecord.NewLoginRecordController(
 		client.Kubernetes(),
 		client.KubeSphere(),
 		kubesphereInformer.Iam().V1alpha2().LoginRecords(),
+		kubesphereInformer.Iam().V1alpha2().Users(),
 		authenticationOptions.LoginHistoryRetentionPeriod)
 
 	csrController := certificatesigningrequest.NewController(client.Kubernetes(),

diff --git a/config/crds/iam.kubesphere.io_groupbindings.yaml b/config/crds/iam.kubesphere.io_groupbindings.yaml
diff --git a/config/crds/iam.kubesphere.io_users.yaml b/config/crds/iam.kubesphere.io_users.yaml