@lcap/nasl 3.6.0-alpha.3 → 3.6.0-alpha.5

package/src/concepts/basics/stdlib/nasl.auth.ts

@@ -66,30 +66,30 @@ export function initialize() {
         }),
       ],
     }),
-    new Structure({
-      name: 'LCAPUser',
-      properties: [
-        new StructureProperty({
-          name: 'userName',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
-        }),
-        new StructureProperty({
-          name: 'userId',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
-        }),
-        new StructureProperty({
-          name: 'extendFiledMap',
-          typeAnnotation: TypeAnnotation.createGeneric('map', {
-            typeArguments: [
-              // TypeAnnotation.createPrimitive('String'),
-              // TypeAnnotation.createPrimitive('String'),
-              TypeAnnotation.createTypeParam('K'),
-              TypeAnnotation.createTypeParam('V'),
-            ],
-          }),
-        }),
-      ],
-    }),
+    // new Structure({
+    //   name: 'LCAPUser',
+    //   properties: [
+    //     new StructureProperty({
+    //       name: 'userName',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new StructureProperty({
+    //       name: 'userId',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new StructureProperty({
+    //       name: 'extendFiledMap',
+    //       typeAnnotation: TypeAnnotation.createGeneric('map', {
+    //         typeArguments: [
+    //           // TypeAnnotation.createPrimitive('String'),
+    //           // TypeAnnotation.createPrimitive('String'),
+    //           TypeAnnotation.createTypeParam('K'),
+    //           TypeAnnotation.createTypeParam('V'),
+    //         ],
+    //       }),
+    //     }),
+    //   ],
+    // }),
   );
 
   authTypeList.push(
@@ -105,12 +105,15 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
+      description: '检查当前用户是否有当前资源的权限',
       returns: [],
     }),
     new Logic({
       name: 'logout',
       params: [],
       returns: [],
+      description: '退出当前登录状态',
+
     }),
     new Logic({
       name: 'encryptByAES',
@@ -120,10 +123,14 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
+      description: '对字符串实现aes加密 返回加密后的字符串',
+
       returns: [],
     }),
     new Logic({
       name: 'decryptByAES',
+      description: '对字符串实现aes解密 返回解密后的字符串',
+
       params: [
         new Param({
           name: 'string',
@@ -132,34 +139,90 @@ export function initialize() {
       ],
       returns: [],
     }),
+    // new Logic({
+    //   name: 'getUserList',
+    //   params: [
+    //     new Param({
+    //       name: 'userNameFilter',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new Param({
+    //       name: 'limit',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //     new Param({
+    //       name: 'offset',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //   ],
+    //   returns: [
+    //     new Return({
+    //       name: 'result',
+    //       typeAnnotation: TypeAnnotation.createGeneric('List', {
+    //         typeArguments: [TypeAnnotation.createTypeParam('T')],
+    //       }),
+    //     }),
+    //   ],
+    // }),
     new Logic({
-      name: 'getUserList',
+      name: 'encryptPassword',
+      description: '密码加密（采用Bcrypt算法进行加密，salt默认10位）',
       params: [
         new Param({
-          name: 'userNameFilter',
+          name: 'password',
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+      ],
+      returns: [
+        new Return({
+          name: 'BcryptedHashPassword',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'validatePassword',
+      description: '密码校验（采用Bcrypt算法进行校验）',
+      params: [
         new Param({
-          name: 'limit',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+          name: 'plainText',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }), new Param({
+          name: 'hashedText',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+
+      ],
+      returns: [
+        new Return({
+          name: 'matchResult',
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'generateUserId',
+      description: '生成用户唯一标识（根据Md5算法）',
+      params: [
         new Param({
-          name: 'offset',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+          name: 'userName',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }), new Param({
+          name: 'source',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+
       ],
       returns: [
         new Return({
           name: 'result',
-          typeAnnotation: TypeAnnotation.createGeneric('List', {
-            typeArguments: [TypeAnnotation.createTypeParam('T')],
-          }),
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
     }),
     new Logic({
       name: 'getCurrentUser',
-      description: '获取当前登录用户信息，需在登录后调用',
+      description: '即将下线，请使用服务端全局变量currentUser',
       returns: [
         new Return({
           name: 'result',

package/src/generator/genBundleFiles.ts

@@ -35,6 +35,7 @@ interface Config {
   devDnsAddr: string;
   miniEnable: boolean;
   isPreviewFe?: boolean;
+  previewVersion?: string;
 }
 
 // 将metaData转成字符串
@@ -615,10 +616,17 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
          `;
     content += str;
   }
+  const getBundleFileName =()=>{
+    if(config.isPreviewFe && config.previewVersion){
+      return `mockBundle-${config.previewVersion}`
+    }else {
+      return 'bundle'
+    }
+  }
   const baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
-  let bundleMinPath = `${baseUrl}/${config.isPreviewFe?'mockBundle':'bundle'}.${genHash(content)}.min.js`;
+  let bundleMinPath = `${baseUrl}/${getBundleFileName()}.${genHash(content)}.min.js`;
   if (frontend.basePath) {
-    bundleMinPath = `${baseUrl}${frontend.basePath}/${config.isPreviewFe?'mockBundle':'bundle'}.${genHash(content)}.min.js`;
+    bundleMinPath = `${baseUrl}${frontend.basePath}/${getBundleFileName()}.${genHash(content)}.min.js`;
   }
   const otherJsList = (frontend as any)?.appletsConfig?.enable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
 

package/src/generator/permission.ts

@@ -178,7 +178,7 @@ async function findResourcesOfLogic(logic: Logic, uploaders: Map<string, ViewEle
   return optimizeResourceData(res);
 }
 
-function getAllLogics(app: App) {
+export function getAllLogics(app: App) {
   const modules: (Module | Connector)[] = [];
   const entities: Entity[] = [];
   const logics: Logic[] = [];

package/src/natural/genNaturalTS.ts

@@ -81,8 +81,10 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode, focusedNod
   // code += '// 页面上下文\n';
   code += ``;
   if (view) { // 为页面中的逻辑
+    code += `\n// 当前为页面下的逻辑`;
     code += view?.toNaturalTS(createCompilerState('', { focusedNodePath }), currentNode);
   } else if (logic) { // 为全局逻辑
+    code += `\n// 当前为服务端逻辑`;
     code += logic?.toNaturalTS(createCompilerState('', { focusedNodePath }), undefined, undefined, currentNode);
   }
   code += `\n\`\`\`\n`;

package/src/natural/transformTSCode.ts

@@ -387,6 +387,14 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           }))],
         });
       }
+      if (calleeName === 'PaginateLimit') {
+        const newCallee = node?.arguments || [];
+        return new naslTypes.Paginate({
+          list: newCallee?.[0] && transformLogicNode(newCallee?.[0]),
+          page: newCallee?.[1] && transformLogicNode(newCallee?.[1]),
+          size: newCallee?.[2] && transformLogicNode(newCallee?.[2]),
+        });
+      }
       if (calleeName === 'ForEach') {
         const newCallee = node.arguments;
         const arrowFunction = node.arguments[3] as babelTypes.ArrowFunctionExpression;

package/src/server/getLogics.ts

@@ -321,7 +321,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
             name: 'category',
             path: `auth`,
             title: '认证与权限',
-            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => item.name !== 'getCurrentUser'),
+            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => !['getCurrentUser', 'encryptPassword', 'validatePassword', 'generateUserId'].includes(item.name)),
             expanded: false,
           }),
           new Namespace({
@@ -438,8 +438,8 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
           new Namespace({
             name: 'category',
             path: `auth`,
-            title: '用户',
-            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => item.name === 'getCurrentUser'),
+            title: '认证与权限',
+            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => ['getCurrentUser', 'encryptPassword', 'validatePassword', 'generateUserId'].includes(item.name)),
             expanded: false,
           }),
         ],

package/src/server/getMemberIdentifier.ts

@@ -98,22 +98,22 @@ function formatGlobalVariable() {
     value: 'userInfo',
     children: [
       { name: 'Status', value: 'userInfo.Status' },
-      {
-        name: 'UserInfoExtend',
-        value: 'userInfo.UserInfoExtend',
-        children: [
-          { name: 'Company', value: 'userInfo.UserInfoExtend.Company' },
-          { name: 'JobLevel', value: 'userInfo.UserInfoExtend.JobLevel' },
-          { name: 'JobNum', value: 'userInfo.UserInfoExtend.JobNum' },
-          { name: 'JobYear', value: 'userInfo.UserInfoExtend.JobYear' },
-          { name: 'RealName', value: 'userInfo.UserInfoExtend.RealName' },
-          { name: 'NickName', value: 'userInfo.UserInfoExtend.NickName' },
-          { name: 'NameAndEmail', value: 'userInfo.UserInfoExtend.NameAndEmail' },
-          { name: 'Position', value: 'userInfo.UserInfoExtend.Position' },
-          { name: 'Department', value: 'userInfo.UserInfoExtend.Department' },
-          { name: 'EmployeeId', value: 'userInfo.UserInfoExtend.EmployeeId' },
-        ],
-      },
+      // {
+      //   name: 'UserInfoExtend',
+      //   value: 'userInfo.UserInfoExtend',
+      //   children: [
+      //     { name: 'Company', value: 'userInfo.UserInfoExtend.Company' },
+      //     { name: 'JobLevel', value: 'userInfo.UserInfoExtend.JobLevel' },
+      //     { name: 'JobNum', value: 'userInfo.UserInfoExtend.JobNum' },
+      //     { name: 'JobYear', value: 'userInfo.UserInfoExtend.JobYear' },
+      //     { name: 'RealName', value: 'userInfo.UserInfoExtend.RealName' },
+      //     { name: 'NickName', value: 'userInfo.UserInfoExtend.NickName' },
+      //     { name: 'NameAndEmail', value: 'userInfo.UserInfoExtend.NameAndEmail' },
+      //     { name: 'Position', value: 'userInfo.UserInfoExtend.Position' },
+      //     { name: 'Department', value: 'userInfo.UserInfoExtend.Department' },
+      //     { name: 'EmployeeId', value: 'userInfo.UserInfoExtend.EmployeeId' },
+      //   ],
+      // },
       { name: 'UserName', value: 'userInfo.UserName' },
       { name: 'Email', value: 'userInfo.Email' },
       { name: 'UserId', value: 'userInfo.UserId' },
@@ -143,9 +143,9 @@ function formatGlobalVariable() {
     (item as any).expression = expression;
     const completionProperty = new CompletionProperty(item as any);
     completionProperty.icon = 'literal';
-    if (item.children) {
+    if ((item as any).children ) {
       const children: LogicItem[] = [];
-      item.children.forEach((child) => {
+      (item as any).children.forEach((child:any) => {
         const childExpression = new MemberExpression({
           object: expression,
           property: new Identifier({ name: child.name }),

package/src/server/naslServer.ts

@@ -1590,10 +1590,12 @@ class NaslServer {
    * 是否符合 触发器规则
    * 规则：
    * 1. 入参仅有一个，且必须为string类型
+   * 2. 不允许有返回值
    */
   isTriggerRule(fileNode: BaseNode): boolean {
     const { sourceMap } = fileNode;
     let paramsLength = 0;
+    let returnLength = 0;
     let flag = true;
     sourceMap.forEach((_, k) => {
       if (k instanceof Param) {
@@ -1605,8 +1607,11 @@ class NaslServer {
           flag = false;
         }
       }
+      if (k instanceof Return)  {
+        returnLength ++;
+      }
     });
-    return paramsLength === 1 && flag;
+    return paramsLength === 1 && flag && returnLength === 0;
   }
 
   /**
@@ -2103,7 +2108,7 @@ class NaslServer {
         const diagnostic = {
           node: fileNode,
           severity: 'error',
-          message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用，该逻辑入参只有一个入参，且入参类型为string，否则会导致无法接收Kafka消息`,
+          message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用：该逻辑入参只有一个入参，入参类型为string；且不允许存在返回值。否则会导致无法接收Kafka消息`,
         };
         diagnostics.push(diagnostic);
       }

package/src/service/storage/init.ts

@@ -421,7 +421,7 @@ async function doAction(app: any, actionItem: any) {
   let hasBackEnd = false;
   const actionList: any[] = [];
   const allRiskList: any[] = [];
-  const { list, actionMsg, action } = actionItem || {};
+  const { list, actionMsg, action, extra} = actionItem || {};
   handleAIPoint(app, actionItem);
   const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
     const _l = getStatement(_i, app, diffArr);
@@ -683,6 +683,7 @@ async function doAction(app: any, actionItem: any) {
     }
     app._historyList.push({
       actionMsg,
+      extra: extra,
       list: list.map((item: any) => item?.originEvent),
     });
     app._historyIndex = app._historyList.length;
@@ -1000,6 +1001,7 @@ export interface ProxyApp extends App {
   _noTimer: NodeJS.Timeout;
   _actionMsg: string;
   _action: string;
+  _extra?: any;
   naslServer: NaslServer;
 }
 
@@ -1048,6 +1050,7 @@ export function handleApp(app: ProxyApp) {
     if (!proxyApp._isCollectingCount) {
       proxyApp._actionMsg = event?.actionMsg;
       proxyApp._action = event?.action;
+      proxyApp._extra = event?.extra;
     }
     proxyApp._isCollectingCount++;
   });
@@ -1066,6 +1069,7 @@ export function handleApp(app: ProxyApp) {
       const collectingList = proxyApp._collectingList;
       const actionMsg = proxyApp._actionMsg;
       const action = proxyApp._action;
+      const extra = proxyApp._extra;
       proxyApp._collectingList = [];
       proxyApp._actionMsg = '';
       proxyApp._action = '';
@@ -1079,6 +1083,7 @@ export function handleApp(app: ProxyApp) {
           list: collectingList,
           actionMsg,
           action,
+          extra
         });
       }
     } else if (proxyApp._isCollectingCount < 0) {