@certd/lib-server 1.39.1 → 1.39.3

package/dist/basic/base-controller.js

@@ -111,11 +111,16 @@ export class BaseController {
             await authService.checkProjectId(service, id, projectId);
         }
         else {
-            if (allowAdmin) {
-                await authService.checkUserIdButAllowAdmin(this.ctx, service, id);
+            if (userId === Constants.systemUserId) {
+                //系统级别，不检查权限
             }
             else {
-                await authService.checkUserId(service, id, userId);
+                if (allowAdmin) {
+                    await authService.checkUserIdButAllowAdmin(this.ctx, service, id);
+                }
+                else {
+                    await authService.checkUserId(service, id, userId);
+                }
             }
         }
         return { projectId, userId };

package/dist/basic/base-service.js

@@ -11,6 +11,7 @@ import { PermissionException, ValidateException } from './exception/index.js';
 import { In } from 'typeorm';
 import { Inject } from '@midwayjs/core';
 import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
+import { Constants } from './constants.js';
 /**
  * 服务基类
  */
@@ -232,7 +233,7 @@ __decorate([
 ], BaseService.prototype, "dataSourceManager", void 0);
 export function checkUserProjectParam(userId, projectId) {
     if (projectId != null) {
-        if (userId !== -1) {
+        if (userId !== Constants.enterpriseUserId) {
             throw new ValidateException('userId projectId 错误');
         }
         return true;

package/dist/basic/constants.d.ts

@@ -112,4 +112,6 @@ export declare const Constants: {
             message: string;
         };
     };
+    systemUserId: number;
+    enterpriseUserId: number;
 };

package/dist/basic/constants.js

@@ -118,4 +118,6 @@ export const Constants = {
             message: '用户邮箱还未配置',
         },
     },
+    systemUserId: 0, // 系统级别userid固定为0
+    enterpriseUserId: -1 // 企业模式用户id固定为-1
 };

package/dist/system/settings/service/models.d.ts

@@ -53,6 +53,7 @@ export declare class SysPrivateSettings extends BaseSettings {
     commonCnameEnabled?: boolean;
     httpRequestTimeout?: number;
     pipelineMaxRunningCount?: number;
+    environmentVars?: string;
     sms?: {
         type?: string;
         config?: any;

package/dist/system/settings/service/models.js

@@ -60,6 +60,7 @@ export class SysPrivateSettings extends BaseSettings {
     commonCnameEnabled = true;
     httpRequestTimeout = 30;
     pipelineMaxRunningCount;
+    environmentVars = '';
     sms = {
         type: 'aliyun',
         config: {},

package/dist/system/settings/service/sys-settings-service.d.ts

@@ -21,6 +21,7 @@ export declare class SysSettingsService extends BaseService<SysSettingsEntity> {
     reloadSettings(): Promise<void>;
     reloadPublicSettings(): Promise<void>;
     reloadPrivateSettings(): Promise<void>;
+    setEnvironmentVars(vars: string): void;
     updateByKey(key: string, setting: any): Promise<void>;
     backupSecret(): Promise<void>;
     getSecret(): Promise<SysSecret>;

package/dist/system/settings/service/sys-settings-service.js

@@ -17,8 +17,9 @@ import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
 import * as dns from 'node:dns';
 import { BaseService, setAdminMode } from '../../../basic/index.js';
 import { executorQueue } from '../../basic/service/executor-queue.js';
-import { isComm } from '@certd/plus-core';
+import { isComm, isPlus } from '@certd/plus-core';
 const { merge } = mergeUtils;
+let lastSaveEnvVars = {};
 /**
  * 设置
  */
@@ -142,7 +143,9 @@ let SysSettingsService = class SysSettingsService extends BaseService {
     }
     async reloadPublicSettings() {
         const publicSetting = await this.getPublicSettings();
-        setAdminMode(publicSetting.adminMode);
+        if (isPlus()) {
+            setAdminMode(publicSetting.adminMode);
+        }
     }
     async reloadPrivateSettings() {
         const privateSetting = await this.getPrivateSettings();
@@ -158,6 +161,39 @@ let SysSettingsService = class SysSettingsService extends BaseService {
             executorQueue.setMaxRunningCount(privateSetting.pipelineMaxRunningCount);
         }
         setSslProviderReverseProxies(privateSetting.reverseProxies);
+        //加载环境变量
+        this.setEnvironmentVars(privateSetting.environmentVars);
+    }
+    setEnvironmentVars(vars) {
+        const envVars = {};
+        if (typeof vars !== 'string') {
+            vars = "";
+        }
+        vars.split('\n').forEach(line => {
+            line = line.trim();
+            if (!line || line.startsWith('#')) {
+                return;
+            }
+            const arr = line.split("#");
+            if (arr.length > 0) {
+                line = arr[0].trim();
+            }
+            if (!line.includes("=")) {
+                return;
+            }
+            const [key, value] = line.split('=');
+            if (key && value) {
+                envVars[key.trim()] = value.trim();
+            }
+        });
+        //先删除旧环境变量
+        if (lastSaveEnvVars) {
+            for (const key in lastSaveEnvVars) {
+                delete process.env[key];
+            }
+        }
+        merge(process.env, envVars);
+        lastSaveEnvVars = envVars;
     }
     async updateByKey(key, setting) {
         const entity = await this.getByKey(key);

package/dist/user/access/entity/access.d.ts

@@ -3,6 +3,7 @@
  */
 export declare class AccessEntity {
     id: number;
+    keyId: string;
     userId: number;
     name: string;
     type: string;

package/dist/user/access/entity/access.js

@@ -13,6 +13,7 @@ import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
  */
 let AccessEntity = class AccessEntity {
     id;
+    keyId;
     userId; // 0为系统级别, -1为企业，大于1为用户
     name;
     type;
@@ -26,6 +27,10 @@ __decorate([
     PrimaryGeneratedColumn(),
     __metadata("design:type", Number)
 ], AccessEntity.prototype, "id", void 0);
+__decorate([
+    Column({ name: 'key_id', comment: 'key_id', length: 100 }),
+    __metadata("design:type", String)
+], AccessEntity.prototype, "keyId", void 0);
 __decorate([
     Column({ name: 'user_id', comment: '用户id' }),
     __metadata("design:type", Number)

package/dist/user/access/service/access-service.d.ts

@@ -44,4 +44,10 @@ export declare class AccessService extends BaseService<AccessEntity> {
     }[];
     getDefineByType(type: string): import("@certd/pipeline").Registrable;
     getSimpleByIds(ids: number[], userId: any, projectId?: number): Promise<AccessEntity[]>;
+    /**
+     * 复制授权到其他项目
+     * @param accessId
+     * @param projectId
+     */
+    copyTo(accessId: number, projectId?: number): Promise<any>;
 }

package/dist/user/access/service/access-service.js

@@ -14,6 +14,7 @@ import { AccessGetter, BaseService, PermissionException, ValidateException } fro
 import { AccessEntity } from '../entity/access.js';
 import { accessRegistry, newAccess } from '@certd/pipeline';
 import { EncryptService } from './encrypt-service.js';
+import { logger, utils } from '@certd/basic';
 /**
  * 授权
  */
@@ -46,6 +47,7 @@ let AccessService = class AccessService extends BaseService {
         }
         delete param._copyFrom;
         this.encryptSetting(param, oldEntity);
+        param.keyId = "ac_" + utils.id.simpleNanoId();
         return await super.add(param);
     }
     encryptSetting(param, oldSettingEntity) {
@@ -114,6 +116,7 @@ let AccessService = class AccessService extends BaseService {
             throw new ValidateException('该授权配置不存在,请确认是否已被删除');
         }
         this.encryptSetting(param, oldEntity);
+        delete param.keyId;
         return await super.update(param);
     }
     async getSimpleInfo(id) {
@@ -203,6 +206,37 @@ let AccessService = class AccessService extends BaseService {
             },
         });
     }
+    /**
+     * 复制授权到其他项目
+     * @param accessId
+     * @param projectId
+     */
+    async copyTo(accessId, projectId) {
+        const access = await this.info(accessId);
+        if (access == null) {
+            throw new Error(`该授权配置不存在,请确认是否已被删除:id=${accessId}`);
+        }
+        const keyId = access.keyId;
+        //检查目标项目里是否已经有相同keyId的配置
+        const existAccess = await this.repository.findOne({
+            where: {
+                keyId,
+                projectId,
+            },
+        });
+        if (existAccess) {
+            logger.info(`目标项目已存在相同keyId的授权配置,跳过复制:keyId=${keyId}`);
+            return existAccess.id;
+        }
+        const newAccess = {
+            ...access,
+            userId: -1,
+            id: undefined,
+            projectId,
+        };
+        await this.repository.save(newAccess);
+        return newAccess.id;
+    }
 };
 __decorate([
     InjectEntityModel(AccessEntity),

package/dist/user/addon/entity/addon.d.ts

@@ -2,6 +2,7 @@
  */
 export declare class AddonEntity {
     id: number;
+    keyId: string;
     userId: number;
     name: string;
     addonType: string;

package/dist/user/addon/entity/addon.js

@@ -12,6 +12,7 @@ import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
  */
 let AddonEntity = class AddonEntity {
     id;
+    keyId;
     userId;
     name;
     addonType;
@@ -27,6 +28,10 @@ __decorate([
     PrimaryGeneratedColumn(),
     __metadata("design:type", Number)
 ], AddonEntity.prototype, "id", void 0);
+__decorate([
+    Column({ name: 'key_id', comment: 'key_id', length: 100 }),
+    __metadata("design:type", String)
+], AddonEntity.prototype, "keyId", void 0);
 __decorate([
     Column({ name: 'user_id', comment: '用户id' }),
     __metadata("design:type", Number)

package/dist/user/addon/service/addon-service.d.ts

@@ -23,6 +23,7 @@ export declare class AddonService extends BaseService<AddonEntity> {
     update(param: any): Promise<void>;
     getSimpleInfo(id: number): Promise<{
         id: number;
+        keyId: string;
         name: string;
         userId: number;
         addonType: string;

package/dist/user/addon/service/addon-service.js

@@ -13,6 +13,7 @@ import { In, Repository } from "typeorm";
 import { BaseService, ValidateException } from "../../../index.js";
 import { addonRegistry } from "../api/index.js";
 import { AddonEntity } from "../entity/addon.js";
+import { utils } from "@certd/basic";
 /**
  * Addon
  */
@@ -46,6 +47,7 @@ let AddonService = class AddonService extends BaseService {
         else {
             param.isSystem = false;
         }
+        param.keyId = "ad_" + utils.id.simpleNanoId();
         delete param._copyFrom;
         return await super.add(param);
     }
@@ -58,6 +60,7 @@ let AddonService = class AddonService extends BaseService {
         if (oldEntity == null) {
             throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
         }
+        delete param.keyId;
         return await super.update(param);
     }
     async getSimpleInfo(id) {
@@ -67,6 +70,7 @@ let AddonService = class AddonService extends BaseService {
         }
         return {
             id: entity.id,
+            keyId: entity.keyId,
             name: entity.name,
             userId: entity.userId,
             addonType: entity.addonType,
@@ -95,6 +99,7 @@ let AddonService = class AddonService extends BaseService {
             },
             select: {
                 id: true,
+                keyId: true,
                 name: true,
                 addonType: true,
                 type: true,
@@ -123,6 +128,7 @@ let AddonService = class AddonService extends BaseService {
         const setting = JSON.parse(res.setting);
         return {
             id: res.id,
+            keyId: res.keyId,
             addonType: res.addonType,
             type: res.type,
             name: res.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.39.1",
+  "version": "1.39.3",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.39.1",
-    "@certd/basic": "^1.39.1",
-    "@certd/pipeline": "^1.39.1",
-    "@certd/plugin-lib": "^1.39.1",
-    "@certd/plus-core": "^1.39.1",
+    "@certd/acme-client": "^1.39.3",
+    "@certd/basic": "^1.39.3",
+    "@certd/pipeline": "^1.39.3",
+    "@certd/plugin-lib": "^1.39.3",
+    "@certd/plus-core": "^1.39.3",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
@@ -64,5 +64,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "590ff67fcb40ff8ba0f7b2a9592b51d9fb54a2ef"
+  "gitHead": "6cb51bc55d8a649797b0b3bdbc6982451b5bfd5e"
 }