feat: 新增部署访问策略接口, 修改 http 测试用例；

maslow · Jul 28, 2021 · fbcdb90 · fbcdb90
1 parent 29c89c3
commit fbcdb90
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 215 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,9 @@
   "rest-client.environmentVariables": {
     "$shared": {},
     "test": {
-      "base_url": "http://127.0.0.1:8080"
+      "base_url": "http://127.0.0.1:9000",
+      "sys_admin": "laf-sys",
+      "sys_password": "laf-sys"
     }
   }
 }
diff --git a/packages/devops-server/http/admin.http b/packages/devops-server/http/admin.http
@@ -8,8 +8,8 @@ POST {{base_url}}/admin/login HTTP/1.1
 Content-Type: application/json
 
 {
-  "username": "less",
-  "password": "less123"
+  "username": "{{sys_admin}}",
+  "password": "{{sys_password}}"
 }
 
 ### 管理员信息

diff --git a/packages/devops-server/http/dbm.http b/packages/devops-server/http/dbm.http
@@ -8,8 +8,8 @@ POST {{base_url}}/admin/login HTTP/1.1
 Content-Type: application/json
 
 {
-  "username": "less",
-  "password": "less123"
+  "username": "{{sys_admin}}",
+  "password": "{{sys_password}}"
 }
 
 ### 获取集合列表

diff --git a/packages/devops-server/http/deploy.http b/packages/devops-server/http/deploy.http
@@ -0,0 +1,20 @@
+
+@token={{login.response.body.$.data.access_token}}
+
+### 管理员登陆
+# @name login
+
+POST {{base_url}}/admin/login HTTP/1.1
+Content-Type: application/json
+
+{
+  "username": "{{sys_admin}}",
+  "password": "{{sys_password}}"
+}
+
+
+### 部署访问策略
+
+POST {{base_url}}/deploy/policy
+Content-Type: application/json;charset=UTF-8
+Authorization: Bearer {{token}}
diff --git a/...s/devops-server/src/router/admin/admin.ts → ...evops-server/src/router/admin/handlers.ts b/...s/devops-server/src/router/admin/admin.ts → ...evops-server/src/router/admin/handlers.ts
@@ -22,10 +22,10 @@ export async function handleAdminLogin(req: Request, res: Response) {
     })
   }
 
-  const ret = await db.collection('admins')
+  const ret = await db.collection('__admins')
     .withOne({
       query: db
-        .collection('password')
+        .collection('__password')
         .where({ password: hashPassword(password), type: 'login' }),
       localField: '_id',
       foreignField: 'uid'
@@ -78,7 +78,7 @@ export async function handleAdminInfo(req: Request, res: Response) {
   }
 
   //
-  const ret = await db.collection('admins')
+  const ret = await db.collection('__admins')
     .where({ _id: uid })
     .get()
 
@@ -124,7 +124,7 @@ export async function handleAdminAdd(req: Request, res: Response) {
   }
 
   // 验证用户是否已存在
-  const { total } = await db.collection('admins').where({ username }).count()
+  const { total } = await db.collection('__admins').where({ username }).count()
   if (total > 0) {
     return res.send({
       code: 1,
@@ -133,7 +133,7 @@ export async function handleAdminAdd(req: Request, res: Response) {
   }
 
   // 验证 roles 是否合法
-  const { total: valid_count } = await db.collection('roles')
+  const { total: valid_count } = await db.collection('__roles')
     .where({
       name: db.command.in(roles)
     }).count()
@@ -146,7 +146,7 @@ export async function handleAdminAdd(req: Request, res: Response) {
   }
 
   // add admin
-  const r = await db.collection('admins')
+  const r = await db.collection('__admins')
     .add({
       username,
       name: name ?? null,
@@ -157,7 +157,7 @@ export async function handleAdminAdd(req: Request, res: Response) {
     })
 
   // add admin password
-  await db.collection('password')
+  await db.collection('__password')
     .add({
       uid: r.id,
       password: hashPassword(password),
@@ -199,7 +199,7 @@ export async function handleAdminEdit(req: Request, res: Response) {
   }
 
   // 验证 uid 是否合法
-  const { data: admins } = await db.collection('admins').where({ _id: uid }).get()
+  const { data: admins } = await db.collection('__admins').where({ _id: uid }).get()
   if (!admins || !admins.length) {
     return res.send({
       code: 1,
@@ -208,7 +208,7 @@ export async function handleAdminEdit(req: Request, res: Response) {
   }
 
   // 验证 roles 是否合法
-  const { total: valid_count } = await db.collection('roles')
+  const { total: valid_count } = await db.collection('__roles')
     .where({
       name: db.command.in(roles)
     }).count()
@@ -222,7 +222,7 @@ export async function handleAdminEdit(req: Request, res: Response) {
 
   // update password
   if (password) {
-    await db.collection('password')
+    await db.collection('__password')
       .where({ uid: uid })
       .update({
         password: hashPassword(password),
@@ -239,7 +239,7 @@ export async function handleAdminEdit(req: Request, res: Response) {
 
   // username
   if (username && username != old.username) {
-    const { total } = await db.collection('admins').where({ username }).count()
+    const { total } = await db.collection('__admins').where({ username }).count()
     if (total) {
       return res.send({
         code: 1,
@@ -264,7 +264,7 @@ export async function handleAdminEdit(req: Request, res: Response) {
     data['roles'] = roles
   }
 
-  const r = await db.collection('admins')
+  const r = await db.collection('__admins')
     .where({ _id: uid })
     .update(data)
 

diff --git a/packages/devops-server/src/router/admin/index.ts b/packages/devops-server/src/router/admin/index.ts
@@ -1,6 +1,6 @@
 import { Router } from 'express'
 
-import { handleAdminAdd, handleAdminEdit, handleAdminInfo, handleAdminLogin } from './admin'
+import { handleAdminAdd, handleAdminEdit, handleAdminInfo, handleAdminLogin } from './handlers'
 
 export const AdminRouter = Router()
 

diff --git a/packages/devops-server/src/router/deploy/index.ts b/packages/devops-server/src/router/deploy/index.ts
@@ -0,0 +1,36 @@
+import * as express from 'express'
+import { checkPermission } from '../../api/permission'
+import { deployAccessPolicy } from '../../api/rules'
+import { Globals } from '../../lib/globals'
+
+const logger = Globals.logger
+export const DeployRouter = express.Router()
+
+
+/**
+ * 
+ */
+DeployRouter.post('/policy', async (req, res) => {
+  const requestId = req['requestId']
+  logger.info(requestId, `post /deploy/policy`)
+
+  // 权限验证
+  const code = await checkPermission(req['auth']?.uid, 'deploy.policy')
+  if (code) {
+    return res.status(code).send()
+  }
+
+  try {
+    const r = await deployAccessPolicy()
+
+    return res.send({
+      code: 0,
+      data: r
+    })
+  } catch (error) {
+    return res.send({
+      code: 1,
+      error: error
+    })
+  }
+})
diff --git a/packages/devops-server/src/router/entry/admin.ts b/packages/devops-server/src/router/entry/admin.ts
diff --git a/packages/devops-server/src/router/entry/dbm.ts b/packages/devops-server/src/router/entry/dbm.ts