GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

new(all): Vm isolated working with IPC BASIC 3.0;

Browse source
This commit is contained in:
rodrigorodriguez 2022-11-10 10:39:05 -03:00
parent 3bc100e37e
commit 80da54f789
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
packages/basic.gblib/services/GBVMService.ts
View file

@ -37,7 +37,6 @@ import * as fs from 'fs';
import { GBDeployer } from '../../core.gbapp/services/GBDeployer';
import { TSCompiler } from './TSCompiler';
import { CollectionUtil } from 'pragmatismo-io-framework';
import { DialogKeywords } from './DialogKeywords';
import { ScheduleServices } from './ScheduleServices';
import { GBConfigService } from '../../core.gbapp/services/GBConfigService';
//tslint:disable-next-line:no-submodule-imports
@ -51,15 +50,9 @@ const walkPromise = require('walk-promise');
const child_process = require('child_process');
const Path = require('path');
/**
* @fileoverview Virtualization services for emulation of BASIC.
* TODO: Upgrade from RegExp to http://www.rpatk.net/web/en/parsejavascript.php and
* generate JS code directly. Even if an attacker inject code, it won´t succeed
* due to very limited Node JS VM that is created for each result of the conversion.
* All business layer is running behind a REST HTTP API that was introduced in this 3.0 version.
* Decision was to priorize security(isolation) over a beautiful BASIC transpiler (to be done).
* @fileoverview Decision was to priorize security(isolation) and debugging,
* over a beautiful BASIC transpiler (to be done).
*/
/**
@ -184,8 +177,8 @@ export class GBVMService extends GBService {
// Removes comments.
basicCode = basicCode.replace(/((^|\W)REM.*\n)/gi, '');
basicCode = basicCode.replace(/((^|\W)\'.*\n)/gi, '');
basicCode = basicCode.replace(/^\s*REM.*/gim, '');
basicCode = basicCode.replace(/^\s*\'.*/gim, '');
// Process INCLUDE keyword to include another
// dialog inside the dialog.
@ -380,9 +373,9 @@ export class GBVMService extends GBService {
return `${$1} = await sys.executeSQL({data:${$1}, sql:"${sql}", tableName:"${tableName}"})\n`;
});
code = code.replace(/open\s*(.*)/gi, ($0, $1, $2) => {
code = code.replace(/^\s*open\s*(.*)/gi, ($0, $1, $2) => {
if (!$1.startsWith("\"") && $1.startsWith("\'")) {
if (!$1.startsWith("\"") && !$1.startsWith("\'")) {
$1 = `"${$1}"`;
}
const params = getParams($1, ['url', 'username', 'password']);

6
packages/core.gbapp/services/GBDeployer.ts
View file

@ -229,9 +229,9 @@ export class GBDeployer implements IGBDeployer {
instance.state = 'active';
instance.nlpScore = 0.8;
instance.searchScore = 0.45;
instance.whatsappServiceKey = bootInstance.whatsappServiceKey;
instance.whatsappServiceNumber = bootInstance.whatsappServiceNumber;
instance.whatsappServiceUrl = bootInstance.whatsappServiceUrl;
instance.whatsappServiceKey = null;
instance.whatsappServiceNumber = null;
instance.whatsappServiceUrl = null;
instance.params = JSON.stringify({ 'Can Publish': mobile, 'Admin Notify E-mail': email });
// Saves bot information to the store.