fix: ELECTRON-1264 (Fix ATS for localhost and update TLS version to 1.2) (#689)

* ELECTRON-1264 - Fix ATS for localhost and update tls version to 1.2

* ELECTRON-1264 - Remove extendInfo field from package.json
This commit is contained in:
Kiran Niranjan 2019-06-21 22:59:07 +05:30 committed by Vishwas Shashidhar
parent 9f6fb708fa
commit 355110cf72
4 changed files with 7 additions and 14 deletions

View File

@ -13,11 +13,6 @@
"position": "upper-right", "position": "upper-right",
"display": "" "display": ""
}, },
"crashReporter": {
"submitURL": "https://localhost:1127/post",
"companyName": "Symphony",
"uploadToServer": false
},
"customFlags": { "customFlags": {
"authServerWhitelist": "", "authServerWhitelist": "",
"authNegotiateDelegateWhitelist": "", "authNegotiateDelegateWhitelist": "",

View File

@ -3,6 +3,10 @@ import { logger } from '../common/logger';
import { getCommandLineArgs } from '../common/utils'; import { getCommandLineArgs } from '../common/utils';
import { config, IConfig } from './config-handler'; import { config, IConfig } from './config-handler';
// Set default flags
logger.info(`chrome-flags: Setting mandatory chrome flags`, { flag: { 'ssl-version-fallback-min': 'tls1.2' } });
app.commandLine.appendSwitch('ssl-version-fallback-min', 'tls1.2');
/** /**
* Sets chrome flags * Sets chrome flags
*/ */

View File

@ -38,7 +38,6 @@ export interface IConfig {
notificationSettings: INotificationSetting; notificationSettings: INotificationSetting;
permissions: IPermission; permissions: IPermission;
customFlags: ICustomFlag; customFlags: ICustomFlag;
crashReporter: ICrashReporter;
mainWinPos?: ICustomRectangle; mainWinPos?: ICustomRectangle;
} }
@ -58,12 +57,6 @@ export interface ICustomFlag {
disableGpu: boolean; disableGpu: boolean;
} }
export interface ICrashReporter {
submitURL: string;
companyName: string;
uploadToServer: boolean;
}
export interface INotificationSetting { export interface INotificationSetting {
position: string; position: string;
display: string; display: string;

View File

@ -178,7 +178,7 @@ export class WindowHandler {
constructor(opts?: Electron.BrowserViewConstructorOptions) { constructor(opts?: Electron.BrowserViewConstructorOptions) {
// Use these variables only on initial setup // Use these variables only on initial setup
this.config = config.getConfigFields([ 'isCustomTitleBar', 'mainWinPos', 'minimizeOnClose', 'notificationSettings' ]); this.config = config.getConfigFields([ 'isCustomTitleBar', 'mainWinPos', 'minimizeOnClose', 'notificationSettings' ]);
this.globalConfig = config.getGlobalConfigFields([ 'url', 'crashReporter' ]); this.globalConfig = config.getGlobalConfigFields([ 'url' ]);
this.windows = {}; this.windows = {};
this.isCustomTitleBar = isWindowsOS && this.config.isCustomTitleBar; this.isCustomTitleBar = isWindowsOS && this.config.isCustomTitleBar;
@ -190,7 +190,8 @@ export class WindowHandler {
try { try {
const extra = { podUrl: this.globalConfig.url, process: 'main' }; const extra = { podUrl: this.globalConfig.url, process: 'main' };
crashReporter.start({ ...this.globalConfig.crashReporter, extra }); const defaultOpts = { uploadToServer: false, companyName: 'Symphony', submitURL: '' };
crashReporter.start({ ...defaultOpts, extra });
} catch (e) { } catch (e) {
throw new Error('failed to init crash report'); throw new Error('failed to init crash report');
} }