m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Restrict unconnected notice to specific protocols (#6954)

Browse Source 
The notice asking whether you wanted to connect to a site was showing
up in places it shouldn't, like on the Firefox/Chrome settings pages
and on our fullscreen extension. It has now been restricted to only
be displayed for active tabs with specific protocols:

* http
* https
* dat
* dweb
* ipfs
* ipns
* ssb

This prevents the notice from being shown on settings pages, browser
extensions, and files such as PDFs.
This commit is contained in:
Mark Stacey 2019-08-02 16:29:28 -02:30 committed by GitHub
parent 2649b9b8bb
commit 75d5374582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/ui.js
View File

@ -92,9 +92,9 @@ async function queryCurrentActiveTab (windowType) {
extension.tabs.query({active: true, currentWindow: true}, (tabs) => {
const [activeTab] = tabs
const {title, url} = activeTab
const origin = url ? urlUtil.parse(url).hostname : null
const { hostname: origin, protocol } = url ? urlUtil.parse(url) : {}
resolve({
title, origin, url,
title, origin, protocol, url,
})
})
})

9
ui/app/pages/home/home.container.js
View File

@ -11,6 +11,8 @@ import {
import { getEnvironmentType } from '../../../../app/scripts/lib/util'
import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
const activeTabDappProtocols = ['http:', 'https:', 'dweb:', 'ipfs:', 'ipns:', 'ssb:']
const mapStateToProps = state => {
const { activeTab, metamask, appState } = state
const {
@ -28,7 +30,12 @@ const mapStateToProps = state => {
const accountBalance = getCurrentEthBalance(state)
const { forgottenPassword } = appState
const isUnconnected = Boolean(activeTab && privacyMode && !approvedOrigins[activeTab.origin])
const isUnconnected = Boolean(
activeTab &&
activeTabDappProtocols.includes(activeTab.protocol) &&
privacyMode &&
!approvedOrigins[activeTab.origin]
)
const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP
return {