phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-45031] Don't use infinite background retry logic when the certificate is invalid (#2153)

Browse Source
This commit is contained in:
Devin Binnie
2022-06-15 09:22:21 -04:00
committed by GitHub
parent 537ed1dd0c
commit 0c5b612489
4 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/views/MattermostView.test.js
View File

@@ -97,6 +97,17 @@ describe('main/views/MattermostView', () => {
expect(mattermostView.view.webContents.loadURL).toBeCalledWith('http://server-1.com/', expect.any(Object));
expect(mattermostView.loadRetry).toBeCalledWith('http://server-1.com/', error);
});
it('should not retry when failing to load due to cert error', async () => {
const error = new Error('test');
error.code = 'ERR_CERT_ERROR';
const promise = Promise.reject(error);
mattermostView.view.webContents.loadURL.mockImplementation(() => promise);
mattermostView.load('a-bad<url');
await expect(promise).rejects.toThrow(error);
expect(mattermostView.view.webContents.loadURL).toBeCalledWith('http://server-1.com/', expect.any(Object));
expect(mattermostView.loadRetry).not.toBeCalled();
});
});
describe('retry', () => {

7
src/main/views/MattermostView.ts
View File

@@ -174,6 +174,13 @@ export class MattermostView extends EventEmitter {
log.info(`[${Util.shorten(this.tab.name)}] Loading ${loadURL}`);
const loading = this.view.webContents.loadURL(loadURL, {userAgent: composeUserAgent()});
loading.then(this.loadSuccess(loadURL)).catch((err) => {
if (err.code && err.code.startsWith('ERR_CERT')) {
WindowManager.sendToRenderer(LOAD_FAILED, this.tab.name, err.toString(), loadURL.toString());
this.emit(LOAD_FAILED, this.tab.name, err.toString(), loadURL.toString());
log.info(`[${Util.shorten(this.tab.name)}] Invalid certificate, stop retrying until the user decides what to do: ${err}.`);
this.status = Status.ERROR;
return;
}
this.loadRetry(loadURL, err);
});
}