From e5dabe14dabe546ea3a29ac22d2cf9ec27aaee49 Mon Sep 17 00:00:00 2001
From: Cezar Augusto <boss@cezaraugusto.net>
Date: Tue, 3 Jul 2018 21:04:36 -0300
Subject: [PATCH] disable shields for any protocol other than http or https -
 fix https://github.com/brave/brave-browser/issues/169

---
 app/background/api/browserActionAPI.ts               |  5 +++--
 app/background/api/shieldsAPI.ts                     |  4 +++-
 app/components/braveShields/braveShields.tsx         |  1 +
 app/components/braveShields/braveShieldsControls.tsx |  3 ---
 app/components/braveShields/braveShieldsHeader.tsx   |  6 ++++++
 app/helpers/urlUtils.ts                              | 10 ++++++++++
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 app/helpers/urlUtils.ts

diff --git a/app/background/api/browserActionAPI.ts b/app/background/api/browserActionAPI.ts
index 43f354b..4d05937 100644
--- a/app/background/api/browserActionAPI.ts
+++ b/app/background/api/browserActionAPI.ts
@@ -2,6 +2,8 @@
  * 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/. */
 
+import { isHttpOrHttps } from '../../helpers/urlUtils'
+
 /**
  * Sets the badge text
  * @param {string} text - The text to put on the badge
@@ -18,11 +20,10 @@ export const setBadgeText = (text: string) => {
 export const setIcon = (url: string, tabId: number, shieldsOn: boolean) => {
   const shieldsEnabledIcon = 'img/icon-16.png'
   const shieldsDisabledIcon = 'img/icon-16-disabled.png'
-  const isHttpOrHttps = url && /^http/.test(url)
 
   if (chrome.browserAction) {
     chrome.browserAction.setIcon({
-      path: shieldsOn && isHttpOrHttps ? shieldsEnabledIcon : shieldsDisabledIcon,
+      path: shieldsOn && isHttpOrHttps(url) ? shieldsEnabledIcon : shieldsDisabledIcon,
       tabId
     })
   }
diff --git a/app/background/api/shieldsAPI.ts b/app/background/api/shieldsAPI.ts
index d7845b6..86b1dbc 100644
--- a/app/background/api/shieldsAPI.ts
+++ b/app/background/api/shieldsAPI.ts
@@ -5,6 +5,7 @@
 import { Tab } from '../../types/state/shieldsPannelState'
 import { BlockOptions } from '../../types/other/blockTypes'
 import * as resourceIdentifiers from '../../constants/resourceIdentifiers'
+import { isHttpOrHttps } from '../../helpers/urlUtils'
 
 /**
  * Obtains the shields panel data for the specified tab data
@@ -33,12 +34,13 @@ export const getShieldSettingsForTabData = (tabData?: chrome.tabs.Tab) => {
   ]).then((details) => {
     const fingerprinting = details[5].setting !== details[6].setting ? 'block_third_party' : details[5].setting
     const cookies = details[7].setting !== details[8].setting ? 'block_third_party' : details[7].setting
+    const braveShields = isHttpOrHttps(origin) ? details[0].setting : 'block'
     return {
       url: url.href,
       origin,
       hostname,
       id: tabData.id,
-      braveShields: details[0].setting,
+      braveShields,
       ads: details[1].setting,
       trackers: details[2].setting,
       httpUpgradableResources: details[3].setting,
diff --git a/app/components/braveShields/braveShields.tsx b/app/components/braveShields/braveShields.tsx
index 9073aaa..10add9e 100644
--- a/app/components/braveShields/braveShields.tsx
+++ b/app/components/braveShields/braveShields.tsx
@@ -39,6 +39,7 @@ export default class BraveShields extends React.Component<BraveShieldsProps, {}>
           braveShields={shieldsPanelTabData.braveShields}
           shieldsToggled={actions.shieldsToggled}
           hostname={shieldsPanelTabData.hostname}
+          origin={shieldsPanelTabData.origin}
         />
         <BraveShieldsStats
           braveShields={shieldsPanelTabData.braveShields}
diff --git a/app/components/braveShields/braveShieldsControls.tsx b/app/components/braveShields/braveShieldsControls.tsx
index 0472719..98736d0 100644
--- a/app/components/braveShields/braveShieldsControls.tsx
+++ b/app/components/braveShields/braveShieldsControls.tsx
@@ -134,7 +134,6 @@ export default class BraveShieldsControls extends React.Component<BraveShieldsCo
 
               <Grid theme={theme.braveShieldsControlsSwitches}>
                 <Column>
-                  {/* TODO @cezaraugusto */}
                   <SwitchButton
                     id='httpsEverywhere'
                     theme={theme.noUserSelect}
@@ -145,7 +144,6 @@ export default class BraveShieldsControls extends React.Component<BraveShieldsCo
                   />
                 </Column>
                 <Column>
-                  {/* TODO @cezaraugusto */}
                   <SwitchButton
                     id='blockScripts'
                     theme={theme.noUserSelect}
@@ -156,7 +154,6 @@ export default class BraveShieldsControls extends React.Component<BraveShieldsCo
                   />
                 </Column>
                 <Column>
-                  {/* TODO @cezaraugusto */}
                   <SwitchButton
                     id='blockPhishingMalware'
                     theme={theme.noUserSelect}
diff --git a/app/components/braveShields/braveShieldsHeader.tsx b/app/components/braveShields/braveShieldsHeader.tsx
index d0dcf8c..2a80930 100644
--- a/app/components/braveShields/braveShieldsHeader.tsx
+++ b/app/components/braveShields/braveShieldsHeader.tsx
@@ -12,9 +12,11 @@ import * as shieldActions from '../../types/actions/shieldsPanelActions'
 import { BlockOptions } from '../../types/other/blockTypes'
 import { getMessage } from '../../background/api/localeAPI'
 import theme from '../../theme'
+import { isHttpOrHttps } from '../../helpers/urlUtils'
 
 export interface BraveShieldsHeaderProps {
   shieldsToggled: shieldActions.ShieldsToggled
+  origin: string
   hostname: string
   braveShields: BlockOptions
 }
@@ -27,6 +29,10 @@ export default class BraveShieldsHeader extends React.PureComponent<BraveShields
   }
 
   onToggleShields (e: HTMLSelectElement) {
+    const { origin } = this.props
+    if (!isHttpOrHttps(origin)) {
+      return
+    }
     const shieldsOption: BlockOptions = e.target.checked ? 'allow' : 'block'
     this.props.shieldsToggled(shieldsOption)
   }
diff --git a/app/helpers/urlUtils.ts b/app/helpers/urlUtils.ts
new file mode 100644
index 0000000..a1a5a6d
--- /dev/null
+++ b/app/helpers/urlUtils.ts
@@ -0,0 +1,10 @@
+/* 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/. */
+
+export const isHttpOrHttps = (url?: string) => {
+  if (!url) {
+    return false
+  }
+  return /^https?:/i.test(url)
+}