this.props.custom. However, please consider to create a new component or enhance the existing one with props to maintain style consistency.
+wordCount=Word Count:
+copyToClipboard.title=Copy to clipboard
diff --git a/app/extensions/brave/locales/es/app.properties b/app/extensions/brave/locales/es/app.properties
index c876abca893..b76096f98ea 100644
--- a/app/extensions/brave/locales/es/app.properties
+++ b/app/extensions/brave/locales/es/app.properties
@@ -132,8 +132,7 @@ issuedBy=Emitido por
issuedTo=Emitido para
ledgerBackupText1=Claves de recuperación de cartera Brave
ledgerBackupText2=Fecha de creación:
-ledgerBackupText3=Clave de recuperación 1:
-ledgerBackupText4=Clave de recuperación 2:
+ledgerBackupText4=Clave de recuperación:
ledgerBackupText5=Nota: Estas claves no están almacenadas en los servidores de Brave. Estas claves son la única manera de recuperar tu cartera Brave. Guarda estas claves en un lugar seguro, separado de tu navegador Brave.
licenseTextOk=Ok
listOfAboutPages=Lista de páginas de información
diff --git a/app/extensions/brave/locales/eu/app.properties b/app/extensions/brave/locales/eu/app.properties
index dae52961511..8a948239fd4 100644
--- a/app/extensions/brave/locales/eu/app.properties
+++ b/app/extensions/brave/locales/eu/app.properties
@@ -132,8 +132,7 @@ issuedBy=Honengatik bidalita
issuedTo=Bidali hona
ledgerBackupText1=Brave Wallet Recovery Keys
ledgerBackupText2=Sortutako data:
-ledgerBackupText3=Berreskuratzeko pasahitza 1:
-ledgerBackupText4=Berreskuratzeko pasahitza 2:
+ledgerBackupText4=Berreskuratzeko pasahitza:
ledgerBackupText5=Note: These keys are not stored on Brave servers. These keys are your only method of recovering your Brave wallet. Save these keys in a safe place, separate from your Brave browser.
licenseTextOk=Ados
listOfAboutPages=Orrialdei buruzko zerrenda
diff --git a/app/extensions/brave/locales/fr-FR/app.properties b/app/extensions/brave/locales/fr-FR/app.properties
index 0badfd58965..76519eda91a 100644
--- a/app/extensions/brave/locales/fr-FR/app.properties
+++ b/app/extensions/brave/locales/fr-FR/app.properties
@@ -132,8 +132,7 @@ issuedBy=Émis par
issuedTo=Émis à
ledgerBackupText1=Clés de récupération du porte-monnaie Brave
ledgerBackupText2=Date de création :
-ledgerBackupText3=Clé de récupération N°1 :
-ledgerBackupText4=Clé de récupération N°2 :
+ledgerBackupText4=Clé de récupération:
ledgerBackupText5=Note : Ces clés ne sont pas stockées sur les serveurs Brave. Ces clés constituent pour vous la seule méthode pour récupérer votre porte-monnaie Brave. Conservez ces clés dans un endroit sûr, en dehors de votre navigateur Brave.
licenseTextOk=Ok
listOfAboutPages=Liste des pages « À propos »
diff --git a/app/extensions/brave/locales/hi-IN/app.properties b/app/extensions/brave/locales/hi-IN/app.properties
index 949121c7c2b..1167dc1eb53 100644
--- a/app/extensions/brave/locales/hi-IN/app.properties
+++ b/app/extensions/brave/locales/hi-IN/app.properties
@@ -132,8 +132,7 @@ issuedBy=Issued By
issuedTo=के लिए जारी किए
ledgerBackupText1=Brave Wallet Recovery Keys
ledgerBackupText2=Date created:
-ledgerBackupText3=Recovery Key 1:
-ledgerBackupText4=Recovery Key 2:
+ledgerBackupText4=Recovery Key:
ledgerBackupText5=Note: These keys are not stored on Brave servers. These keys are your only method of recovering your Brave wallet. Save these keys in a safe place, separate from your Brave browser.
licenseTextOk=ठीक है
listOfAboutPages=पृष्ठों के बारे में सूची
diff --git a/app/extensions/brave/locales/id-ID/app.properties b/app/extensions/brave/locales/id-ID/app.properties
index 130b080ef65..13fbffba53a 100644
--- a/app/extensions/brave/locales/id-ID/app.properties
+++ b/app/extensions/brave/locales/id-ID/app.properties
@@ -132,8 +132,7 @@ issuedBy=Diterbitkan oleh
issuedTo=Diterbitkan untuk
ledgerBackupText1=Kunci Pemulihan Dompet Brave
ledgerBackupText2=Tanggal dibuat:
-ledgerBackupText3=Kunci Pemulihan 1:
-ledgerBackupText4=Kunci Pemulihan 2:
+ledgerBackupText4=Kunci Pemulihan:
ledgerBackupText5=Catatan: Kunci ini tidak disimpan di server Brave. Kunci ini adalah satu-satunya metode untuk memulihkan dompet Brave Anda. Simpan kunci tersebut di tempat yang aman, terpisah dari peramban Brave Anda.
licenseTextOk=Oke
listOfAboutPages=Daftar laman tentang
diff --git a/app/extensions/brave/locales/it-IT/app.properties b/app/extensions/brave/locales/it-IT/app.properties
index e29ffd4a06e..d5f586bff53 100644
--- a/app/extensions/brave/locales/it-IT/app.properties
+++ b/app/extensions/brave/locales/it-IT/app.properties
@@ -132,8 +132,7 @@ issuedBy=Rilasciato da
issuedTo=Rilasciato a
ledgerBackupText1=Chiavi di ripristino Brave Wallet
ledgerBackupText2=Data di creazione:
-ledgerBackupText3=Chiave di ripristino 1:
-ledgerBackupText4=Chiave di ripristino 2:
+ledgerBackupText4=Chiave di ripristino:
ledgerBackupText5=Nota: queste chiavi non sono memorizzate sui server Brave. Queste chiavi sono il tuo unico modo per ripristinare il tuo Brave Wallet. Salva queste chiavi in un luogo sicuro e diverso dal tuo browser Brave.
licenseTextOk=Ok
listOfAboutPages=Lista delle pagine di informazioni
diff --git a/app/extensions/brave/locales/ja-JP/app.properties b/app/extensions/brave/locales/ja-JP/app.properties
index a4f0ba962ee..94779d4b1be 100644
--- a/app/extensions/brave/locales/ja-JP/app.properties
+++ b/app/extensions/brave/locales/ja-JP/app.properties
@@ -132,8 +132,7 @@ issuedBy=発行元
issuedTo=発行先
ledgerBackupText1=Braveウォレットのリカバリーキー
ledgerBackupText2=作成日
-ledgerBackupText3=リカバリーキー 1
-ledgerBackupText4=リカバリーキー 2
+ledgerBackupText4=リカバリーキー
ledgerBackupText5=これらのキーはBraveのサーバーには保存されていません。これらのキーがBraveウォレットを回復する唯一の方法なので、ブラウザとは別に、安全な場所に保存してください。
licenseTextOk=了解
listOfAboutPages=List of about pages
diff --git a/app/extensions/brave/locales/ko-KR/app.properties b/app/extensions/brave/locales/ko-KR/app.properties
index fec92b657b4..4f8063cb722 100644
--- a/app/extensions/brave/locales/ko-KR/app.properties
+++ b/app/extensions/brave/locales/ko-KR/app.properties
@@ -132,8 +132,7 @@ issuedBy=발급한 곳
issuedTo=발급받은 대상
ledgerBackupText1=Brave 지갑 복구 키
ledgerBackupText2=만든 날짜:
-ledgerBackupText3=복구 키 1:
-ledgerBackupText4=복구 키 2:
+ledgerBackupText4=복구 키:
ledgerBackupText5=참고: 이 키는 Brave 서버에 저장되지 않습니다. 이 키는 Brave 지갑을 복구하는 유일한 방법입니다. 안전한 곳에 이 키를 저장하고, Brave 브라우저와 분리하세요.
licenseTextOk=확인
listOfAboutPages=페이지에 대한 목록
diff --git a/app/extensions/brave/locales/ms-MY/app.properties b/app/extensions/brave/locales/ms-MY/app.properties
index 15f9dc3308c..075212b0802 100644
--- a/app/extensions/brave/locales/ms-MY/app.properties
+++ b/app/extensions/brave/locales/ms-MY/app.properties
@@ -132,8 +132,7 @@ issuedBy=Dikeluarkan Oleh
issuedTo=Dikeluarkan Kepada
ledgerBackupText1=Kunci Pengembalian Semula Dompet Brave
ledgerBackupText2=Tarikh dicipta:
-ledgerBackupText3=Kunci Pengembalian Semula 1
-ledgerBackupText4=Kunci Pengembalian Semula 2
+ledgerBackupText4=Kunci Pengembalian Semula
ledgerBackupText5=Nota: Kunci ini tidak disimpan dalam pelayan Brave. Kunci ini adalah satu-satunya kaedah untuk anda mengembalikan semula dompet Brave anda. Simpan kunci ini di tempat yang selamat, selain daripada pelayar Brave anda.
licenseTextOk=Ok
listOfAboutPages=Senarai perihal halaman
diff --git a/app/extensions/brave/locales/nl-NL/app.properties b/app/extensions/brave/locales/nl-NL/app.properties
index da25164fe8a..832fc07ba4c 100644
--- a/app/extensions/brave/locales/nl-NL/app.properties
+++ b/app/extensions/brave/locales/nl-NL/app.properties
@@ -132,8 +132,7 @@ issuedBy=Uitgegeven Door
issuedTo=Uitgegeven Aan
ledgerBackupText1=Brave Wallet Herstelsleutels
ledgerBackupText2=Datum aangemaakt:
-ledgerBackupText3=Herstelsleutel 1:
-ledgerBackupText4=Herstelsleutel 2:
+ledgerBackupText4=Herstelsleutel:
ledgerBackupText5=Let op: Deze sleutels worden niet bewaard op de Brave servers. Deze sleutels zijn de enige manier waarmee u uw Brave wallet kunt herstellen. Bewaar deze sleutels op een veilige plek, afzonderlijk van uw Brave browser.
licenseTextOk=Ok
listOfAboutPages=Lijst van over pagina's
diff --git a/app/extensions/brave/locales/pl-PL/app.properties b/app/extensions/brave/locales/pl-PL/app.properties
index f0bbbf380f4..d425998491a 100644
--- a/app/extensions/brave/locales/pl-PL/app.properties
+++ b/app/extensions/brave/locales/pl-PL/app.properties
@@ -132,8 +132,7 @@ issuedBy=Wydane przez
issuedTo=Wystawiony dla
ledgerBackupText1=Brave Wallet Recovery Keys
ledgerBackupText2=Date created:
-ledgerBackupText3=Recovery Key 1:
-ledgerBackupText4=Recovery Key 2:
+ledgerBackupText4=Recovery Key:
ledgerBackupText5=Note: These keys are not stored on Brave servers. These keys are your only method of recovering your Brave wallet. Save these keys in a safe place, separate from your Brave browser.
licenseTextOk=Ok
listOfAboutPages=Lista stron informacyjnych
diff --git a/app/extensions/brave/locales/pt-BR/app.properties b/app/extensions/brave/locales/pt-BR/app.properties
index 0ebddb203ee..df850a22eb0 100644
--- a/app/extensions/brave/locales/pt-BR/app.properties
+++ b/app/extensions/brave/locales/pt-BR/app.properties
@@ -132,8 +132,7 @@ issuedBy=Emitido Por
issuedTo=Emitido Para
ledgerBackupText1=Chave de Recuperação da Carteira Brave
ledgerBackupText2=Data de criação:
-ledgerBackupText3=Chave de Recuperação 1
-ledgerBackupText4=Chave de Recuperação 2
+ledgerBackupText4=Chave de Recuperação
ledgerBackupText5=Observação: essas chaves não são armazenadas nos servidores do Brave. Elas são o seu único método de recuperar sua carteira Brave. Salve as chaves em um lugar seguro e separado do seu navegador Brave.
licenseTextOk=Ok
listOfAboutPages=Lista de páginas Sobre
diff --git a/app/extensions/brave/locales/ru/app.properties b/app/extensions/brave/locales/ru/app.properties
index 9dc25534c22..af42a62531d 100644
--- a/app/extensions/brave/locales/ru/app.properties
+++ b/app/extensions/brave/locales/ru/app.properties
@@ -132,8 +132,7 @@ issuedBy=Кем выдан
issuedTo=Кому выдан
ledgerBackupText1=Ключи восстановления Brave кошелька
ledgerBackupText2=Дата создания:
-ledgerBackupText3=Ключ восстановления 1:
-ledgerBackupText4=Ключ восстановления 2:
+ledgerBackupText4=Ключ восстановления:
ledgerBackupText5=Примечание: Эти ключи не хранятся на серверах Brave. Эти ключи являются единственным способом восстановления вашего Brave кошелька. Сохраните эти ключи в надежном месте отдельно от браузера Brave.
licenseTextOk=Ok
listOfAboutPages=Список информационных страниц
diff --git a/app/extensions/brave/locales/sl/app.properties b/app/extensions/brave/locales/sl/app.properties
index 1aba3f64275..65f7a4dab84 100644
--- a/app/extensions/brave/locales/sl/app.properties
+++ b/app/extensions/brave/locales/sl/app.properties
@@ -132,8 +132,7 @@ issuedBy=Izdajatelj
issuedTo=Izdano
ledgerBackupText1=Obnovitveni ključi denarnice Brave
ledgerBackupText2=Datum izdelave:
-ledgerBackupText3=Obnovitveni ključ 1:
-ledgerBackupText4=Obnovitveni ključ 2:
+ledgerBackupText4=Obnovitveni ključ:
ledgerBackupText5=Opomba: Ti ključi niso shranjeni na strežnikih Brave. Tovrstni ključi so edini način, da obnovite svojo denarnico Brave. Shranite jih na varno mesto, ločeno od svojega brskalnika Brave.
licenseTextOk=V redu
listOfAboutPages=Seznam strani o ...
diff --git a/app/extensions/brave/locales/sv-SE/app.properties b/app/extensions/brave/locales/sv-SE/app.properties
index b089003ec3c..525c8f791cb 100644
--- a/app/extensions/brave/locales/sv-SE/app.properties
+++ b/app/extensions/brave/locales/sv-SE/app.properties
@@ -132,8 +132,7 @@ issuedBy=Utfärdats Av
issuedTo=Utfärdats Till
ledgerBackupText1=Brave plånbokens återställningsnycklar
ledgerBackupText2=Datum skapat:
-ledgerBackupText3=Återställningsnyckel 1:
-ledgerBackupText4=Återställningsnyckel 2:
+ledgerBackupText4=Återställningsnyckel:
ledgerBackupText5=Obs: Dessa knappar lagras inte på Brave servrar. Dessa koder är ditt enda sätt att få tillbaka din Brave plånbok. Spara dessa nycklar på ett säkert ställe, inte tillsammans med Brave webbläsare.
licenseTextOk=Ok
listOfAboutPages=Lista över "about" sidor
diff --git a/app/extensions/brave/locales/ta/app.properties b/app/extensions/brave/locales/ta/app.properties
index 91f02bc7c01..1b776db4a41 100644
--- a/app/extensions/brave/locales/ta/app.properties
+++ b/app/extensions/brave/locales/ta/app.properties
@@ -132,8 +132,7 @@ issuedBy=ஆல் வழங்கப்பட்டது
issuedTo=வழங்கப்பட்டது
ledgerBackupText1=Brave Wallet Recovery Keys
ledgerBackupText2=Date created:
-ledgerBackupText3=Recovery Key 1:
-ledgerBackupText4=Recovery Key 2:
+ledgerBackupText4=Recovery Key:
ledgerBackupText5=Note: These keys are not stored on Brave servers. These keys are your only method of recovering your Brave wallet. Save these keys in a safe place, separate from your Brave browser.
licenseTextOk=Ok
listOfAboutPages=பற்றிய பக்கங்கள் பட்டியல்
diff --git a/app/extensions/brave/locales/te/app.properties b/app/extensions/brave/locales/te/app.properties
index 2bf351d5162..ef4a546d79d 100644
--- a/app/extensions/brave/locales/te/app.properties
+++ b/app/extensions/brave/locales/te/app.properties
@@ -132,8 +132,7 @@ issuedBy=Issued By
issuedTo=Issued To
ledgerBackupText1=Brave Wallet Recovery Keys
ledgerBackupText2=Date created:
-ledgerBackupText3=Recovery Key 1:
-ledgerBackupText4=Recovery Key 2:
+ledgerBackupText4=Recovery Key:
ledgerBackupText5=Note: These keys are not stored on Brave servers. These keys are your only method of recovering your Brave wallet. Save these keys in a safe place, separate from your Brave browser.
licenseTextOk=Ok
listOfAboutPages=పేజిల గురించి జాబితా
diff --git a/app/extensions/brave/locales/tr-TR/app.properties b/app/extensions/brave/locales/tr-TR/app.properties
index 2bb336fd336..72c41c58367 100644
--- a/app/extensions/brave/locales/tr-TR/app.properties
+++ b/app/extensions/brave/locales/tr-TR/app.properties
@@ -132,8 +132,7 @@ issuedBy=Issued By
issuedTo=Adına Yayınlanan
ledgerBackupText1=Brave Wallet Recovery Keys
ledgerBackupText2=Date created:
-ledgerBackupText3=Recovery Key 1:
-ledgerBackupText4=Recovery Key 2:
+ledgerBackupText4=Recovery Key:
ledgerBackupText5=Note: These keys are not stored on Brave servers. These keys are your only method of recovering your Brave wallet. Save these keys in a safe place, separate from your Brave browser.
licenseTextOk=Tamam
listOfAboutPages=Sayfalar Hakkında Listesi
diff --git a/app/extensions/brave/locales/uk/app.properties b/app/extensions/brave/locales/uk/app.properties
index 02005e24074..48de4505a90 100644
--- a/app/extensions/brave/locales/uk/app.properties
+++ b/app/extensions/brave/locales/uk/app.properties
@@ -132,8 +132,7 @@ issuedBy=Випущено
issuedTo=Випущено для
ledgerBackupText1=Ключі відновлення гаманця Brave
ledgerBackupText2=Дата створення:
-ledgerBackupText3=Ключ відновлення 1:
-ledgerBackupText4=Ключ відновлення 2:
+ledgerBackupText4=Ключ відновлення:
ledgerBackupText5=Примітка: Ці ключі не зберігаються на серверах Brave. Вони є лише вашим засобом відновлення гаманця Brave. Збережіть ці ключі в надійне місце, окремо від браузера Brave.
licenseTextOk=Ok
listOfAboutPages=Список інформаційних сторінок
diff --git a/app/extensions/brave/locales/zh-CN/app.properties b/app/extensions/brave/locales/zh-CN/app.properties
index 7d5eff50998..b70998c6182 100644
--- a/app/extensions/brave/locales/zh-CN/app.properties
+++ b/app/extensions/brave/locales/zh-CN/app.properties
@@ -132,8 +132,7 @@ issuedBy=由...发布
issuedTo=发布给
ledgerBackupText1=Brave 钱包恢复秘钥
ledgerBackupText2=创建日期：
-ledgerBackupText3=恢复秘钥 1：
-ledgerBackupText4=恢复秘钥 2：
+ledgerBackupText4=恢复秘钥 :
ledgerBackupText5=请注意：上述秘钥未储存于 Brave 服务器上。秘钥是您恢复 Brave 钱包的唯一方式。请将秘钥保存于安全位置，与 Brave 浏览器分离开。
licenseTextOk=确定
listOfAboutPages=关于页面列表
diff --git a/app/filtering.js b/app/filtering.js
index 5b99063a90f..9e873b2eb24 100644
--- a/app/filtering.js
+++ b/app/filtering.js
@@ -115,12 +115,21 @@ function registerForBeforeRequest (session, partition) {
}
const firstPartyUrl = module.exports.getMainFrameUrl(details)
+ const url = details.url
// this can happen if the tab is closed and the webContents is no longer available
if (!firstPartyUrl) {
muonCb({ cancel: true })
return
}
+ if (!isPrivate && module.exports.isResourceEnabled('ledger') && module.exports.isResourceEnabled('ledgerMedia')) {
+ // Ledger media
+ const provider = ledgerUtil.getMediaProvider(url, firstPartyUrl, details.referrer)
+ if (provider) {
+ appActions.onLedgerMediaData(url, provider, details)
+ }
+ }
+
for (let i = 0; i < beforeRequestFilteringFns.length; i++) {
let results = beforeRequestFilteringFns[i](details, isPrivate)
const isAdBlock = (results.resourceName === appConfig.resourceNames.ADBLOCK) ||
@@ -201,7 +210,6 @@ function registerForBeforeRequest (session, partition) {
}
}
// Redirect to non-script version of DDG when it's blocked
- const url = details.url
if (details.resourceType === 'mainFrame' &&
url.startsWith('https://duckduckgo.com/?q') &&
module.exports.isResourceEnabled('noScript', url, isPrivate)) {
@@ -209,14 +217,6 @@ function registerForBeforeRequest (session, partition) {
} else {
muonCb({})
}
-
- if (module.exports.isResourceEnabled('ledger') && module.exports.isResourceEnabled('ledgerMedia')) {
- // Ledger media
- const provider = ledgerUtil.getMediaProvider(url)
- if (provider) {
- appActions.onLedgerMediaData(url, provider, details.tabId)
- }
- }
})
}
@@ -245,12 +245,13 @@ function registerForBeforeRedirect (session, partition) {
module.exports.applyCookieSetting = (requestHeaders, url, firstPartyUrl, isPrivate) => {
const cookieSetting = module.exports.isResourceEnabled(appConfig.resourceNames.COOKIEBLOCK, firstPartyUrl, isPrivate)
if (cookieSetting) {
- const parsedTargetUrl = urlParse(url || '')
- const parsedFirstPartyUrl = urlParse(firstPartyUrl)
+ const targetHostname = urlParse(url || '').hostname
+ const firstPartyHostname = urlParse(firstPartyUrl).hostname
const targetOrigin = getOrigin(url)
+ const referer = requestHeaders['Referer']
if (cookieSetting === 'blockAllCookies' ||
- isThirdPartyHost(parsedFirstPartyUrl.hostname, parsedTargetUrl.hostname)) {
+ isThirdPartyHost(firstPartyHostname, targetHostname)) {
let hasCookieException = false
const firstPartyOrigin = getOrigin(firstPartyUrl)
if (cookieExceptions.hasOwnProperty(firstPartyOrigin)) {
@@ -268,20 +269,19 @@ module.exports.applyCookieSetting = (requestHeaders, url, firstPartyUrl, isPriva
}
}
}
- // Clear cookie and referer on third-party requests
+
+ // Clear cookie on third-party requests
if (requestHeaders['Cookie'] &&
firstPartyOrigin !== pdfjsOrigin && !hasCookieException) {
requestHeaders['Cookie'] = undefined
}
}
- const referer = requestHeaders['Referer']
if (referer &&
cookieSetting !== 'allowAllCookies' &&
- !refererExceptions.includes(parsedTargetUrl.hostname) &&
- targetOrigin !== getOrigin(referer)) {
- // Unless the setting is 'allow all cookies', spoof the referer if it
- // is a cross-origin referer
+ !refererExceptions.includes(targetHostname) &&
+ isThirdPartyHost(targetHostname, urlParse(referer).hostname)) {
+ // Spoof third party referer
requestHeaders['Referer'] = targetOrigin
}
}
@@ -364,6 +364,18 @@ function registerForHeadersReceived (session, partition) {
muonCb({ cancel: true })
return
}
+
+ let parsedTargetUrl = urlParse(details.url || '')
+ let parsedFirstPartyUrl = urlParse(firstPartyUrl)
+ const trackableSecurityHeaders = ['Strict-Transport-Security', 'Expect-CT',
+ 'Public-Key-Pins', 'Public-Key-Pins-Report-Only']
+ if (isThirdPartyHost(parsedFirstPartyUrl.hostname, parsedTargetUrl.hostname)) {
+ trackableSecurityHeaders.forEach(function (header) {
+ delete details.responseHeaders[header]
+ delete details.responseHeaders[header.toLowerCase()]
+ })
+ }
+
for (let i = 0; i < headersReceivedFilteringFns.length; i++) {
let results = headersReceivedFilteringFns[i](details, isPrivate)
if (!module.exports.isResourceEnabled(results.resourceName, firstPartyUrl, isPrivate)) {
@@ -381,7 +393,10 @@ function registerForHeadersReceived (session, partition) {
return
}
}
- muonCb({})
+ muonCb({
+ responseHeaders: details.responseHeaders,
+ statusLine: details.statusLine
+ })
})
}
@@ -394,7 +409,7 @@ function registerPermissionHandler (session, partition) {
const isPrivate = module.exports.isPrivate(partition)
// Keep track of per-site permissions granted for this session.
let permissions = null
- session.setPermissionRequestHandler((origin, mainFrameUrl, permissionTypes, muonCb) => {
+ session.setPermissionRequestHandler((mainFrameOrigin, requestingUrl, permissionTypes, muonCb) => {
if (!permissions) {
permissions = {
media: {
@@ -427,35 +442,11 @@ function registerPermissionHandler (session, partition) {
// TODO(bridiver) - the permission handling should be converted to an action because we should never call `appStore.getState()`
// Check whether there is a persistent site setting for this host
const appState = appStore.getState()
- const isBraveOrigin = origin.startsWith(`chrome-extension://${config.braveExtensionId}/`)
- const isPDFOrigin = origin.startsWith(`${pdfjsOrigin}/`)
- let settings
- let tempSettings
- if (mainFrameUrl === appUrlUtil.getBraveExtIndexHTML() || isPDFOrigin || isBraveOrigin) {
- // lookup, display and store site settings by the origin alias
- origin = isPDFOrigin ? 'PDF Viewer' : 'Brave Browser'
- // display on all tabs
- mainFrameUrl = null
- // Lookup by exact host pattern match since 'Brave Browser' is not
- // a parseable URL
- settings = siteSettings.getSiteSettingsForHostPattern(appState.get('siteSettings'), origin)
- tempSettings = siteSettings.getSiteSettingsForHostPattern(appState.get('temporarySiteSettings'), origin)
- } else if (mainFrameUrl.startsWith('magnet:')) {
- // Show "Allow magnet URL to open an external application?", instead of
- // "Allow null to open an external application?"
- // This covers an edge case where you open a magnet link tab, then disable Torrent Viewer
- // and restart Brave. I don't think it needs localization. See 'Brave Browser' above.
- origin = 'Magnet URL'
- } else {
- // Strip trailing slash
- origin = getOrigin(origin)
- settings = siteSettings.getSiteSettingsForURL(appState.get('siteSettings'), origin)
- tempSettings = siteSettings.getSiteSettingsForURL(appState.get('temporarySiteSettings'), origin)
- }
-
+ const isBraveOrigin = mainFrameOrigin.startsWith(`chrome-extension://${config.braveExtensionId}/`)
+ const isPDFOrigin = mainFrameOrigin.startsWith(`${pdfjsOrigin}/`)
let response = []
- if (origin == null) {
+ if (!requestingUrl) {
response = new Array(permissionTypes.length)
response.fill(false, 0, permissionTypes.length)
muonCb(response)
@@ -466,17 +457,42 @@ function registerPermissionHandler (session, partition) {
const responseSizeThisIteration = response.length
const permission = permissionTypes[i]
const alwaysAllowFullscreen = module.exports.alwaysAllowFullscreen() === fullscreenOption.ALWAYS_ALLOW
+ const isFullscreen = permission === 'fullscreen'
+ const isOpenExternal = permission === 'openExternal'
+
+ let requestingOrigin
+
+ if (requestingUrl === appUrlUtil.getBraveExtIndexHTML() || isPDFOrigin || isBraveOrigin) {
+ // lookup, display and store site settings by the origin alias
+ requestingOrigin = isPDFOrigin ? 'PDF Viewer' : 'Brave Browser'
+ // display on all tabs
+ mainFrameOrigin = null
+ } else if (isOpenExternal) {
+ // Open external is a special case since we want to apply the permission
+ // for the entire scheme to avoid cluttering the saved permissions. See
+ // https://github.com/brave/browser-laptop/issues/13642
+ const protocol = urlParse(requestingUrl).protocol
+ requestingOrigin = protocol ? `${protocol} URLs` : requestingUrl
+ } else {
+ requestingOrigin = getOrigin(requestingUrl) || requestingUrl
+ }
+
+ // Look up by host pattern since requestingOrigin is not necessarily
+ // a parseable URL
+ const settings = siteSettings.getSiteSettingsForHostPattern(appState.get('siteSettings'), requestingOrigin)
+ const tempSettings = siteSettings.getSiteSettingsForHostPattern(appState.get('temporarySiteSettings'), requestingOrigin)
+
if (!permissions[permission]) {
console.warn('WARNING: got unregistered permission request', permission)
response.push(false)
- } else if (permission === 'fullscreen' &&
+ } else if (isFullscreen && mainFrameOrigin &&
// The Torrent Viewer extension is always allowed to show fullscreen media
- origin.startsWith('chrome-extension://' + config.torrentExtensionId)) {
+ mainFrameOrigin.startsWith('chrome-extension://' + config.torrentExtensionId)) {
response.push(true)
- } else if (permission === 'fullscreen' && alwaysAllowFullscreen) {
+ } else if (isFullscreen && alwaysAllowFullscreen) {
// Always allow fullscreen if setting is ON
response.push(true)
- } else if (permission === 'openExternal' && (
+ } else if (isOpenExternal && (
// The Brave extension and PDFJS are always allowed to open files in an external app
isPDFOrigin || isBraveOrigin)) {
response.push(true)
@@ -495,9 +511,7 @@ function registerPermissionHandler (session, partition) {
}
}
- // Display 'Brave Browser' if the origin is null; ex: when a mailto: link
- // is opened in a new tab via right-click
- const message = locale.translation('permissionMessage').replace(/{{\s*host\s*}}/, origin || 'Brave Browser').replace(/{{\s*permission\s*}}/, permissions[permission].action)
+ const message = locale.translation('permissionMessage').replace(/{{\s*host\s*}}/, requestingOrigin).replace(/{{\s*permission\s*}}/, permissions[permission].action)
// If this is a duplicate, clear the previous callback and use the new one
if (permissionCallbacks[message]) {
@@ -511,9 +525,9 @@ function registerPermissionHandler (session, partition) {
{text: locale.translation('deny')},
{text: locale.translation('allow')}
],
- frameOrigin: getOrigin(mainFrameUrl),
+ frameOrigin: getOrigin(mainFrameOrigin),
options: {
- persist: !!origin,
+ persist: !!requestingOrigin,
index: i
},
message
@@ -530,7 +544,7 @@ function registerPermissionHandler (session, partition) {
response[index] = result
if (persist) {
// remember site setting for this host
- appActions.changeSiteSetting(origin, permission + 'Permission', result, isPrivate)
+ appActions.changeSiteSetting(requestingOrigin, permission + 'Permission', result, isPrivate)
}
if (response.length === permissionTypes.length) {
permissionCallbacks[message] = null
@@ -582,12 +596,6 @@ function registerForDownloadListener (session) {
const hostWebContents = webContents.hostWebContents || webContents
const win = BrowserWindow.fromWebContents(hostWebContents) || BrowserWindow.getFocusedWindow()
- // TODO(bridiver) - move this fix to muon
- const controller = webContents.controller()
- if (controller && controller.isValid() && controller.isInitialNavigation()) {
- webContents.forceClose()
- }
-
item.setPrompt(getSetting(settings.DOWNLOAD_ALWAYS_ASK) || false)
const downloadId = item.getGuid()
@@ -776,13 +784,9 @@ module.exports.isResourceEnabled = (resourceName, url, isPrivate) => {
if (resourceName === 'pdfjs') {
return getSetting(settings.PDFJS_ENABLED, settingsState)
}
- if (resourceName === 'webtorrent') {
- return getSetting(settings.TORRENT_VIEWER_ENABLED, settingsState)
- }
if (resourceName === 'webtorrent') {
- const extension = extensionState.getExtensionById(appState, config.torrentExtensionId)
- return extension !== undefined ? extension.get('enabled') : false
+ return extensionState.isWebTorrentEnabled(appState)
}
if (resourceName === 'ledger') {
@@ -793,6 +797,10 @@ module.exports.isResourceEnabled = (resourceName, url, isPrivate) => {
return getSetting(settings.PAYMENTS_ALLOW_MEDIA_PUBLISHERS, settingsState)
}
+ if (resourceName === 'firewall') {
+ return siteSettings.braveryDefaults(appState, appConfig).firewall
+ }
+
const braverySettings = getBraverySettingsForUrl(url, appState, isPrivate)
// If full shields are down never enable extra protection
@@ -845,6 +853,15 @@ module.exports.clearStorageData = () => {
}
}
+module.exports.clearHSTSData = () => {
+ for (let partition in registeredSessions) {
+ let ses = registeredSessions[partition]
+ setImmediate(() => {
+ ses.clearHSTSData.bind(ses)(() => {})
+ })
+ }
+}
+
/**
* Clears all session caches.
*/
diff --git a/app/firewall.js b/app/firewall.js
new file mode 100644
index 00000000000..07b22d7f1ae
--- /dev/null
+++ b/app/firewall.js
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const ip = require('ip')
+const Filtering = require('./filtering')
+const {isInternalUrl} = require('../js/lib/urlutil')
+
+module.exports.resourceName = 'firewall'
+
+const onHeadersReceived = (details) => {
+ const result = { resourceName: module.exports.resourceName }
+ const mainFrameUrl = Filtering.getMainFrameUrl(details)
+ const isIPInternal = ip.isPrivate(details.ip)
+ const isUrlInternal = isInternalUrl(details.url)
+
+ if ((isIPInternal || isUrlInternal) && !isInternalUrl(mainFrameUrl)) {
+ // Block requests to local origins from non-local top-level origins
+ console.log('firewall blocked request from external IP to internal IP')
+ result.cancel = true
+ } else if (isIPInternal && !isUrlInternal) {
+ // Block requests to an external name that resolves to an internal address
+ console.log('firewall blocked request for internal IP with external hostname')
+ result.cancel = true
+ }
+
+ return result
+}
+
+module.exports.init = () => {
+ Filtering.registerHeadersReceivedFilteringCB(onHeadersReceived)
+}
diff --git a/app/index.js b/app/index.js
index 597f218585a..dbc444a1787 100644
--- a/app/index.js
+++ b/app/index.js
@@ -16,7 +16,7 @@ const telemetry = require('./telemetry')
telemetry.setCheckpoint('init')
const handleUncaughtError = (stack, message) => {
- muon.crashReporter.setCrashKeyValue('javascript-info', JSON.stringify({stack, message}))
+ muon.crashReporter.setJavascriptInfoCrashValue(JSON.stringify({stack, message}))
muon.crashReporter.dumpWithoutCrashing()
if (!ready) {
@@ -64,6 +64,7 @@ const updater = require('./updater')
const Importer = require('./importer')
const messages = require('../js/constants/messages')
const appActions = require('../js/actions/appActions')
+const tabActions = require('./common/actions/tabActions')
const SessionStore = require('./sessionStore')
const {startSessionSaveInterval} = require('./sessionStoreShutdown')
const appStore = require('../js/stores/appStore')
@@ -73,6 +74,7 @@ const TrackingProtection = require('./trackingProtection')
const AdBlock = require('./adBlock')
const AdInsertion = require('./browser/ads/adInsertion')
const HttpsEverywhere = require('./httpsEverywhere')
+const Firewall = require('./firewall')
const PDFJS = require('./pdfJS')
const SiteHacks = require('./siteHacks')
const CmdLine = require('./cmdLine')
@@ -141,15 +143,17 @@ const notifyCertError = (webContents, url, error, cert) => {
fingerprint: cert.fingerprint
}
- // Tell the page to show an unlocked icon. Note this is sent to the main
- // window webcontents, not the webview webcontents
- let sender = webContents.hostWebContents || webContents
- sender.send(messages.CERT_ERROR, {
+ // Load the certificate error page
+ // and provide details about the error,
+ // including enough data for in-page actions to force the
+ // insecure page to load or show the certificate.
+ tabActions.setContentsError(webContents.getId(), {
url,
error,
cert,
tabId: webContents.getId()
})
+ appActions.loadURLRequested(webContents.getId(), 'about:certerror')
}
app.on('ready', () => {
@@ -202,12 +206,14 @@ app.on('ready', () => {
AdBlock.init()
AdInsertion.init()
PDFJS.init()
+ Firewall.init()
if (!loadedPerWindowImmutableState || loadedPerWindowImmutableState.size === 0) {
if (!CmdLine.newWindowURL()) {
appActions.newWindow()
}
} else {
+ const lastIndex = loadedPerWindowImmutableState.size - 1
loadedPerWindowImmutableState
.sort((a, b) => {
let comparison = 0
@@ -222,8 +228,12 @@ app.on('ready', () => {
return comparison
})
- .forEach((wndState) => {
- appActions.newWindow(undefined, undefined, wndState)
+ .forEach((wndState, i) => {
+ const isLastWindow = i === lastIndex
+ if (CmdLine.shouldDebugWindowEvents && isLastWindow) {
+ console.log(`The restored window which should get focus has ${wndState.get('frames').size} frames`)
+ }
+ appActions.newWindow(undefined, isLastWindow ? undefined : { inactive: true }, wndState, true)
})
}
process.emit(messages.APP_INITIALIZED)
diff --git a/app/locale.js b/app/locale.js
index c5ef2a5b2c5..13c43012a6d 100644
--- a/app/locale.js
+++ b/app/locale.js
@@ -60,12 +60,15 @@ var rendererIdentifiers = function () {
'deleteBookmarks',
'deleteHistoryEntry',
'deleteHistoryEntries',
+ 'deleteDomainFromHistory',
'deleteLedgerEntry',
'ledgerBackupText1',
'ledgerBackupText2',
'ledgerBackupText3',
'ledgerBackupText4',
'ledgerBackupText5',
+ 'backupKeys',
+ 'backupKeysNow',
'editFolder',
'editBookmark',
'unmuteTabs',
@@ -133,6 +136,7 @@ var rendererIdentifiers = function () {
'recentlyClosed',
'recentlyVisited',
'bookmarks',
+ 'otherBookmarks',
'addToFavoritesBar',
'window',
'minimize',
@@ -177,6 +181,7 @@ var rendererIdentifiers = function () {
'forgetLearnedSpelling',
'lookupSelection',
'publisherMediaName',
+ 'addToPublisherList',
// Other identifiers
'aboutBlankTitle',
'urlCopied',
@@ -226,13 +231,13 @@ var rendererIdentifiers = function () {
'no',
'noThanks',
'neverForThisSite',
- 'walletConvertedBackup',
- 'walletConvertedDismiss',
- 'walletConvertedLearnMore',
- 'walletConvertedToBat',
'dappDetected',
'dappDismiss',
'dappEnableExtension',
+ 'banSiteConfirmation',
+ 'paymentsDeleteWalletConfirmation',
+ 'messageBoxOk',
+ 'messageBoxCancel',
// other
'passwordsManager',
'extensionsManager',
@@ -283,7 +288,13 @@ var rendererIdentifiers = function () {
'promotionGeneralErrorText',
'promotionClaimedErrorMessage',
'promotionClaimedErrorText',
- 'promotionClaimedErrorTitle'
+ 'promotionClaimedErrorTitle',
+ 'corruptedOverlayTitle',
+ 'corruptedOverlayMessage',
+ 'corruptedOverlayText',
+ 'ledgerNetworkErrorTitle',
+ 'ledgerNetworkErrorMessage',
+ 'ledgerNetworkErrorText'
].concat(countryCodes).concat(availableLanguages)
}
diff --git a/app/migrations/20180518_uphold.js b/app/migrations/20180518_uphold.js
new file mode 100644
index 00000000000..044caa2b8ad
--- /dev/null
+++ b/app/migrations/20180518_uphold.js
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const compareVersions = require('compare-versions')
+
+// per https://github.com/brave/browser-laptop/issues/14152
+// add fingerprint exception for existing users for uphold.com
+module.exports = (data) => {
+ // don't apply if:
+ // - user chooses to block all fingerprinting (global setting)
+ // - user is not upgrading from 0.22.714 or earlier
+ if ((data.fingerprintingProtectionAll && data.fingerprintingProtectionAll.enabled) ||
+ !data.lastAppVersion) {
+ return false
+ }
+
+ let migrationNeeded = false
+
+ try {
+ migrationNeeded = compareVersions(data.lastAppVersion, '0.22.714') !== 1
+ } catch (e) {}
+
+ if (migrationNeeded) {
+ const pattern = 'https?://uphold.com'
+ if (!data.siteSettings) {
+ data.siteSettings = {}
+ }
+ if (!data.siteSettings[pattern]) {
+ data.siteSettings[pattern] = {}
+ }
+ let targetSetting = data.siteSettings[pattern]
+ if (targetSetting.fingerprintingProtection == null) {
+ targetSetting.fingerprintingProtection = 'allowAllFingerprinting'
+ }
+ }
+
+ return migrationNeeded
+}
diff --git a/app/migrations/pre.js b/app/migrations/pre.js
new file mode 100644
index 00000000000..d9486a8148c
--- /dev/null
+++ b/app/migrations/pre.js
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+module.exports = (data) => {
+ let migrations = [
+ require('./20180518_uphold')
+ // TODO: put additional migrations here
+ ]
+
+ migrations.forEach((migration) => {
+ migration(data)
+ })
+}
diff --git a/app/renderer/about/ledger/printKeys.js b/app/renderer/about/ledger/printKeys.js
new file mode 100644
index 00000000000..beea3c99291
--- /dev/null
+++ b/app/renderer/about/ledger/printKeys.js
@@ -0,0 +1,63 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const React = require('react')
+const format = require('date-fns/format')
+const {StyleSheet, css} = require('aphrodite/no-important')
+const ipc = window.chrome.ipcRenderer
+
+// Constants
+const messages = require('../../../../js/constants/messages')
+
+class PrintKeys extends React.Component {
+ constructor (props) {
+ super(props)
+ this.state = {
+ passphrase: ''
+ }
+
+ ipc.on(messages.PRINTKEYS_UPDATED, (e, detail) => {
+ if (detail) {
+ this.setState({
+ passphrase: detail && detail.passphrase
+ })
+ }
+ })
+ }
+
+ componentDidUpdate (prevProps, prevState) {
+ if (prevState.passphrase !== this.state.passphrase) {
+ setTimeout(() => {
+ window.print()
+ }, 500)
+ }
+ }
+
+ render () {
+ const date = format(new Date(), 'MM/DD/YYYY')
+
+ return