github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: 权限控制

pull/21/merge
xiaojunnuo 2023-06-27 09:29:43 +08:00
parent fdc25dc0d7
commit 27a4c81c6d
37 changed files with 325 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/ui/certd-client/src/api/modules/api.user.ts
View File

@ -1,5 +1,11 @@
import { request, requestForMock } from "../service";
import { env } from "/@/utils/util.env";
export interface RegisterReq {
username: string;
password: string;
confirmPassword: string;
}
/**
* @description: Login interface parameters
*/
@ -19,6 +25,14 @@ export interface LoginRes {
expire: number;
}
export async function register(user: RegisterReq): Promise<UserInfoRes> {
return await request({
url: "/register",
method: "post",
data: user
});
}
export async function login(data: LoginReq): Promise<LoginRes> {
if (env.PM_ENABLED === "false") {
//没有开启权限模块，模拟登录

2
packages/ui/certd-client/src/api/service.ts
View File

@ -31,7 +31,7 @@ function createService() {
const { code } = dataAxios;
// 根据 code 进行判断
if (code === undefined) {
// 如果没有 code 代表这不是项目后端开发的接口 比如可能是 D2Admin 请求最新版本
// 如果没有 code 代表这不是项目后端开发的接口
errorCreate(`非标准返回：${dataAxios}， ${response.config.url}`);
return dataAxios;
} else {

4
packages/ui/certd-client/src/api/tools.ts
View File

@ -63,5 +63,7 @@ export function errorLog(error: any) {
* @param {String} msg 错误信息
*/
export function errorCreate(msg: string) {
throw new Error(msg);
const err = new Error(msg);
uiContext.get().notification.error({ message: err.message });
throw err;
}

2
packages/ui/certd-client/src/router/source/framework.ts
View File

@ -12,7 +12,7 @@ export const frameworkResource = [
component: LayoutFramework,
meta: {
icon: "ion:accessibility",
auth: true
authOnly: true
},
children: [
{

6
packages/ui/certd-client/src/router/source/modules/certd.ts
View File

@ -6,7 +6,7 @@ export const certdResources = [
redirect: "/certd/pipeline",
meta: {
icon: "ion:key-outline",
auth: true
authOnly: true
},
children: [
{
@ -43,7 +43,7 @@ export const certdResources = [
redirect: "/certd/settings/email",
meta: {
icon: "ion:settings-outline",
auth: true
authOnly: true
},
children: [
{
@ -53,7 +53,7 @@ export const certdResources = [
component: "/certd/settings/email-setting.vue",
meta: {
icon: "ion:mail-outline",
auth: true
authOnly: true
}
}
]

8
packages/ui/certd-client/src/router/source/outside.ts
View File

@ -15,6 +15,14 @@ export const outsideResource = [
name: "login",
path: "/login",
component: "/framework/login/index.vue"
},
{
meta: {
title: "注册"
},
name: "register",
path: "/register",
component: "/framework/register/index.vue"
}
]
},

2
packages/ui/certd-client/src/store/modules/page.ts
View File

@ -35,7 +35,7 @@ export const usePageStore = defineStore({
fullPath: "/index",
meta: {
title: "首页",
auth: false
authOnly: false
}
}
],

11
packages/ui/certd-client/src/store/modules/user.ts
View File

@ -7,10 +7,11 @@ import { LocalStorage } from "/src/utils/util.storage";
import * as UserApi from "/src/api/modules/api.user";
// @ts-ignore
import { LoginReq, UserInfoRes } from "/@/api/modules/api.user";
import { Modal } from "ant-design-vue";
import { Modal, notification } from "ant-design-vue";
import { useI18n } from "vue-i18n";
import { mitter } from "/src/utils/util.mitt";
import { RegisterReq } from "/src/api/modules/api.user";
interface UserState {
userInfo: Nullable<UserInfoRes>;
@ -50,6 +51,14 @@ export const useUserStore = defineStore({
LocalStorage.remove(TOKEN_KEY);
LocalStorage.remove(USER_INFO_KEY);
},
async register(user: RegisterReq) {
await UserApi.register(user);
notification.success({
message: "注册成功，请登录"
});
await router.replace("/login");
},
/**
* @description: login
*/

2
packages/ui/certd-client/src/views/framework/login/index.vue
View File

@ -66,7 +66,7 @@
</a-form-item>
<a-form-item class="user-login-other">
<!-- <router-link class="register" :to="{ name: 'index' }"> 注册 </router-link>-->
<router-link class="register" :to="{ name: 'register' }"> 注册 </router-link>
</a-form-item>
</a-form>
</div>

28
packages/ui/certd-client/src/views/framework/register/index.vue
View File

@ -1,15 +1,8 @@
<template>
<div class="main">
<a-form
ref="formRef"
class="user-layout-login"
name="custom-validation"
:model="formState"
:rules="rules"
v-bind="layout"
@finish="handleFinish"
@finishFailed="handleFinishFailed"
>
<a-form ref="formRef" class="user-layout-register" name="custom-validation" :model="formState" :rules="rules" v-bind="layout" @finish="handleFinish" @finishFailed="handleFinishFailed">
<div class="login-title">用户注册</div>
<a-form-item required has-feedback name="username">
<a-input v-model:value="formState.username" size="large" autocomplete="off">
<template #prefix>
@ -46,13 +39,14 @@
import { defineComponent, reactive, ref, toRaw } from "vue";
import { useUserStore } from "/src/store/modules/user";
export default defineComponent({
name: "Register",
name: "RegisterPage",
setup() {
const userStore = useUserStore();
const formRef = ref();
const formState = reactive({
username: "",
password: ""
password: "",
confirmPassword: ""
});
const rules = {
@ -88,8 +82,7 @@ export default defineComponent({
};
const handleFinish = async (values) => {
console.log(values, formState);
const userInfo = await userStore.login(
await userStore.register(
toRaw({
password: formState.password,
username: formState.username
@ -120,16 +113,17 @@ export default defineComponent({
<style lang="less">
@import "../../../style/theme/index.less";
.user-layout-login {
.user-layout-register {
label {
font-size: 14px;
}
.login-title {
color: @primary-color;
// color: @primary-color;
font-size: 18px;
text-align: center;
margin: 20px;
margin: 30px;
margin-top: 50px;
}
.getCaptcha {
display: block;

1
packages/ui/certd-server/db/migration/v10003__role_user.sql Normal file
View File

@ -0,0 +1 @@
INSERT INTO sys_role (id, name, create_time, update_time) VALUES (3, '普通用户', 1, 1623749138537);

1
packages/ui/certd-server/package.json
View File

@ -52,6 +52,7 @@
"kubernetes-client": "^9.0.0",
"lodash": "^4.17.21",
"log4js": "^6.7.1",
"lru-cache": "^10.0.0",
"md5": "^2.3.0",
"midway-flyway-js": "^3.0.0",
"node-cron": "^3.0.2",

26
packages/ui/certd-server/src/basic/base-service.ts
View File

@ -1,19 +1,25 @@
import { Inject } from '@midwayjs/decorator';
import { ValidateException } from './exception/validation-exception';
import * as _ from 'lodash';
import { Context } from '@midwayjs/koa';
import { PermissionException } from './exception/permission-exception';
import { Repository } from 'typeorm';
import { Inject } from '@midwayjs/decorator';
import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
import { EntityManager } from 'typeorm/entity-manager/EntityManager';
/**
* 服务基类
*/
export abstract class BaseService<T> {
@Inject()
ctx: Context;
dataSourceManager: TypeORMDataSourceManager;
abstract getRepository(): Repository<T>;
async transaction(callback: (entityManager: EntityManager) => Promise<any>) {
const dataSource = this.dataSourceManager.getDataSource('default');
await dataSource.transaction(callback);
}
/**
* 获得单个ID
* @param id ID
@ -34,7 +40,7 @@ export abstract class BaseService<T> {
/**
* 非分页查询
* @param option 查询配置
* @param options
*/
async find(options) {
return await this.getRepository().find(options);
@ -187,23 +193,19 @@ export abstract class BaseService<T> {
return await qb.getMany();
}
async checkUserId(
id: any = 0,
userId,
userKey = 'userId',
queryIdKey = 'id'
) {
async checkUserId(id: any = 0, userId, userKey = 'userId') {
// @ts-ignore
const res = await this.getRepository().findOne({
// @ts-ignore
select: { [userKey]: true },
// @ts-ignore
where: {
[queryIdKey]: id,
// @ts-ignore
id,
},
});
// @ts-ignore
if (!res || res.userId === userId) {
if (!res || res[userKey] === userId) {
return;
}
throw new PermissionException('权限不足');

21
packages/ui/certd-server/src/basic/constants.ts
View File

@ -1,8 +1,27 @@
export const Constants = {
role: {
defaultUser: 3,
},
per: {
//无需登录
guest: '_guest_',
//无需登录
anonymous: '_guest_',
//仅需要登录
authOnly: '_authOnly_',
//仅需要登录
loginOnly: '_authOnly_',
},
res: {
serverError(message: string) {
return {
code: 1,
message,
};
},
error: {
code: 1,
message: 'error',
message: 'Internal server error',
},
success: {
code: 0,

2
packages/ui/certd-server/src/config/config.default.ts
View File

@ -71,7 +71,7 @@ const development = {
secret: 'certd666',
expire: 7 * 24 * 60, //单位秒
},
auth: {
authOnly: {
ignoreUrls: ['/', '/public', '/api/login', '/api/register'],
},
},

55
packages/ui/certd-server/src/middleware/authority.ts
View File

@ -1,8 +1,10 @@
import { Config, Provide } from '@midwayjs/decorator';
import { IWebMiddleware, IMidwayKoaContext, NextFunction } from '@midwayjs/koa';
import * as _ from 'lodash';
import { Config, Inject, Provide } from '@midwayjs/decorator';
import { IMidwayKoaContext, IWebMiddleware, NextFunction } from '@midwayjs/koa';
import * as jwt from 'jsonwebtoken';
import { Constants } from '../basic/constants';
import { MidwayWebRouterService } from '@midwayjs/core';
import { RoleService } from '../modules/authority/service/role-service';
import { logger } from '../utils/logger';
/**
* 权限校验
@ -11,27 +13,34 @@ import { Constants } from '../basic/constants';
export class AuthorityMiddleware implements IWebMiddleware {
@Config('biz.jwt.secret')
private secret: string;
@Config('biz.auth.ignoreUrls')
private ignoreUrls: string[];
@Inject()
webRouterService: MidwayWebRouterService;
@Inject()
roleService: RoleService;
resolve() {
return async (ctx: IMidwayKoaContext, next: NextFunction) => {
const { url } = ctx;
let token = ctx.get('Authorization') || '';
token = token.replace('Bearer ', '').trim();
// 路由地址为 admin前缀的 需要权限校验
// console.log('ctx', ctx);
const queryIndex = url.indexOf('?');
let uri = url;
if (queryIndex >= 0) {
uri = url.substring(0, queryIndex);
// 查询当前路由是否在路由表中注册
const routeInfo = await this.webRouterService.getMatchedRouterInfo(
ctx.path,
ctx.method
);
const permission = routeInfo.summary;
if (permission == null || permission === '') {
ctx.status = 500;
ctx.body = Constants.res.serverError(
'该路由未配置权限控制:' + ctx.path
);
return;
}
const yes = this.ignoreUrls.includes(uri);
if (yes) {
if (permission === Constants.per.guest) {
await next();
return;
}
let token = ctx.get('Authorization') || '';
token = token.replace('Bearer ', '').trim();
try {
ctx.user = jwt.verify(token, this.secret);
} catch (err) {
@ -39,6 +48,20 @@ export class AuthorityMiddleware implements IWebMiddleware {
ctx.body = Constants.res.auth;
return;
}
if (permission !== Constants.per.authOnly) {
//如果不是仅校验登录，还需要校验是否拥有权限
const roleIds: number[] = ctx.user.roles;
const permissions =
await this.roleService.getCachedPermissionSetByRoleIds(roleIds);
if (!permissions.has(permission)) {
logger.info('not permission: ', ctx.req.url);
ctx.status = 401;
ctx.body = Constants.res.permission;
return;
}
}
await next();
};
}

10
packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts
View File

@ -23,7 +23,7 @@ export class PermissionController extends CrudController<PermissionService> {
return this.service;
}
@Post('/page')
@Post('/page', { summary: 'sys:auth:per:view' })
async page(
@Body(ALL)
body
@ -31,7 +31,7 @@ export class PermissionController extends CrudController<PermissionService> {
return await super.page(body);
}
@Post('/add')
@Post('/add', { summary: 'sys:auth:per:add' })
async add(
@Body(ALL)
bean
@ -39,14 +39,14 @@ export class PermissionController extends CrudController<PermissionService> {
return await super.add(bean);
}
@Post('/update')
@Post('/update', { summary: 'sys:auth:per:edit' })
async update(
@Body(ALL)
bean
) {
return await super.update(bean);
}
@Post('/delete')
@Post('/delete', { summary: 'sys:auth:per:remove' })
async delete(
@Query('id')
id
@ -54,7 +54,7 @@ export class PermissionController extends CrudController<PermissionService> {
return await super.delete(id);
}
@Post('/tree')
@Post('/tree', { summary: 'sys:auth:per:view' })
async tree() {
const tree = await this.service.tree({});
return this.ok(tree);

20
packages/ui/certd-server/src/modules/authority/controller/role-controller.ts
View File

@ -23,7 +23,7 @@ export class RoleController extends CrudController<RoleService> {
return this.service;
}
@Post('/page')
@Post('/page', { summary: 'sys:auth:role:view' })
async page(
@Body(ALL)
body
@ -31,13 +31,13 @@ export class RoleController extends CrudController<RoleService> {
return await super.page(body);
}
@Post('/list')
@Post('/list', { summary: 'sys:auth:role:view' })
async list() {
const ret = await this.service.find({});
return this.ok(ret);
}
@Post('/add')
@Post('/add', { summary: 'sys:auth:role:add' })
async add(
@Body(ALL)
bean
@ -45,14 +45,14 @@ export class RoleController extends CrudController<RoleService> {
return await super.add(bean);
}
@Post('/update')
@Post('/update', { summary: 'sys:auth:role:edit' })
async update(
@Body(ALL)
bean
) {
return await super.update(bean);
}
@Post('/delete')
@Post('/delete', { summary: 'sys:auth:role:remove' })
async delete(
@Query('id')
id
@ -60,7 +60,7 @@ export class RoleController extends CrudController<RoleService> {
return await super.delete(id);
}
@Post('/getPermissionTree')
@Post('/getPermissionTree', { summary: 'sys:auth:role:view' })
async getPermissionTree(
@Query('id')
id
@ -69,7 +69,7 @@ export class RoleController extends CrudController<RoleService> {
return this.ok(ret);
}
@Post('/getPermissionIds')
@Post('/getPermissionIds', { summary: 'sys:auth:role:view' })
async getPermissionIds(
@Query('id')
id
@ -80,9 +80,10 @@ export class RoleController extends CrudController<RoleService> {
/**
* 给角色授予权限
* @param id
* @param roleId
* @param permissionIds
*/
@Post('/authz')
@Post('/authz', { summary: 'sys:auth:role:edit' })
async authz(
@Body('roleId')
roleId,
@ -93,4 +94,3 @@ export class RoleController extends CrudController<RoleService> {
return this.ok(null);
}
}

15
packages/ui/certd-server/src/modules/authority/controller/user-controller.ts
View File

@ -11,6 +11,7 @@ import { UserService } from '../service/user-service';
import { CrudController } from '../../../basic/crud-controller';
import { RoleService } from '../service/role-service';
import { PermissionService } from '../service/permission-service';
import { Constants } from '../../../basic/constants';
/**
* 系统用户
@ -30,7 +31,7 @@ export class UserController extends CrudController<UserService> {
return this.service;
}
@Post('/page')
@Post('/page', { summary: 'sys:auth:user:view' })
async page(
@Body(ALL)
body
@ -62,7 +63,7 @@ export class UserController extends CrudController<UserService> {
return ret;
}
@Post('/add')
@Post('/add', { summary: 'sys:auth:user:add' })
async add(
@Body(ALL)
bean
@ -70,14 +71,14 @@ export class UserController extends CrudController<UserService> {
return await super.add(bean);
}
@Post('/update')
@Post('/update', { summary: 'sys:auth:user:edit' })
async update(
@Body(ALL)
bean
) {
return await super.update(bean);
}
@Post('/delete')
@Post('/delete', { summary: 'sys:auth:user:remove' })
async delete(
@Query('id')
id
@ -88,7 +89,7 @@ export class UserController extends CrudController<UserService> {
/**
* 当前登录用户的个人信息
*/
@Post('/mine')
@Post('/mine', { summary: Constants.per.authOnly })
public async mine() {
const id = this.ctx.user.id;
const info = await this.service.info(id, ['password']);
@ -98,7 +99,7 @@ export class UserController extends CrudController<UserService> {
/**
* 当前登录用户的权限列表
*/
@Post('/permissions')
@Post('/permissions', { summary: Constants.per.authOnly })
public async permissions() {
const id = this.ctx.user.id;
const permissions = await this.service.getUserPermissions(id);
@ -108,7 +109,7 @@ export class UserController extends CrudController<UserService> {
/**
* 当前登录用户的权限树形列表
*/
@Post('/permissionTree')
@Post('/permissionTree', { summary: Constants.per.authOnly })
public async permissionTree() {
const id = this.ctx.user.id;
const permissions = await this.service.getUserPermissions(id);

4
packages/ui/certd-server/src/modules/authority/entity/user-role.ts
View File

@ -9,4 +9,8 @@ export class UserRoleEntity {
roleId: number;
@PrimaryColumn({ name: 'user_id' })
userId: number;
static of(userId: number, roleId: number): UserRoleEntity {
return Object.assign(new UserRoleEntity(), { userId, roleId });
}
}

3
packages/ui/certd-server/src/modules/authority/entity/user.ts
View File

@ -60,4 +60,7 @@ export class UserEntity {
// },
// })
// roles: RoleEntity[];
static of(user: Partial<UserEntity>) {
return Object.assign(new UserEntity(), user);
}
}

3
packages/ui/certd-server/src/modules/authority/service/permission-service.ts
View File

@ -1,4 +1,4 @@
import { Provide } from '@midwayjs/decorator';
import { Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
import { InjectEntityModel } from '@midwayjs/typeorm';
import { Repository } from 'typeorm';
import { BaseService } from '../../../basic/base-service';
@ -8,6 +8,7 @@ import { PermissionEntity } from '../entity/permission';
* 权限资源
*/
@Provide()
@Scope(ScopeEnum.Singleton)
export class PermissionService extends BaseService<PermissionEntity> {
@InjectEntityModel(PermissionEntity)
repository: Repository<PermissionEntity>;

3
packages/ui/certd-server/src/modules/authority/service/role-permission-service.ts
View File

@ -1,4 +1,4 @@
import { Provide } from '@midwayjs/decorator';
import { Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
import { InjectEntityModel } from '@midwayjs/typeorm';
import { Repository } from 'typeorm';
import { BaseService } from '../../../basic/base-service';
@ -8,6 +8,7 @@ import { RolePermissionEntity } from '../entity/role-permission';
* 角色->权限
*/
@Provide()
@Scope(ScopeEnum.Singleton)
export class RolePermissionService extends BaseService<RolePermissionEntity> {
@InjectEntityModel(RolePermissionEntity)
repository: Repository<RolePermissionEntity>;

35
packages/ui/certd-server/src/modules/authority/service/role-service.ts
View File

@ -1,4 +1,4 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
import { InjectEntityModel } from '@midwayjs/typeorm';
import { In, Repository } from 'typeorm';
import { BaseService } from '../../../basic/base-service';
@ -8,10 +8,12 @@ import { RolePermissionEntity } from '../entity/role-permission';
import { PermissionService } from './permission-service';
import * as _ from 'lodash';
import { RolePermissionService } from './role-permission-service';
import { LRUCache } from 'lru-cache';
/**
* 角色
*/
@Provide()
@Scope(ScopeEnum.Singleton)
export class RoleService extends BaseService<RoleEntity> {
@InjectEntityModel(RoleEntity)
repository: Repository<RoleEntity>;
@ -22,6 +24,11 @@ export class RoleService extends BaseService<RoleEntity> {
@Inject()
rolePermissionService: RolePermissionService;
permissionCache = new LRUCache<string, any>({
max: 1000,
ttl: 1000 * 60 * 10,
});
getRepository() {
return this.repository;
}
@ -77,6 +84,8 @@ export class RoleService extends BaseService<RoleEntity> {
await this.userRoleService.delete({ userId });
//再添加
await this.addRoles(userId, roles);
this.permissionCache.clear();
}
async getPermissionTreeByRoleId(id: any) {
@ -97,5 +106,29 @@ export class RoleService extends BaseService<RoleEntity> {
permissionId,
});
}
this.permissionCache.clear();
}
async getPermissionSetByRoleIds(roleIds: number[]): Promise<Set<string>> {
const list = await this.getPermissionByRoleIds(roleIds);
const permissionSet = new Set<string>();
for (const entity of list) {
permissionSet.add(entity.permission);
}
return permissionSet;
}
async getCachedPermissionSetByRoleIds(
roleIds: number[]
): Promise<Set<string>> {
const roleIdsKey = roleIds.join(',');
let permissionSet = this.permissionCache.get(roleIdsKey);
if (permissionSet) {
return permissionSet;
}
permissionSet = await this.getPermissionSetByRoleIds(roleIds);
this.permissionCache.set(roleIdsKey, permissionSet);
return permissionSet;
}
}

3
packages/ui/certd-server/src/modules/authority/service/user-role-service.ts
View File

@ -1,4 +1,4 @@
import { Provide } from '@midwayjs/decorator';
import { Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
import { InjectEntityModel } from '@midwayjs/typeorm';
import { Repository } from 'typeorm';
import { BaseService } from '../../../basic/base-service';
@ -8,6 +8,7 @@ import { UserRoleEntity } from '../entity/user-role';
* 用户->角色
*/
@Provide()
@Scope(ScopeEnum.Singleton)
export class UserRoleService extends BaseService<UserRoleEntity> {
@InjectEntityModel(UserRoleEntity)
repository: Repository<UserRoleEntity>;

46
packages/ui/certd-server/src/modules/authority/service/user-service.ts
View File

@ -1,4 +1,4 @@
import { Inject, Provide } from '@midwayjs/decorator';
import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
import { InjectEntityModel } from '@midwayjs/typeorm';
import { Repository } from 'typeorm';
import { UserEntity } from '../entity/user';
@ -6,15 +6,18 @@ import * as _ from 'lodash';
import md5 from 'md5';
import { CommonException } from '../../../basic/exception/common-exception';
import { BaseService } from '../../../basic/base-service';
import { logger } from '../../../utils/logger';
import { RoleService } from './role-service';
import { PermissionService } from './permission-service';
import { UserRoleService } from './user-role-service';
import { Constants } from '../../../basic/constants';
import { UserRoleEntity } from '../entity/user-role';
import { randomText } from 'svg-captcha';
/**
* 系统用户
*/
@Provide()
@Scope(ScopeEnum.Singleton)
export class UserService extends BaseService<UserEntity> {
@InjectEntityModel(UserEntity)
repository: Repository<UserEntity>;
@ -32,10 +35,10 @@ export class UserService extends BaseService<UserEntity> {
/**
* 获得个人信息
*/
async mine() {
async mine(userId: number) {
const info = await this.repository.findOne({
where: {
id: this.ctx.user.id,
id: userId,
},
});
delete info.password;
@ -55,7 +58,7 @@ export class UserService extends BaseService<UserEntity> {
if (!_.isEmpty(exists)) {
throw new CommonException('用户名已经存在');
}
const password = param.password ?? '123456';
const password = param.password ?? randomText(6);
param.password = md5(password); // 默认密码 建议未改密码不能登陆
await super.add(param);
//添加角色
@ -97,7 +100,7 @@ export class UserService extends BaseService<UserEntity> {
}
checkPassword(rawPassword: any, md5Password: any) {
logger.info('md5', md5('123456'));
// logger.info('md5', md5('123456'));
return md5(rawPassword) === md5Password;
}
@ -107,7 +110,36 @@ export class UserService extends BaseService<UserEntity> {
*/
async getUserPermissions(id: any) {
const roleIds = await this.roleService.getRoleIdsByUserId(id);
return await this.roleService.getPermissionByRoleIds(roleIds);
}
async register(user: UserEntity) {
const old = await this.findOne({ username: user.username });
if (old != null) {
throw new CommonException('用户名已经存在');
}
let newUser: UserEntity = UserEntity.of({
username: user.username,
password: user.password,
nickName: user.nickName || user.username,
avatar: user.avatar || '',
email: user.email || '',
mobile: user.mobile || '',
phoneCode: user.phoneCode || '',
status: 1,
});
newUser.password = md5(newUser.password);
await this.transaction(async txManager => {
newUser = await txManager.save(newUser);
const userRole: UserRoleEntity = UserRoleEntity.of(
newUser.id,
Constants.role.defaultUser
);
await txManager.save(userRole);
});
delete newUser.password;
return newUser;
}
}

5
packages/ui/certd-server/src/modules/basic/controller/code-controller.ts
View File

@ -5,6 +5,7 @@ import { Controller, Post, Provide } from '@midwayjs/decorator';
import { BaseController } from '../../../basic/base-controller';
import { CodeService } from '../service/code-service';
import { EmailService } from '../service/email-service';
import { Constants } from '../../../basic/constants';
export class SmsCodeReq {
@Rule(RuleType.number().required())
phoneCode: number;
@ -30,7 +31,7 @@ export class BasicController extends BaseController {
@Inject()
emailService: EmailService;
@Post('/sendSmsCode')
@Post('/sendSmsCode', { summary: Constants.per.guest })
public sendSmsCode(
@Body(ALL)
body: SmsCodeReq
@ -39,7 +40,7 @@ export class BasicController extends BaseController {
return this.ok(null);
}
@Post('/captcha')
@Post('/captcha', { summary: Constants.per.guest })
public async getCaptcha(
@Body()
randomStr

3
packages/ui/certd-server/src/modules/basic/controller/email-controller.ts
View File

@ -1,6 +1,7 @@
import { Body, Controller, Inject, Post, Provide } from '@midwayjs/decorator';
import { BaseController } from '../../../basic/base-controller';
import { EmailService } from '../service/email-service';
import { Constants } from '../../../basic/constants';
/**
*/
@ -10,7 +11,7 @@ export class EmailController extends BaseController {
@Inject()
emailService: EmailService;
@Post('/test')
@Post('/test', { summary: Constants.per.authOnly })
public async test(
@Body('receiver')
receiver

6
packages/ui/certd-server/src/modules/login/controller/login-controller.ts
View File

@ -8,6 +8,7 @@ import {
} from '@midwayjs/decorator';
import { LoginService } from '../service/login-service';
import { BaseController } from '../../../basic/base-controller';
import { Constants } from '../../../basic/constants';
/**
*/
@ -16,7 +17,7 @@ import { BaseController } from '../../../basic/base-controller';
export class LoginController extends BaseController {
@Inject()
loginService: LoginService;
@Post('/login')
@Post('/login', { summary: Constants.per.guest })
public async login(
@Body(ALL)
user
@ -25,7 +26,6 @@ export class LoginController extends BaseController {
return this.ok(token);
}
@Post('/logout')
@Post('/logout', { summary: Constants.per.authOnly })
public logout() {}
}

29
packages/ui/certd-server/src/modules/login/controller/register-controller.ts Normal file
View File

@ -0,0 +1,29 @@
import {
ALL,
Body,
Controller,
Inject,
Post,
Provide,
} from '@midwayjs/decorator';
import { BaseController } from '../../../basic/base-controller';
import { Constants } from '../../../basic/constants';
import { UserService } from '../../authority/service/user-service';
import { UserEntity } from '../../authority/entity/user';
/**
*/
@Provide()
@Controller('/api/')
export class RegisterController extends BaseController {
@Inject()
userService: UserService;
@Post('/register', { summary: Constants.per.guest })
public async register(
@Body(ALL)
user: UserEntity
) {
const newUser = await this.userService.register(user);
return this.ok(newUser);
}
}

11
packages/ui/certd-server/src/modules/login/service/login-service.ts
View File

@ -2,6 +2,8 @@ import { Config, Inject, Provide } from '@midwayjs/decorator';
import { UserService } from '../../authority/service/user-service';
import * as jwt from 'jsonwebtoken';
import { CommonException } from '../../../basic/exception/common-exception';
import { RoleService } from '../../authority/service/role-service';
import { UserEntity } from '../../authority/entity/user';
/**
* 系统用户
@ -10,6 +12,8 @@ import { CommonException } from '../../../basic/exception/common-exception';
export class LoginService {
@Inject()
userService: UserService;
@Inject()
roleService: RoleService;
@Config('biz.jwt')
private jwt: any;
@ -27,17 +31,20 @@ export class LoginService {
throw new CommonException('用户名或密码错误');
}
return this.generateToken(info);
const roleIds = await this.roleService.getRoleIdsByUserId(info.id);
return this.generateToken(info, roleIds);
}
/**
* 生成token
* @param user 用户对象
* @param roleIds
*/
async generateToken(user) {
async generateToken(user: UserEntity, roleIds: number[]) {
const tokenInfo = {
username: user.username,
id: user.id,
roles: roleIds,
};
const expire = this.jwt.expire;
const token = jwt.sign(tokenInfo, this.jwt.secret, {

17
packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts
View File

@ -9,6 +9,7 @@ import {
} from '@midwayjs/decorator';
import { CrudController } from '../../../basic/crud-controller';
import { AccessService } from '../service/access-service';
import { Constants } from '../../../basic/constants';
/**
* 授权
@ -23,49 +24,49 @@ export class AccessController extends CrudController<AccessService> {
return this.service;
}
@Post('/page')
@Post('/page', { summary: Constants.per.authOnly })
async page(@Body(ALL) body) {
body.query = body.query ?? {};
body.query.userId = this.ctx.user.id;
return super.page(body);
}
@Post('/list')
@Post('/list', { summary: Constants.per.authOnly })
async list(@Body(ALL) body) {
body.userId = this.ctx.user.id;
return super.list(body);
}
@Post('/add')
@Post('/add', { summary: Constants.per.authOnly })
async add(@Body(ALL) bean) {
bean.userId = this.ctx.user.id;
return super.add(bean);
}
@Post('/update')
@Post('/update', { summary: Constants.per.authOnly })
async update(@Body(ALL) bean) {
await this.service.checkUserId(bean.id, this.ctx.user.id);
return super.update(bean);
}
@Post('/info')
@Post('/info', { summary: Constants.per.authOnly })
async info(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
return super.info(id);
}
@Post('/delete')
@Post('/delete', { summary: Constants.per.authOnly })
async delete(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
return super.delete(id);
}
@Post('/define')
@Post('/define', { summary: Constants.per.authOnly })
async define(@Query('type') type) {
const provider = this.service.getDefineByType(type);
return this.ok(provider);
}
@Post('/accessTypeDict')
@Post('/accessTypeDict', { summary: Constants.per.authOnly })
async getAccessTypeDict() {
const list = this.service.getDefineList();
const dict = [];

5
packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts
View File

@ -8,6 +8,7 @@ import {
} from '@midwayjs/decorator';
import { DnsProviderService } from '../service/dns-provider-service';
import { BaseController } from '../../../basic/base-controller';
import {Constants} from "../../../basic/constants";
/**
* 插件
@ -18,14 +19,14 @@ export class DnsProviderController extends BaseController {
@Inject()
service: DnsProviderService;
@Post('/list')
@Post('/list', { summary: Constants.per.authOnly })
async list(@Query(ALL) query) {
query.userId = this.ctx.user.id;
const list = this.service.getList();
return this.ok(list);
}
@Post('/dnsProviderTypeDict')
@Post('/dnsProviderTypeDict', { summary: Constants.per.authOnly })
async getDnsProviderTypeDict() {
const list = this.service.getList();
const dict = [];

19
packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts
View File

@ -13,6 +13,7 @@ import { HistoryService } from '../service/history-service';
import { HistoryLogService } from '../service/history-log-service';
import { HistoryEntity } from '../entity/history';
import { HistoryLogEntity } from '../entity/history-log';
import {Constants} from "../../../basic/constants";
/**
* 证书
@ -29,13 +30,13 @@ export class HistoryController extends CrudController<HistoryService> {
return this.service;
}
@Post('/page')
@Post('/page', { summary: Constants.per.authOnly })
async page(@Body(ALL) body) {
body.query.userId = this.ctx.user.id;
return super.page(body);
}
@Post('/list')
@Post('/list', { summary: Constants.per.authOnly })
async list(@Body(ALL) body) {
body.userId = this.ctx.user.id;
if (body.pipelineId == null) {
@ -52,19 +53,19 @@ export class HistoryController extends CrudController<HistoryService> {
return this.ok(listRet);
}
@Post('/add')
@Post('/add', { summary: Constants.per.authOnly })
async add(@Body(ALL) bean: PipelineEntity) {
bean.userId = this.ctx.user.id;
return super.add(bean);
}
@Post('/update')
@Post('/update', { summary: Constants.per.authOnly })
async update(@Body(ALL) bean) {
await this.service.checkUserId(bean.id, this.ctx.user.id);
return super.update(bean);
}
@Post('/save')
@Post('/save', { summary: Constants.per.authOnly })
async save(@Body(ALL) bean: HistoryEntity) {
bean.userId = this.ctx.user.id;
if (bean.id > 0) {
@ -74,7 +75,7 @@ export class HistoryController extends CrudController<HistoryService> {
return this.ok(bean.id);
}
@Post('/saveLog')
@Post('/saveLog', { summary: Constants.per.authOnly })
async saveLog(@Body(ALL) bean: HistoryLogEntity) {
bean.userId = this.ctx.user.id;
if (bean.id > 0) {
@ -84,20 +85,20 @@ export class HistoryController extends CrudController<HistoryService> {
return this.ok(bean.id);
}
@Post('/delete')
@Post('/delete', { summary: Constants.per.authOnly })
async delete(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
return super.delete(id);
}
@Post('/detail')
@Post('/detail', { summary: Constants.per.authOnly })
async detail(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
const detail = await this.service.detail(id);
return this.ok(detail);
}
@Post('/logs')
@Post('/logs', { summary: Constants.per.authOnly })
async logs(@Query('id') id) {
await this.logService.checkUserId(id, this.ctx.user.id);
const logInfo = await this.logService.info(id);

15
packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts
View File

@ -10,6 +10,7 @@ import {
import { CrudController } from '../../../basic/crud-controller';
import { PipelineService } from '../service/pipeline-service';
import { PipelineEntity } from '../entity/pipeline';
import { Constants } from '../../../basic/constants';
/**
* 证书
@ -24,7 +25,7 @@ export class PipelineController extends CrudController<PipelineService> {
return this.service;
}
@Post('/page')
@Post('/page', { summary: Constants.per.authOnly })
async page(@Body(ALL) body) {
body.query.userId = this.ctx.user.id;
const buildQuery = qb => {
@ -33,19 +34,19 @@ export class PipelineController extends CrudController<PipelineService> {
return super.page({ ...body, buildQuery });
}
@Post('/add')
@Post('/add', { summary: Constants.per.authOnly })
async add(@Body(ALL) bean: PipelineEntity) {
bean.userId = this.ctx.user.id;
return super.add(bean);
}
@Post('/update')
@Post('/update', { summary: Constants.per.authOnly })
async update(@Body(ALL) bean) {
await this.service.checkUserId(bean.id, this.ctx.user.id);
return super.update(bean);
}
@Post('/save')
@Post('/save', { summary: Constants.per.authOnly })
async save(@Body(ALL) bean: PipelineEntity) {
bean.userId = this.ctx.user.id;
if (bean.id > 0) {
@ -56,20 +57,20 @@ export class PipelineController extends CrudController<PipelineService> {
return this.ok(bean.id);
}
@Post('/delete')
@Post('/delete', { summary: Constants.per.authOnly })
async delete(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
return super.delete(id);
}
@Post('/detail')
@Post('/detail', { summary: Constants.per.authOnly })
async detail(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
const detail = await this.service.detail(id);
return this.ok(detail);
}
@Post('/trigger')
@Post('/trigger', { summary: Constants.per.authOnly })
async trigger(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
await this.service.trigger(id);

3
packages/ui/certd-server/src/modules/pipeline/controller/plugin-controller.ts
View File

@ -8,6 +8,7 @@ import {
} from '@midwayjs/decorator';
import { BaseController } from '../../../basic/base-controller';
import { PluginService } from '../service/plugin-service';
import { Constants } from '../../../basic/constants';
/**
* 插件
@ -18,7 +19,7 @@ export class PluginController extends BaseController {
@Inject()
service: PluginService;
@Post('/list')
@Post('/list', { summary: Constants.per.authOnly })
async list(@Query(ALL) query) {
query.userId = this.ctx.user.id;
const list = this.service.getList();

19
packages/ui/certd-server/src/modules/system/controller/settings-controller.ts
View File

@ -10,6 +10,7 @@ import {
import { CrudController } from '../../../basic/crud-controller';
import { SettingsService } from '../service/settings-service';
import { SettingsEntity } from '../entity/settings';
import { Constants } from '../../../basic/constants';
/**
*/
@ -23,53 +24,51 @@ export class SettingsController extends CrudController<SettingsService> {
return this.service;
}
@Post('/page')
@Post('/page', { summary: Constants.per.authOnly })
async page(@Body(ALL) body) {
body.query = body.query ?? {};
body.query.userId = this.ctx.user.id;
return super.page(body);
}
@Post('/list')
@Post('/list', { summary: Constants.per.authOnly })
async list(@Body(ALL) body) {
body.userId = this.ctx.user.id;
return super.list(body);
}
@Post('/add')
@Post('/add', { summary: Constants.per.authOnly })
async add(@Body(ALL) bean) {
bean.userId = this.ctx.user.id;
return super.add(bean);
}
@Post('/update')
@Post('/update', { summary: Constants.per.authOnly })
async update(@Body(ALL) bean) {
await this.service.checkUserId(bean.id, this.ctx.user.id);
return super.update(bean);
}
@Post('/info')
@Post('/info', { summary: Constants.per.authOnly })
async info(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
return super.info(id);
}
@Post('/delete')
@Post('/delete', { summary: Constants.per.authOnly })
async delete(@Query('id') id) {
await this.service.checkUserId(id, this.ctx.user.id);
return super.delete(id);
}
@Post('/save')
@Post('/save', { summary: Constants.per.authOnly })
async save(@Body(ALL) bean: SettingsEntity) {
await this.service.checkUserId(bean.key, this.ctx.user.id, 'userId', 'key');
bean.userId = this.ctx.user.id;
await this.service.save(bean);
return this.ok({});
}
@Post('/get')
@Post('/get', { summary: Constants.per.authOnly })
async get(@Query('key') key: string) {
await this.service.checkUserId(key, this.ctx.user.id, 'userId', 'key');
const entity = await this.service.getByKey(key, this.ctx.user.id);
return this.ok(entity);
}