Skip to content

Commit

Permalink
fix: suppress insecure resource warning for more local hostnames (#31037
Browse files Browse the repository at this point in the history
)
  • Loading branch information
trop[bot] committed Sep 21, 2021
1 parent 33b8d51 commit 6297655
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
8 changes: 6 additions & 2 deletions lib/renderer/security-warnings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,14 @@ const warnAboutInsecureResources = function () {
return;
}

const isLocal = (url: URL): boolean =>
['localhost', '127.0.0.1', '[::1]', ''].includes(url.hostname);
const isInsecure = (url: URL): boolean =>
['http:', 'ftp:'].includes(url.protocol) && !isLocal(url);

const resources = window.performance
.getEntriesByType('resource')
.filter(({ name }) => /^(http|ftp):/gi.test(name || ''))
.filter(({ name }) => new URL(name).hostname !== 'localhost')
.filter(({ name }) => isInsecure(new URL(name)))
.map(({ name }) => `- ${name}`)
.join('\n');

Expand Down
1 change: 1 addition & 0 deletions spec-main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ app.on('window-all-closed', () => null);

// Use fake device for Media Stream to replace actual camera and microphone.
app.commandLine.appendSwitch('use-fake-device-for-media-stream');
app.commandLine.appendSwitch('host-rules', 'MAP localhost2 127.0.0.1');

global.standardScheme = 'app';
global.zoomScheme = 'zoom';
Expand Down
2 changes: 1 addition & 1 deletion spec-main/security-warnings-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe('security warnings', () => {
});
});
}).listen(0, '127.0.0.1', () => {
serverUrl = `http://127.0.0.1:${(server.address() as AddressInfo).port}`;
serverUrl = `http://localhost2:${(server.address() as AddressInfo).port}`;
done();
});
});
Expand Down

0 comments on commit 6297655

Please sign in to comment.