@lcap/nasl 0.3.10 → 0.3.11

package/src/types/logic/translator.js

@@ -1,5 +1,4 @@
-import generate from '@babel/generator';
-import { Vertex } from '..';
+import { Vertex, utils } from '..';
 
 function switchCase2If(cases) {
     const cas = cases.shift();
@@ -9,7 +8,13 @@ function switchCase2If(cases) {
         test: cas.test,
         consequent: {
             type: 'BlockStatement',
-            body: cas.consequent || [],
+            body: [
+                {
+                    type: 'CallConsoleInfo',
+                    content: 'SWITCHCASE',
+                },
+                ...cas.consequent || [],
+            ],
         },
         alternate: null,
     };
@@ -19,7 +24,13 @@ function switchCase2If(cases) {
     } else {
         return {
             type: 'BlockStatement',
-            body: cas.consequent || [],
+            body: [
+                {
+                    type: 'CallConsoleInfo',
+                    content: 'SWITCHDEFAULT',
+                },
+                ...cas.consequent || [],
+            ],
         };
     }
 
@@ -27,6 +38,7 @@ function switchCase2If(cases) {
 }
 
 export default function (source) {
+    const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
     const definition = typeof source === 'string' ? JSON.parse(source) : source;
 
     function traverse(node, func, parent, index) {
@@ -459,6 +471,13 @@ export default function (source) {
                 return `${newLine()}console.log(${generateNode(node.arguments[0])})${colon()}${newLine()}`;
             }
 
+            if (node.type === 'CallConsoleInfo') {
+                if (isGONGHANG) {
+                    return `console.info("${node.content}")${colon()}`;
+                }
+                return '';
+            }
+
             if (node.type === 'Destination') {
                 const params = (node.params || [])
                     .filter((param) => param.pageParamKey && param.pageParamKeyValue)
@@ -479,16 +498,27 @@ export default function (source) {
                 if (Array.isArray(node.consequent)) {
                     node.consequent = {
                         type: 'BlockStatement',
-                        body: node.consequent,
+                        body: [
+                            {
+                                type: 'CallConsoleInfo',
+                                content: 'IF',
+                            },
+                            ...node.consequent,
+                        ],
                     };
                 }
-                if (Array.isArray(node.alternate)) {
+                if (Array.isArray(node.alternate) && node.alternate.length > 0) {
                     node.alternate = {
                         type: 'BlockStatement',
-                        body: node.alternate,
+                        body: [
+                            {
+                                type: 'CallConsoleInfo',
+                                content: 'ELSE',
+                            },
+                            ...node.alternate,
+                        ],
                     };
                 }
-
                 let alternateScript = '';
                 if (node.alternate) {
                     alternateScript = generateNode(node.alternate);
@@ -597,13 +627,10 @@ export default function (source) {
             script += `${generateNode(node, index)}${newLine()}`;
         });
 
-        // console.info("JSON generate:", JSON.stringify(logic.body));
-        // console.log(generate({ type: 'Program', body: logic.body }).code);
-
         return `methods['${logic.name}'] = async function (${logic.params.map((param) => param.name).join(', ')}) {
-            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`).join('\n') + '' : ''}
-            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`).join('\n') + '' : ''}
-            let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});
+            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});` + (isGONGHANG ? `console.info(${param.name})` : '')).join('\n') + '' : ''}
+            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});` + (isGONGHANG ? `console.info(${variable.name})` : '')).join('\n') + '' : ''}
+            let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});` + (isGONGHANG ? `console.info(${returnObj.name})` : '') + `
             ${script}
         }`;
     });

package/src/types/logic/translator_backup.js

@@ -1,8 +1,6 @@
 import generate from '@babel/generator';
 import * as babel from '@babel/core';
-import { TransforClientQuery as genQuery } from 'apollo-plugin-loader';
-import { Vertex, vertexesMap, utils } from '..';
-import { getQuerySchemaMap } from './tools';
+import { Vertex, utils } from '..';
 
 function switchCase2If(cases) {
     const cas = cases.shift();
@@ -81,9 +79,7 @@ export default function (source) {
         } else if (node.type === 'MemberExpression') {
             return checkThis(node.object);
         } else if (node.type === 'CallExpression') {
-            (node.arguments || []).forEach((arg) => {
-                return checkThis(arg);
-            });
+            (node.arguments || []).forEach((arg) => checkThis(arg));
         }
     }
     function safeGenerate(node) {
@@ -586,7 +582,7 @@ export default function (source) {
                         const jsBlock_${index} = async () => {
                             ${node.code}
                         }
-                    
+
                         await jsBlock_${index}();
                     }`,
                         {
@@ -600,16 +596,9 @@ export default function (source) {
             }
         });
 
-        // console.info("JSON generate:", JSON.stringify(logic.body));
-        // console.log(generate({ type: 'Program', body: logic.body }).code);
-
         return `methods['${logic.name}'] = async function (${logic.params.map((param) => param.name).join(', ')}) {
-            ${logic.params.length ? logic.params.map((param) => {
-        return `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`;
-    }).join('\n') + '' : ''}
-            ${logic.variables.length ? logic.variables.map((variable) => {
-        return `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`;
-    }).join('\n') + '' : ''}
+            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`).join('\n') + '' : ''}
+            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`).join('\n') + '' : ''}
             let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});
             ${generate({ type: 'Program', body: logic.body }).code}
         }`;

package/src/types/nuims/Nuims.ts

@@ -17,7 +17,7 @@ interface RoleItem extends Role {
     toggling?: Boolean,
 }
 
-interface Permission{
+interface Permission {
     DomainName: string,
     PermissionId: string,
     PermissionValue: string,
@@ -79,7 +79,7 @@ export class Nuims {
         }
     }
 
-    async getInitRoles() {
+    async getInitRoles(auto: unknown) {
         let isCreated = false;
         let resource = await this.getResource();
         if (!resource) {
@@ -99,9 +99,15 @@ export class Nuims {
                 await this.bindRolesAndPermissions(role, permission);
             }
             roleName2Permission.set(role.RoleName, permission);
-            // 创建 /dashboard 资源时自动关联 DEV-AdminRole 权限
-            if (isCreated && (ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
-                await this.attachPermissionResourceAction();
+            if (auto) {
+                if ((ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
+                    await this.attachPermissionResourceAction();
+                }
+            } else {
+                // 创建 /dashboard 资源时自动关联 DEV-AdminRole 权限
+                if (isCreated && (ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
+                    await this.attachPermissionResourceAction();
+                }
             }
             roleItem.permission = permission;
             const resources = await this.getResourcesFromPermission(permission);