Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit 79cd681

Browse files
committed
move muon extension constants into js/constants
#9584 Auditors: bridriver Test Plan: Verify extensions+Widevine all load in Release copy with clean brave-development dir
1 parent 0ab7e02 commit 79cd681

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

app/extensions.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const {getExtensionsPath, getBraveExtUrl, getBraveExtIndexHTML} = require('../js
99
const {getSetting} = require('../js/settings')
1010
const settings = require('../js/constants/settings')
1111
const extensionStates = require('../js/constants/extensionStates')
12-
const {passwordManagers, extensionIds} = require('../js/constants/passwordManagers')
12+
const {passwordManagers, extensionIds, publicKeys} = require('../js/constants/passwordManagers')
1313
const appStore = require('../js/stores/appStore')
1414
const extensionState = require('./common/state/extensionState')
1515
const appActions = require('../js/actions/appActions')
@@ -473,50 +473,50 @@ module.exports.init = () => {
473473

474474
let registerComponents = (diff) => {
475475
if (getSetting(settings.PDFJS_ENABLED)) {
476-
registerComponent(config.PDFJSExtensionId)
476+
registerComponent(config.PDFJSExtensionId, config.PDFJSExtensionPublicKey)
477477
} else {
478478
disableExtension(config.PDFJSExtensionId)
479479
}
480480

481481
const activePasswordManager = getSetting(settings.ACTIVE_PASSWORD_MANAGER)
482482
if (activePasswordManager === passwordManagers.ONE_PASSWORD) {
483-
registerComponent(extensionIds[passwordManagers.ONE_PASSWORD])
483+
registerComponent(extensionIds[passwordManagers.ONE_PASSWORD], publicKeys[passwordManagers.ONE_PASSWORD])
484484
} else {
485485
disableExtension(extensionIds[passwordManagers.ONE_PASSWORD])
486486
}
487487

488488
if (activePasswordManager === passwordManagers.DASHLANE) {
489-
registerComponent(extensionIds[passwordManagers.DASHLANE])
489+
registerComponent(extensionIds[passwordManagers.DASHLANE], publicKeys[passwordManagers.DASHLANE])
490490
} else {
491491
disableExtension(extensionIds[passwordManagers.DASHLANE])
492492
}
493493

494494
if (activePasswordManager === passwordManagers.LAST_PASS) {
495-
registerComponent(extensionIds[passwordManagers.LAST_PASS])
495+
registerComponent(extensionIds[passwordManagers.LAST_PASS], publicKeys[passwordManagers.LAST_PASS])
496496
} else {
497497
disableExtension(extensionIds[passwordManagers.LAST_PASS])
498498
}
499499

500500
if (activePasswordManager === passwordManagers.ENPASS) {
501-
registerComponent(extensionIds[passwordManagers.ENPASS])
501+
registerComponent(extensionIds[passwordManagers.ENPASS], publicKeys[passwordManagers.ENPASS])
502502
} else {
503503
disableExtension(extensionIds[passwordManagers.ENPASS])
504504
}
505505

506506
if (activePasswordManager === passwordManagers.BITWARDEN) {
507-
registerComponent(extensionIds[passwordManagers.BITWARDEN])
507+
registerComponent(extensionIds[passwordManagers.BITWARDEN], publicKeys[passwordManagers.BITWARDEN])
508508
} else {
509509
disableExtension(extensionIds[passwordManagers.BITWARDEN])
510510
}
511511

512512
if (getSetting(settings.POCKET_ENABLED)) {
513-
registerComponent(config.PocketExtensionId)
513+
registerComponent(config.PocketExtensionId, config.PocketExtensionPublicKey)
514514
} else {
515515
disableExtension(config.PocketExtensionId)
516516
}
517517

518518
if (getSetting(settings.VIMIUM_ENABLED)) {
519-
registerComponent(config.vimiumExtensionId)
519+
registerComponent(config.vimiumExtensionId, config.vimiumExtensionPublicKey)
520520
} else {
521521
disableExtension(config.vimiumExtensionId)
522522
}
@@ -534,7 +534,7 @@ module.exports.init = () => {
534534
}
535535

536536
if (appStore.getState().getIn(['widevine', 'enabled'])) {
537-
registerComponent(config.widevineComponentId)
537+
registerComponent(config.widevineComponentId, config.widevineComponentPublicKey)
538538
}
539539
}
540540

js/constants/config.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,32 @@ module.exports = {
4747
authUrl: (userId) => `${vaultHost}/v1/users/${userId}`,
4848
replacementUrl: adHost
4949
},
50+
widevineComponentId: 'oimompecagnajdejgnnjijobebaeigek',
51+
widevineComponentPublicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmhe+02cLPPAViaevk/fzODKUnb/ysaAeD8lpE9pwirV6GYOm+naTo7xPOCh8ujcR6Ryi1nPTq2GTG0CyqdDyOsZ1aRLuMZ5QqX3dJ9jXklS0LqGfosoIpGexfwggbiLvQOo9Q+IWTrAO620KAzYU0U6MV272TJLSmZPUEFY6IGQIDAQAB',
5052
braveExtensionId: 'mnojpmjdmbbfmejpflffifhffcmidifd',
5153
torrentExtensionId: 'fmdpfempfmekjkcfdehndghogpnpjeno',
5254
syncExtensionId: 'cjnmeadmgmiihncdidmfiabhenbggfjm',
55+
// PDFJS
56+
// Parent repo: https://github.com/diracdeltas/pdf.js
57+
// Run: gulp run chromium
58+
// Use Chromium to package build/chormium with the brave private key for pdfjs.
59+
// We maintain our own private keyask bcrypt or bbondy.
5360
PDFJSExtensionId: 'jdbefljfgobbmcidnmpjamcbhnbphjnb',
61+
PDFJSExtensionPublicKey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqmqh6Kxmj00IjKvjPsCtw6g2BHvKipjS3fBD0IInXZZ57u5oZfw6q42L7tgWDLrNDPvu3XDH0vpECr+IcgBjkM+w6+2VdTyPj5ubngTwvBqCIPItetpsZNJOJfrFw0OIgmyekZYsI+BsK7wiMtHczwfKSTi0JKgrwIRhHbEhpUnCxFhi+zI61p9jwMb2EBFwxru7MtpP21jG7pVznFeLV9W9BkNL1Th9QBvVs7GvZwtIIIniQkKtqT1wp4IY9/mDeM5SgggKakumCnT9D37ZxDnM2K13BKAXOkeH6JLGrZCl3aXmqDO9OhLwoch+LGb5IaXwOZyGnhdhm9MNA3hgEwIDAQAB',
62+
// Pocket
63+
// Download: https://clients2.google.com/service/update2/crx?response=redirect&prodversion=52.0.2743.116&x=id%3Dniloccemoadcdkdjlinkgdfekeahmflj%26uc // NOLINT
5464
PocketExtensionId: 'niloccemoadcdkdjlinkgdfekeahmflj',
65+
PocketExtensionPublicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKCQwBisK1UcxYMn6MAfDbc8yXWzvbnCzqJwjwbeMaAHji91jdCy3bEzMprTZxW/1Anfk9B4P+hcoTwqUaMUB4WemQMRKRsr9vC45V1iv912nqyGkoGT+cRKZc+niBriAnn4J2GBACHJqkkCiSChphDFt/UNoQEKz4VoqWZDVj/QIDAQAB',
66+
// Vimium
67+
// Download: https://clients2.google.com/service/update2/crx?response=redirect&prodversion=52.0.2743.116&x=id%3Ddbepggeogbaibhgnhhndojpepiihcmeb%26uc // NOLINT
5568
vimiumExtensionId: 'dbepggeogbaibhgnhhndojpepiihcmeb',
69+
vimiumExtensionPublicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCavizCZ9EnBGbtcRmMErcaxD2WUHJ9ME8IYGQhUBlFgIvchJjAO8koyak3AM95dqu3sOLdtIYD+75T82V1Wl5fLnHAeij2/IWL2VViTHeZhXZl1+rD9sRDaEYd7aZetpJ29+XXfhVphKArCCfwbYCtoJhTIr6S6DYsXuRevoV0EwIDAQAB',
70+
// Honey
71+
// Download: https://clients2.google.com/service/update2/crx?response=redirect&prodversion=52.0.2743.116&x=id%3Dbmnlcjabgnpnenekpadlanbbkooimhnj%26uc // NOLINT
5672
honeyExtensionId: 'bmnlcjabgnpnenekpadlanbbkooimhnj',
5773
honeyExtensionPublicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC79mayLyuCYY/dyT7Ycr1sVBp9yHrY4mnogVEgu+sDT6+/A121Na+aTw6mFLD6LHgbgHt4fnQ2V/QwcfBSXRTSkGpgNsZAjnYs4/XzZQYKGltWT93EP9zXN1kGbtzfkPGzTakquCfOjbKtbAQKWh8ppzqLhWcRUn9g/PhU99F29QIDAQAB',
5874
pinterestExtensionId: 'gpdjojdkbbmdfjfahjcgigfpmkopogic',
5975
pinterestExtensionPublicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDB95q2hyt49ZDuVnYI91XaZhqQkbXu0X3fzoNxPxhFbfqGKwtts90LJ7lD5DCIfnBg8WGFhp3eW4GxOglAKrnksmJoyAD5PnSAufx8fD3trZvo/ZAqFx1x5Xm3Rm34EgvVXdralgHSYiqcEU/FX3kYnLLhr2TS4lcrsn1KZd/lcQIDAQAB',
60-
widevineComponentId: 'oimompecagnajdejgnnjijobebaeigek',
6176
coinbaseOrigin: 'https://buy.coinbase.com',
6277
newtab: {
6378
fallbackImage: {

js/constants/passwordManagers.js

+10
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ displayNames[passwordManagers.ENPASS] = 'Enpass'
3232
displayNames[passwordManagers.BITWARDEN] = 'bitwarden'
3333
displayNames[passwordManagers.UNMANAGED] = null
3434

35+
let publicKeys = {}
36+
publicKeys[passwordManagers.BUILT_IN] = null
37+
publicKeys[passwordManagers.ONE_PASSWORD] = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCB4Mf0xWDqstptZh7gqocHL+RT36ZJo/iJ0kZmLyC8vxCsGS26Loidt69KPBVlfuBI0FaWL25NVB2sVdj7wNsCvQIn7ImQwSB5Audq2B3uQzk70RA7SmGE9ndIKsKs4L19n8avhg4ohejyBiI5nrUegs94i0tMpFVeedmTOO4+eQIDAQAB'
38+
publicKeys[passwordManagers.DASHLANE] = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArf+Mb0ro41bJ+FURIhp7YhwTyaP1UbJY2pMApYFTnl1F++bW65Zf80pwIRFt4b6VUQ7qt3kNE3XWrN5VUpbO5pasQZLk4czaEJzFBGPsxFfe89guXb2Xd6CGAHpfdn+wPIU8hMie0ajoUqIC+YWjEZJ0vf3lP0r9EpEbPUSCdg1SjvLb/NzNzq2h/Eev/BfcrEZ7e3wEb9NgM2/pdP2tfowmBg6xLuoiUz2TaQbTVoBRgmkpik3gy4KojFaHgdidT7AVGIpmHZycEd491E9MG/mHuQ0nWZD9pJOp9n1dBHA4LAq5WxU6f/K+h+qhekWO7KVK0M3/mwxxGhizPbjpJQIDAQAB'
39+
publicKeys[passwordManagers.LAST_PASS] = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCiL9y2jziKp5kjb13uYG1bAXsuemUKAYUAwR/N9qTuhMIuly02Ecm63dOkn+M2r26IGfDE/lbPv/dB/W+d34pqGo5uJJY+Omt9t3xsIuz7mQwuvF1H5ozj0OHok5XDFRaBIfPa06RhQw3M7sSZJvQ+qqD3+dr0aLX+mvi0LQ11uQIDAQAB'
40+
publicKeys[passwordManagers.ENPASS] = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhFoAKtOOPY0X3R4soa2r8x3Gy/n23XC/Dn+iTAKR1P1tWgp4pmf1J1l0jI3rYGiVc5ATlawwCgVp5Z1l1PVAEdKmDtHQjbHr5Hwb6W86xwWz+ru2usxVMHcfQlUJdFPKuxValknC4V3XayU9cH+/mo1RCSAfTCKWgqCA2efxK52+FsStwjR9/qjUnVJOGqS0EQmhIfwhdDMpea0XZ67FkTJbRb7wtC6MjIBEcWKvPztpge/vMoyhiLjTckq5kKBbgENOuZe7PvymwWxD0J0ZVfDE6VNQaV7Pkbx9werteHzoAYdSXdj5MKIhL029/zVn3BpCkpEZBr+M2ZXXotEAiwIDAQAB'
41+
publicKeys[passwordManagers.BITWARDEN] = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmqKbvreshyXRuN2gikeR1idqR6KL0Di89JZcMyD4bjJRZVmQO7aznSGSALIHzSAUGYocUYBNDOP5QAhImxXyQ1qG8+goXs93v9GzrNJETdVuCEhqBggC4/DFabryJZDiKvZ2Jl0DM7MsWdoybZPwrj70V3aJ/nVNOMkf868scNTMliwitCqqjT5baTANsG0DkZWQExD4lSXzSZHH9MEO8q0iZ7RRlNuGRBAkZgNV8FwZRsPKm/rwQ9dy3VpgLcmLp5GiMt+kAEncqKAkuRYnhVXXBsKqIyYTMjHSLkLnpfFySyOPLBdS617i/PGNiP/MT6Xy6z//v5NozUgaAZ4gJQIDAQAB'
42+
publicKeys[passwordManagers.UNMANAGED] = null
43+
3544
const thirdPartyPasswordManagers = Object.keys(extensionIds)
3645
.map(key => key && extensionIds[key])
3746
.filter(key => key !== null)
@@ -41,5 +50,6 @@ module.exports = {
4150
defaultPasswordManager,
4251
extensionIds,
4352
displayNames,
53+
publicKeys,
4454
thirdPartyPasswordManagers
4555
}

0 commit comments

Comments
 (0)