mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: allow persistent media salts (#22386)

Browse source 
* fix: allow persistent media salts

* chore: add regression test for persistent media device ids across reloads
This commit is contained in:
Samuel Attard 2020-02-26 16:03:55 -08:00 committed by GitHub
parent fc54db11f3
commit ee04c7f7ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shell/browser/electron_browser_client.cc
View file

@ -872,6 +872,14 @@ bool ElectronBrowserClient::ShouldUseProcessPerSite(
#endif
}
bool ElectronBrowserClient::ArePersistentMediaDeviceIDsAllowed(
content::BrowserContext* browser_context,
const GURL& scope,
const GURL& site_for_cookies,
const base::Optional<url::Origin>& top_frame_origin) {
return true;
}
void ElectronBrowserClient::SiteInstanceDeleting(
content::SiteInstance* site_instance) {
// We are storing weak_ptr, is it fundamental to maintain the map up-to-date

5
shell/browser/electron_browser_client.h
View file

@ -246,6 +246,11 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
const GURL& site_url) override;
bool ShouldUseProcessPerSite(content::BrowserContext* browser_context,
const GURL& effective_url) override;
bool ArePersistentMediaDeviceIDsAllowed(
content::BrowserContext* browser_context,
const GURL& scope,
const GURL& site_for_cookies,
const base::Optional<url::Origin>& top_frame_origin) override;
// content::RenderProcessHostObserver:
void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;

18
spec-main/chromium-spec.ts
View file

@ -694,6 +694,21 @@ describe('chromium features', () => {
expect(labels.some((l: any) => l)).to.be.false()
})
it('returns the same device ids across reloads', async () => {
const ses = session.fromPartition('persist:media-device-id')
const w = new BrowserWindow({
show: false,
webPreferences: {
nodeIntegration: true,
session: ses
}
})
w.loadFile(path.join(fixturesPath, 'pages', 'media-id-reset.html'))
const [, firstDeviceIds] = await emittedOnce(ipcMain, 'deviceIds')
const [, secondDeviceIds] = await emittedOnce(ipcMain, 'deviceIds', () => w.webContents.reload())
expect(firstDeviceIds).to.deep.equal(secondDeviceIds)
})
it('can return new device id when cookie storage is cleared', async () => {
const ses = session.fromPartition('persist:media-device-id')
const w = new BrowserWindow({
@ -706,8 +721,7 @@ describe('chromium features', () => {
w.loadFile(path.join(fixturesPath, 'pages', 'media-id-reset.html'))
const [, firstDeviceIds] = await emittedOnce(ipcMain, 'deviceIds')
await ses.clearStorageData({ storages: ['cookies'] })
w.webContents.reload()
const [, secondDeviceIds] = await emittedOnce(ipcMain, 'deviceIds')
const [, secondDeviceIds] = await emittedOnce(ipcMain, 'deviceIds', () => w.webContents.reload())
expect(firstDeviceIds).to.not.deep.equal(secondDeviceIds)
})
})