@lcap/nasl 0.3.13 → 0.3.14-beta

package/src/types/logic/translator.js

@@ -205,35 +205,42 @@ export default function (source) {
             if (node.type === 'CallLogic') {
                 if (node.calleeCode.startsWith('callInterface_')) {
                     const getParams = (key) => {
-                        // 过滤掉 null 的 param
-                        const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
-                        if (key === 'body') {
-                            let inBody = '';
-                            const bodyStr = [];
-                            nodeParams.filter((t) => t.callInterParamValue)
-                                .forEach((b) => {
-                                    const refTarget = Vertex.getVertexByRef(b.callInterParam);
-                                    if (refTarget.in === 'body') {
-                                        inBody = generateNode(b.callInterParamValue);
-                                    } else if (refTarget.in === '') {
-                                        bodyStr.push(`["${refTarget.name}"]: ${generateNode(b.callInterParamValue)}`);
-                                    }
-                                });
-
-                            return inBody || `{${bodyStr.join(',')}}`;
-                        } else {
-                            return nodeParams
-                                .filter((param) => {
-                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                                    return refTarget && refTarget.in === key;
-                                })
-                                .map((param) => {
-                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                                    const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
-                                    const value = generateNode(callInterParamValue);
-
-                                    return `${safeCodeAsKey(refTarget)}: ${value}`;
-                                });
+                        // 增加参数拼接日志信息
+                        try {
+                            // 过滤掉 null 的 param
+                            const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
+                            if (key === 'body') {
+                                let inBody = '';
+                                const bodyStr = [];
+                                nodeParams.filter((t) => t.callInterParamValue)
+                                    .forEach((b) => {
+                                        const refTarget = Vertex.getVertexByRef(b.callInterParam);
+                                        if (refTarget.in === 'body') {
+                                            inBody = generateNode(b.callInterParamValue);
+                                        } else if (refTarget.in === '') {
+                                            bodyStr.push(`["${refTarget.name}"]: ${generateNode(b.callInterParamValue)}`);
+                                        }
+                                    });
+
+                                return inBody || `{${bodyStr.join(',')}}`;
+                            } else {
+                                return nodeParams
+                                    .filter((param) => {
+                                        const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                        return refTarget && refTarget.in === key;
+                                    })
+                                    .map((param) => {
+                                        const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                        const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
+                                        const value = generateNode(callInterParamValue);
+
+                                        return `${safeCodeAsKey(refTarget)}: ${value}`;
+                                    });
+                            }
+                        } catch (error) {
+                            console.log('CallLogic calleeCode: ', node.calleeCode);
+                            console.log('params type: ', key);
+                            throw error;
                         }
                     };
                     const key = node.interfaceKey || node.callee || '';
@@ -264,30 +271,37 @@ export default function (source) {
                 const key = node.interfaceKey || '';
                 const arr = key.split('/');
                 const getParams = (key) => {
-                    // 过滤掉 null 的 param
-                    const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
-                    if (key === 'body') {
-                        const body = (nodeParams || []).find((param) => {
-                            const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                            return refTarget && refTarget.in === key;
-                        });
-                        if (body) {
-                            return generateNode(body.callInterParamValue);
-                        }
-                        return '{}';
-                    } else {
-                        return nodeParams
-                            .filter((param) => {
+                    // 增加参数拼接日志信息
+                    try {
+                        // 过滤掉 null 的 param
+                        const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
+                        if (key === 'body') {
+                            const body = (nodeParams || []).find((param) => {
                                 const refTarget = Vertex.getVertexByRef(param.callInterParam);
                                 return refTarget && refTarget.in === key;
-                            })
-                            .map((param) => {
-                                const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                                const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
-                                const value = generateNode(callInterParamValue);
-
-                                return `${safeCodeAsKey(refTarget)}: ${value}`;
                             });
+                            if (body) {
+                                return generateNode(body.callInterParamValue);
+                            }
+                            return '{}';
+                        } else {
+                            return nodeParams
+                                .filter((param) => {
+                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                    return refTarget && refTarget.in === key;
+                                })
+                                .map((param) => {
+                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                    const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
+                                    const value = generateNode(callInterParamValue);
+
+                                    return `${safeCodeAsKey(refTarget)}: ${value}`;
+                                });
+                        }
+                    } catch (error) {
+                        console.log('CallInterface interfaceKey: ', node.interfaceKey);
+                        console.log('params type: ', key);
+                        throw error;
                     }
                 };
 

package/src/types/typeCheck.ts

@@ -107,6 +107,10 @@ export default {
                 }
             }
 
+            if ((record as any)['test']) {
+                this.pushAll([(record as any)['test']], { processComponentId, logicId });
+            }
+
             if ((record as any)['right'] &&
                 (record as any)['right'].level === 'logicNode') {
                 this.pushAll([(record as any)['right']], { processComponentId, logicId });