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

fix(core.gbapp): Security enhancements and fixes.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2020-01-09 15:28:11 -03:00
parent 5bf7a0a208
commit c51ff7a78f
5 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.js
View file

@ -24,7 +24,7 @@ var now = () => {
try { try {
var run = () => { var run = () => {
console.log(`[GB Runtime] Now starting General Bots Server...`); console.log(`[GB Runtime] Initializing General Bots Server...`);
const GBServer = require("./dist/src/app").GBServer const GBServer = require("./dist/src/app").GBServer
console.log(`[GB Runtime] ${now()} - Running '${GBServer.name}' on '${__dirname}' directory`); console.log(`[GB Runtime] ${now()} - Running '${GBServer.name}' on '${__dirname}' directory`);
process.env.PWD = __dirname; process.env.PWD = __dirname;

1
package.json
View file

@ -106,7 +106,6 @@
"@types/winston": "2.4.4", "@types/winston": "2.4.4",
"ban-sensitive-files": "1.9.2", "ban-sensitive-files": "1.9.2",
"commitizen": "^4.0.3", "commitizen": "^4.0.3",
"coveralls": "^3.0.9",
"cz-conventional-changelog": "^3.0.2", "cz-conventional-changelog": "^3.0.2",
"dependency-check": "^4.1.0", "dependency-check": "^4.1.0",
"git-issues": "1.3.1", "git-issues": "1.3.1",

32
packages/azuredeployer.gbapp/services/AzureDeployerService.ts
View file

@ -332,12 +332,21 @@ export class AzureDeployerService implements IGBInstallationDeployer {
const storageClient = new SqlManagementClient(credentials, subscriptionId); const storageClient = new SqlManagementClient(credentials, subscriptionId);
const ip = await publicIp.v4(); const ip = await publicIp.v4();
const params = { let params = {
startIpAddress: ip, startIpAddress: ip,
endIpAddress: ip endIpAddress: ip
}; };
await storageClient.firewallRules.createOrUpdate(groupName, serverName, 'gb', params); await storageClient.firewallRules.createOrUpdate(groupName, serverName, 'gb', params);
// AllowAllWindowsAzureIps must be created that way, so the Azure Search can
// access SQL Database to index its contents.
params = {
startIpAddress: '0.0.0.0',
endIpAddress: '0.0.0.0'
};
await storageClient.firewallRules.createOrUpdate(groupName, serverName, 'AllowAllWindowsAzureIps', params);
} }
public async deployFarm( public async deployFarm(
@ -358,6 +367,15 @@ export class AzureDeployerService implements IGBInstallationDeployer {
GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`); GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`);
await this.createDeployGroup(name, instance.cloudLocation); await this.createDeployGroup(name, instance.cloudLocation);
GBLog.info(`Deploying NLP...`);
const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation);
keys = await this.cognitiveClient.accounts.listKeys(name, nlp.name);
const nlpAppId = await this.createNLPService(name, name, instance.cloudLocation, culture, instance.nlpAuthoringKey);
instance.nlpEndpoint = urlJoin(nlp.endpoint, 'apps');
instance.nlpKey = keys.key1;
instance.nlpAppId = nlpAppId;
GBLog.info(`Deploying Bot Server...`); GBLog.info(`Deploying Bot Server...`);
const serverFarm = await this.createHostingPlan(name, `${name}-server-plan`, instance.cloudLocation); const serverFarm = await this.createHostingPlan(name, `${name}-server-plan`, instance.cloudLocation);
const serverName = `${name}-server`; const serverName = `${name}-server`;
@ -406,17 +424,9 @@ export class AzureDeployerService implements IGBInstallationDeployer {
instance.textAnalyticsEndpoint = textAnalytics.endpoint.replace(`/text/analytics/v2.0`, ''); instance.textAnalyticsEndpoint = textAnalytics.endpoint.replace(`/text/analytics/v2.0`, '');
instance.textAnalyticsKey = keys.key1; instance.textAnalyticsKey = keys.key1;
if (false) {
GBLog.info(`Deploying NLP...`); // NLP
const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation);
keys = await this.cognitiveClient.accounts.listKeys(name, nlp.name);
const nlpAppId = await this.createNLPService(name, name, instance.cloudLocation, culture, instance.nlpAuthoringKey);
instance.nlpEndpoint = nlp.endpoint; // TODO: Add this final URL /apps/a149dae1-5134-4624-96b5-885e9e674c9e
instance.nlpKey = keys.key1;
instance.nlpAppId = nlpAppId;
}
GBLog.info(`Deploying Bot...`); GBLog.info(`Deploying Bot...`);
instance.botEndpoint = this.defaultEndPoint; instance.botEndpoint = this.defaultEndPoint;

2
packages/core.gbapp/services/GBMinService.ts
View file

@ -297,7 +297,7 @@ export class GBMinService {
instanceId: instance.instanceId, instanceId: instance.instanceId,
botId: botId, botId: botId,
theme: theme, theme: theme,
secret: instance.webchatKey, webchatToken: webchatToken,
speechToken: speechToken, speechToken: speechToken,
conversationId: webchatToken.conversationId, conversationId: webchatToken.conversationId,
authenticatorTenant: instance.authenticatorTenant, authenticatorTenant: instance.authenticatorTenant,

2
packages/default.gbui/src/GBUIApp.js
View file

@ -173,7 +173,7 @@ class GBUIApp extends React.Component {
window['botchatDebug'] = true; window['botchatDebug'] = true;
const line = new DirectLine({ const line = new DirectLine({
secret: this.state.instanceClient.secret token: this.state.instanceClient.token
}); });
line.connectionStatus$.subscribe(connectionStatus => { line.connectionStatus$.subscribe(connectionStatus => {