@lcap/nasl 2.20.0-beta.2 → 2.20.0

package/src/generator/permission.ts

@@ -1,5 +1,5 @@
-import { Logic, View, BaseNode, CallLogic, ViewElement, BindEvent, BindAttribute, App, Entity, Module, Frontend } from '../concepts';
-import { processToTreeFragment } from '@nasl/server/process2LogicNamespace';
+import { Logic, View, BaseNode, CallLogic, ViewElement, BindEvent, BindAttribute, App, Entity, Module, Frontend, BindStyle, BindDirective } from "../concepts";
+import { processToTreeFragment } from '../server/process2LogicNamespace';
 
 type Usage = {
     node: BaseNode,
@@ -48,7 +48,7 @@ async function findViewLogicReferences(logic: Logic, vis: Set<Logic> = new Set()
     async function dfs(usage: Usage) {
         if (usage.node instanceof CallLogic) {
             const logic = usage.node.logic;
-            if (!vis.has(logic)) {
+            if (!vis.has(logic) && logic) {
                 vis.add(logic);
                 await findViewLogicReferences(logic, vis);
             }
@@ -78,7 +78,7 @@ async function findUIReferences(logic: Logic) {
 
     const res: Array<View | ViewElement> = [];
     function dfs(usage: Usage, parent: Usage = null) {
-        if ((usage.node instanceof BindEvent || usage.node instanceof BindAttribute)
+        if ((usage.node instanceof BindEvent || usage.node instanceof BindAttribute || usage.node instanceof BindStyle || usage.node instanceof BindDirective)
             && (parent.node instanceof View || parent.node instanceof ViewElement))
             res.push(parent.node);
 
@@ -160,7 +160,7 @@ function removeRedundantResourceData2(resources: ResourceNode[][]) {
     });
 }
 
-async function findResourcesOfLogic(logic: Logic) {
+async function findResourcesOfLogic(logic: Logic, uploaders: Map<string, ViewElement[]>) {
     const logics = await findViewLogicReferences(logic);
     logics.push(logic);
 
@@ -168,6 +168,12 @@ async function findResourcesOfLogic(logic: Logic) {
     for (const logic of logics) {
         UIs = UIs.concat(await findUIReferences(logic));
     }
+
+    const service = logic.toService() as { url: { method: string, path: string } };
+    if (uploaders.has(service.url.path)) {
+        UIs = UIs.concat(uploaders.get(service.url.path));
+    }
+
     UIs = Array.from(new Set(UIs));
 
     const res = UIs.map((ui) => findResourcesOfUI(ui));
@@ -233,29 +239,39 @@ function getAllLogics(app: App) {
     };
 }
 
+function findUploaders(app: App) {
+    const map = new Map<string, ViewElement[]>();
+    app.traverseChildren((node) => {
+        if (node instanceof ViewElement && node.tag?.includes('uploader')) {
+            const urlAttr = node.bindAttrs.find((item) => item.name === 'url');
+            const url = urlAttr?.value;
+            if (url) {
+                if (!map.has(url))
+                    map.set(url, [node]);
+                else
+                    map.get(url).push(node);
+            }
+        }
+    });
+    return map;
+}
+
 export async function genPermissionData(app: App) {
     // console.time('xxx');
     openCache();
     const logicPageResourceDtoList: { [key: string]: ResourceNode[][] } = {};
-    const resourceList: string[] = [];
-    const resourceDataList: { value: string, type: 'logic', description: string }[] = [];
     const { logics, processLogics } = getAllLogics(app);
+    const uploaders = findUploaders(app);
     for (const logic of [...logics, ...processLogics]) {
-        const resources = await findResourcesOfLogic(logic);
+        const resources = await findResourcesOfLogic(logic, uploaders);
         if (resources.length === 0)
             continue;
 
         const service = logics.includes(logic) ? logic.toService() : logic.toProcessService() as { url: { method: string, path: string } };
         const key = `${service.url.path}:${service.url.method}`;
         logicPageResourceDtoList[key] = resources;
-        resourceList.push(key);
-        resourceDataList.push({
-            value: key,
-            type: 'logic',
-            description: logic.description,
-        });
     }
     closeCache();
     // console.timeEnd('xxx');
-    return { logicPageResourceDtoList, resourceList, resourceDataList };
+    return logicPageResourceDtoList;
 }

package/src/server/entity2LogicNamespace.ts

@@ -138,26 +138,6 @@ export function entity2LogicNamespace(entity: Entity) {
                         }),
                         required: true,
                     }),
-                    new Param({
-                        name: 'properties',
-                        defaultExpression: new AnonymousFunction({
-                            description: '',
-                            params: [
-                                new Param({
-                                    name: 'item',
-                                    typeAnnotation: new TypeAnnotation({
-                                        typeKind: 'reference',
-                                        typeNamespace: entity.getNamespace(),
-                                        typeName: entity.name,
-                                    }),
-                                }),
-                            ],
-                            body: new NewList({
-                                concept: 'NewList',
-                            }),
-                        }),
-                        required: false,
-                    }),
                 ],
                 body: [],
                 returns: [
@@ -181,6 +161,7 @@ export function entity2LogicNamespace(entity: Entity) {
                             name: 'filter',
                             description: '',
                             params: [
+                                // 实体的 updateBy、deleteBy 方法的 filter 参数后端要求使用 _ 变量名，类型为本实体
                                 new Param({
                                     name: '_',
                                     typeAnnotation: new TypeAnnotation({
@@ -246,6 +227,7 @@ export function entity2LogicNamespace(entity: Entity) {
                             name: 'filter',
                             description: '',
                             params: [
+                                // 实体的 updateBy、deleteBy 方法的 filter 参数后端要求使用 _ 变量名，类型为本实体
                                 new Param({
                                     name: '_',
                                     typeAnnotation: new TypeAnnotation({

package/src/server/extendBaseNode.ts

@@ -87,7 +87,10 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
          */
         const res = naslServer._renamePrepare(this, refsList, newValue);
         if (res.length <= 1) {
-            (this as SetNameNode).setName(newValue);
+            if (this.concept === 'enumItem') {
+                (this as any).setValue(newValue);
+            } else
+                (this as SetNameNode).setName(newValue);
         } else {
             const callback = (value: boolean) => {
                 if (value) {
@@ -208,7 +211,11 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                         App.emit('collect:end');
                     } else {
                         this.delete();
+                        if (node instanceof Frontend) {
+                            return;
+                        }
                     }
+                    return;
                 } else {
                     if (node instanceof Frontend) {
                         let viewPath = (this as FileNode).getEmbeddedFilePath();
@@ -226,7 +233,6 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                                 }
                                 return null;
                             }).filter((record) => !!record);
-                        console.log(result);
                         const App = this.rootNode;
                         App.emit('collect:start', {
                             actionMsg: `删除端${node.name}`,
@@ -256,7 +262,11 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                             return null;
                         const minRange: MinRange = naslServer._findMinRange(record, fileNode as FileNode);
                         if (minRange) {
-                            if (minRange.node instanceof CallLogic || minRange.node instanceof Destination) {
+                            /**
+                             * 调用方是 调用逻辑或者跳转页面， 去删除对应位置的内容
+                             * 如果是跳转页面，因为流程下的特殊翻译，需要过滤下 非页面下的参数修改，查找到页面跳转
+                             */
+                            if (minRange.node instanceof CallLogic || (node.parentNode instanceof View && minRange.node instanceof Destination)) {
                                 minRange.node.deleteCalleeArg(Index);
                             }
                         }
@@ -365,14 +375,14 @@ BaseNode.prototype.addParamsPrepare = async function addParamsPrepare(needAdd =
 /**
  * 在原型上增加方法来调用
  */
-BaseNode.prototype.getCurrentTypeAnnotation = async function getCurrentTypeAnnotation() {
+BaseNode.prototype.getCurrentTypeAnnotation = async function getCurrentTypeAnnotation(outTime? :number) {
     try {
         /**
          * 查找这个节点是不是有依赖
          */
         const app = this.getAncestor('App');
         const naslServer = (app as any).naslServer as NaslServer;
-        return naslServer.getCurrentTypeAnnotation(this);
+        return naslServer.getCurrentTypeAnnotation(this, outTime || 2000);
     } catch (err) {
         console.log(err);
     }

package/src/server/formatTsUtils.ts

@@ -1,4 +1,4 @@
-import { BaseNode, Identifier, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty, Param, MemberExpression, CompletionProperty, Variable, Return, Logic } from '..';
+import { BaseNode, Identifier, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty, Param, MemberExpression, CompletionProperty, Variable, Return, Logic, ConfigProperty } from '..';
 import { getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 interface variableItem {
@@ -29,6 +29,11 @@ function formatTs2TypeString(displayParts: Array<{ text: string; kind: string }>
     });
     return str;
 }
+
+function isValidName(str: string) {
+    const regex = /^[a-zA-Z][a-zA-Z0-9_]*$/;
+    return regex.test(str);
+}
 /**
  * 解析 Completion 和 QuickInfo 的 displayString
  * 生成 TypeAnnotation
@@ -45,16 +50,19 @@ export function type2TypeAnnotation(oldType: Array<any> | {}): TypeAnnotation {
     let typeAnnotation: TypeAnnotation;
     try {
         const { typeName, typeNamespace, typeArguments, typeKind, properties } = type as any;
-        if (typeKind === 'anonymousStructure' && Array.isArray(properties) && properties.length) {
+        if (typeKind === 'anonymousStructure') {
             // 自定义类型
             const newProperties: StructureProperty[] = [];
-            properties.forEach((item) => {
-                if (!item?.name?.startsWith('__')) {
-                    const itemType = type2TypeAnnotation(item.typeInfo);
-                    const structureProperty = StructureProperty.from({ name: item.name, typeAnnotation: itemType }, typeAnnotation, 'properties');
-                    newProperties.push(structureProperty);
-                }
-            });
+            if (Array.isArray(properties) && properties.length) {
+                properties.forEach((item) => {
+                    if (!item?.name?.startsWith('__')) {
+                        // 如果没有获取到类型，就默认塞一个string
+                        const itemType = type2TypeAnnotation(item.typeInfo) || TypeAnnotation.createPrimitive('String');
+                        const structureProperty = StructureProperty.from({ name: item.name, typeAnnotation: itemType }, typeAnnotation, 'properties');
+                        newProperties.push(structureProperty);
+                    }
+                });
+            }
             typeAnnotation = TypeAnnotation.createTypeAnonymousStructure(newProperties);
         } else if (!typeName || typeName === 'Promise' || typeName === 'nasl' || typeName === '___IDENTIFIER__') {
             return null;
@@ -225,7 +233,7 @@ export function getPlatformType(type: string): string {
     return tsType;
 }
 export function isNoChildType(type: String) {
-    return type?.startsWith('nasl.core') || type?.startsWith('app.enums');
+    return (type?.startsWith('nasl.core') && !['String', 'Text', 'Email'].includes(type.split('.')[2])) || type?.startsWith('app.enums');
 }
 function findNode(typeKey: string, node: BaseNode) {
     let newType: Structure | Logic;
@@ -327,6 +335,11 @@ function getAStructureScopeType(type: string, parent: any, node: BaseNode) {
                         if (typeKey && typeKey.startsWith('dataSources')) {
                             typeKey = 'app.' + typeKey;
                         }
+                        // 如果ls传过来的名字是不合法的就隐藏
+                        if (!isValidName(name)) {
+                            console.warn(item, '获取变量不展示');
+                            return null;
+                        }
                         res.push({
                             name,
                             typeKey,
@@ -644,3 +657,21 @@ export function formatFrontEndVariables(frontEndVariables: Array<Variable>) {
     });
     return result;
 }
+
+export function formatConfigProperties(configProperties: Array<ConfigProperty>) {
+    const result = configProperties.map((item) => {
+        const namespace = item.getNamespace();
+        const newItem: any = {
+            name: item.name,
+            value: item.name,
+            expression: new Identifier({
+                name: item.name,
+                namespace,
+            }),
+            icon: 'configProperty',
+            calleewholeKey: item.calleewholeKey,
+        };
+        return newItem;
+    });
+    return result;
+}

package/src/server/getLogics.ts

@@ -57,9 +57,9 @@ function iterator(tree: FakeNode | FakeProcessNode, searchContent: string, fakeN
 function toHump(name: string): string {
     return name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase());
 }
-export async function getLogics(node: CallLogic | BindEvent| Identifier, needAllLogic: boolean = true) {
+export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic, needAllLogic: boolean = true) {
     const app = node.rootNode as App;
-    if (node.concept === 'CallLogic' || node.concept === 'BindEvent') {
+    if (node.concept === 'CallLogic' || node.concept === 'BindEvent' || node.concept === 'Logic') {
         const result = [];
 
         if (needAllLogic) {
@@ -202,7 +202,7 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier, needAll
                     new Namespace({
                         name: 'category',
                         path: `configuration`,
-                        title: '配置',
+                        title: '应用信息',
                         logics: stdlibNamespace.findChild('configuration').logics,
                         expanded: false,
                     }),
@@ -243,7 +243,7 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier, needAll
                     new Namespace({
                         name: 'category',
                         path: `configuration`,
-                        title: '配置',
+                        title: '应用信息',
                         logics: stdlibNamespace.findChild('configuration').logics.filter((item) => item.name !== 'getCurrentIp'),
                         expanded: false,
                     }),

package/src/server/getMemberIdentifier.ts

@@ -1,5 +1,5 @@
 import { BaseNode, CompletionProperty, App, Variable, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute, LogicItem, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty, Frontend, View } from '..';
-import { formatVariableData, formatFrontEndVariables } from './formatTsUtils';
+import { formatVariableData, formatFrontEndVariables, formatConfigProperties } from './formatTsUtils';
 
 // 简单实现一版本的格式化nums
 export function formatEnums(enums: Array<Enum>) {
@@ -274,3 +274,29 @@ export async function getSelectNextCompletionData(node: Identifier, completionPr
         return completionData;
     }
 }
+
+// 获取枚举
+export function getConfigsIdentifier(node: BaseNode): CompletionProperty[] {
+    const app = node.rootNode as App;
+    const groups = app?.configuration.groups;
+    const customGroup = groups.find((group) => group.name === 'custom');
+    const properties = customGroup ? customGroup.properties : [];
+    const newProperties = formatConfigProperties(properties);
+    // 添加依赖库的枚举选择
+    const modules = app?.dependencies?.filter((module) => module.type === 'extension') || [];
+    const extensionConfigProperties: any[] = [];
+    modules.forEach((module) => {
+        const groups = module?.configuration?.groups || [];
+        const customGroup = groups.find((group) => group.name === 'custom');
+        const properties = customGroup ? customGroup.properties : [];
+        if (properties.length) {
+            extensionConfigProperties.push({
+                name: module.name,
+                concept: 'Module',
+                icon: 'depend-dataSource',
+                children: formatConfigProperties(properties),
+            });
+        }
+    });
+    return newProperties.concat(extensionConfigProperties);
+}

package/src/server/index.ts

@@ -11,6 +11,7 @@ import {
     getGlobalVariableIdentifier,
     getLiteralsIdentifier,
     getSelectNextCompletionData,
+    getConfigsIdentifier,
 } from './getMemberIdentifier';
 import { NaslServer as NaslServerClass } from './naslServer';
 import './extendBaseNode';
@@ -35,6 +36,7 @@ const server: any = {
     getAllComponentEventMap,
     getLogging,
     displayString2TypeAnnotation,
+    getConfigsIdentifier,
 };
 export default server;
 export const NaslServer = NaslServerClass;