@lcap/nasl 2.20.1-beta.2 → 2.20.1-beta.3

package/src/automate/upgrader/2.20.js

@@ -21,6 +21,7 @@ const excludedKeySet = new Set([
 export function replace(script) {
     script = script.replace('execTemplate = function(app,', 'execTemplate = function(app, frontend, ');
     script = script.replace('_uniqueName.initAppUniqueNames(app);', '_uniqueName.initAppUniqueNames(app, frontend);');
+    script = script.replace('_addModule(app', '_addModule(app, frontend');
     return script;
 }
 

package/src/concepts/CallInterface__.ts

@@ -61,8 +61,6 @@ export class CallInterface extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -76,13 +74,6 @@ export class CallInterface extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallInterface;
     }
 
-    
-    
-
-    
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -115,8 +106,6 @@ export class CallInterface extends LogicItem {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -139,8 +128,6 @@ export class CallInterface extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -160,8 +147,6 @@ export class CallInterface extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -185,9 +170,6 @@ export class CallInterface extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -195,7 +177,7 @@ export class CallInterface extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
@@ -227,6 +209,38 @@ export class CallInterface extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    async deleteCallNode() {
+        // 计算之前选择的接口的引用次数
+        if (this.calleeKey !== '__IDENTIFIER__') {
+            const oldItf = this.getCallNode();
+            if (oldItf) {
+                let refCount = 0;
+                let isSelfRef = false;
+                // 选择无变化时
+
+                const refs = await oldItf.findUsage();
+                refs.forEach((val: any) => {
+                    const loopFindNode = (item: any) => {
+                        if (item.children) {
+                            item.children.forEach((child: any) => loopFindNode(child));
+                        } else {
+                            refCount++;
+                            if (item.node === this) {
+                                isSelfRef = true;
+                            }
+                        }
+                    };
+                    loopFindNode(val);
+                });
+
+                // 仅被自己引用则删除
+                if (isSelfRef && refCount === 1) {
+                    oldItf.delete();
+                }
+            }
+        }
+    }
+
     get tsCalleeNamespace() {
         if (this.calleeNamespace) {
             let tsCalleeNamespace = this.calleeNamespace;
@@ -550,7 +564,7 @@ export class CallInterface extends LogicItem {
         const node = this.getCallNode();
         let logicParam: InterfaceParam[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/CallLogic__.ts

@@ -567,7 +567,7 @@ export class CallLogic extends LogicItem {
 
         const node = this.getCallNode();
         let logicParam: Param[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {
@@ -1041,7 +1041,7 @@ export class CallLogic extends LogicItem {
         const node = this.getCallNode();
         let logicParam: Param[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/Destination__.ts

@@ -353,7 +353,7 @@ export class Destination extends LogicItem {
             if (Array.isArray(completeArguments) && completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLen = logicParam.length;
@@ -407,7 +407,7 @@ export class Destination extends LogicItem {
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -447,7 +447,7 @@ export class Destination extends LogicItem {
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -488,7 +488,7 @@ export class Destination extends LogicItem {
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -668,7 +668,7 @@ export class Destination extends LogicItem {
 
         const node = this.viewNode;
         let logicParam: Param[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         const logicParamLength = logicParam.length;
@@ -759,7 +759,7 @@ export class Destination extends LogicItem {
         const node = this.viewNode;
         let logicParam: Param[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/Interface__.ts

@@ -2,6 +2,7 @@ import { TranslatorState, shiftState, withSourceMap, createCompilerState } from
 import Namespace from './Namespace__';
 import TypeAnnotation from './TypeAnnotation__';
 import Structure from './Structure__';
+import Param from './Param__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -133,7 +134,7 @@ export class Interface extends BaseNode {
         });
     }
 
-        getInterfaceParamUniqueName(name = 'interfaceParam1') {
+    getInterfaceParamUniqueName(name = 'interfaceParam1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
@@ -270,7 +271,6 @@ export class Interface extends BaseNode {
         return node;
     }
 
-
     getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -408,9 +408,6 @@ export class Interface extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除接口参数
     * @param name 接口参数名称
@@ -459,8 +456,6 @@ export class Interface extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -514,6 +509,18 @@ export class Interface extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    /**
+     * 协议
+     */
+    // @property()
+    // protocol: string = undefined;
+
+    /**
+     * 协议参数列表
+     */
+    // @property('Param')
+    // protocolParams: Array<Param> = [];
+
     /**
      * 是否可编辑
      * */
@@ -545,6 +552,21 @@ export class Interface extends BaseNode {
         });
     }
 
+    // 更新所有调用接口
+    async updateAllRefCallInterface() {
+        const refs = await this.findUsage();
+        refs.forEach((val: any) => {
+            const loopFindNode = (item: any) => {
+                if (item.children) {
+                    item.children.forEach((i: any) => loopFindNode(i));
+                } else {
+                    item.node.setCallee(this);
+                }
+            };
+            loopFindNode(val);
+        });
+    }
+
     /* 删除空数据模块 */
     deleteLogincAndModule() {
         this.rootNode.emit('collect:start', {
@@ -823,6 +845,36 @@ export class Interface extends BaseNode {
         return [...this.params, ...this.returns].filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
 
+    // 递归找出 response/request 的 Body/Returns 引用的数据结构
+    getRefStructures(structures: Structure[] = []): Set<Structure> {
+        const structuresSet: Set<Structure> = new Set();
+        const loopSaveStructure = (typeAnnotation: TypeAnnotation) => {
+            if (!typeAnnotation)
+                return;
+            if (typeAnnotation.typeKind === 'reference') {
+                const targetStructure = structures.find((s) => s.name === typeAnnotation.typeName);
+                if (targetStructure && !structuresSet.has(targetStructure)) {
+                    structuresSet.add(targetStructure);
+                    targetStructure?.properties.forEach((prop) => {
+                        loopSaveStructure(prop.typeAnnotation);
+                    });
+                }
+            } else if (typeAnnotation.typeKind === 'generic') {
+                typeAnnotation.typeArguments.forEach(loopSaveStructure);
+            }
+        };
+
+        const { params = [], returns = [] } = this;
+        [...params, ...returns].forEach((p) => {
+            if ('in' in p && p.in === 'cookie') {
+                p.in = 'header';
+                return;
+            }
+            loopSaveStructure(p?.typeAnnotation);
+        });
+        return structuresSet;
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/OqlQueryComponent__.ts

@@ -339,6 +339,8 @@ export class OqlQueryComponent extends LogicItem {
                 },
             }).then((res: any) => {
                 this.codeSourceMap = res || { typescript: '', lexicalErrorCode: 1001 };
+            }).catch(() => {
+                this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
             });
         } else {
             this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };

package/src/concepts/Param__.ts

@@ -302,7 +302,7 @@ export class Param extends BaseNode {
                   parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
               }
           }
-          code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
+          code += `${this.name} !== undefined ? ${this.name} : (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
 
           if (needGenInitFromSchema) {
               code += `)`;

package/src/server/getMemberIdentifier.ts

@@ -150,8 +150,11 @@ function getCurrentLogic(node: BaseNode,
         expanded: boolean;
         icon: string;
     }[]) {
-    // 只有data-source可以
-    if (node instanceof Identifier && node.parentNode instanceof BindAttribute && (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file')) {
+    // 只有data-source check-file可以
+    if (
+        (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file'))
+        || (node instanceof Identifier && node.parentNode instanceof BindAttribute && (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file'))
+    ) {
         const view = node.view;
         const viewLogics = view.logics;
         const logicVariable = viewLogics.map((item) => {

package/src/server/naslServer.ts

@@ -214,6 +214,9 @@ export class NaslServer {
                 if (data && data.event === 'publishDiagnostics') {
                     const records = await this._resolveDiagnosticRecords(data.records);
                     this.diagnosticManager.pushAll(records);
+                    try {
+                        invokeCommand('naslServer:nodeChange');
+                    } catch (e) { console.log('no "naslServer:nodeChange" event received'); }
                 }
             },
         });
@@ -1793,10 +1796,14 @@ export class NaslServer {
                         'nasl.collection.Map<nasl.core.String, nasl.core.Text>',
                         'nasl.collection.Map<nasl.core.String, nasl.core.Email>',
                     ];
+                    const excludeList2 = [
+                        'nasl.collection.List<>',
+                        'nasl.collection.List<T>',
+                    ];
                     // 先特殊处理等 类型合并后就可以去掉了
                     if (excludeList.includes(leftType.sortedTypeKey) && excludeList.includes(rightType.sortedTypeKey)) {
                         return null;
-                    } else if (['nasl.collection.List<>'].includes(leftType.sortedTypeKey) || ['nasl.collection.List<>'].includes(rightType.sortedTypeKey)) {
+                    } else if (excludeList2.includes(leftType.sortedTypeKey) || excludeList2.includes(rightType.sortedTypeKey)) {
                         return null;
                     }
                     const diagnostic = {

package/src/service/creator/add.configs.js

@@ -22,6 +22,9 @@ function httpCode(response, params, requestInfo) {
 }
 
 function shortResponse(response, params, requestInfo) {
+    if(params === false)
+        return response;
+
     if (response.data && response.data.result !== undefined) {
         return response.data.result;
     } else {

package/src/service/creator/errHandles.js

@@ -32,6 +32,12 @@ export default {
             return;
         }
 
+        // 检测到当前应用已在新 tab 页打开
+        if(err.code === 500502) {
+            eventBus.emit('multiTabOpened');
+            return;
+        }
+
         if (versionStatus[err.code])
             eventBus.emit('updateVersionStatus', {
                 status: versionStatus[err.code],

package/src/service/creator/index.js

@@ -48,6 +48,9 @@ const requester = function (requestInfo) {
         withCredentials: !baseURL,
     };
 
+    if(config.timeout)
+        requestOptions.timeout = config.timeout;
+        
     if (aslConfig.debugRequestAll || (aslConfig.debugRequest && requestOptions.method !== 'GET')) {
         console.debug('[Request Debug]', requestOptions);
     }

package/src/service/storage/api.js

@@ -11,4 +11,16 @@ export default {
             path: '/proxy/nasl-storage/api/storage/batchAction',
         },
     },
+    batchInstruct: {
+        url: {
+            method: 'post',
+            path: '/proxy/nasl-storage/api/storage/batchInstruct',
+        },
+    },
+    saveFrontendNasl: {
+        url: {
+            method: 'post',
+            path: '/proxy/nasl-storage/api/storage/saveFrontendNasl',
+        },        
+    },
 };