Require Flash to be explicitly enabled in preferences before it is us…

…able

Auditors: @diracdeltas

Fix #6739

app/browser/reducers/flashReducer.js

@@ -12,7 +12,7 @@ const flashReducer = (state, action) => {
   action = makeImmutable(action)
   switch (action.get('actionType')) {
     case appConstants.APP_SET_STATE:
-      flash.init()
+      flash.init(state)
       break
     case appConstants.APP_FLASH_PERMISSION_REQUESTED:
       flash.showFlashMessageBox(action.get('location'), action.get('senderTabId'))

js/about/preferences.js

@@ -1552,6 +1552,7 @@ class SecurityTab extends ImmutableComponent {
   }
   onToggleFlash (e) {
     aboutActions.setResourceEnabled(flash, e.target.value)
+    ipc.send(messages.PREFS_RESTART, flash, e.target.value)
   }
   onToggleWidevine (e) {
     aboutActions.setResourceEnabled(widevine, e.target.value)

js/flash.js

@@ -12,6 +12,7 @@ const locale = require('../app/locale')
 const messages = require('./constants/messages')
 const settings = require('./constants/settings')
 const {memoize} = require('underscore')
+const appConfig = require('./constants/appConfig')
 
 // set to true if the flash install check has succeeded
 let flashInstalled = false
@@ -86,32 +87,41 @@ module.exports.showFlashMessageBox = (location, tabId) => {
   })
 }
 
-module.exports.checkFlashInstalled = (cb) => {
+module.exports.checkFlashInstalled = (state, cb) => {
   try {
     const pepperFlashSystemPluginPath = getPepperFlashPath()
     const pepperFlashManifestPath = path.resolve(pepperFlashSystemPluginPath, '..', 'manifest.json')
     fs.readFile(pepperFlashManifestPath, (err, data) => {
+      let manifest
       try {
         if (err || !data) {
           flashInstalled = false
         } else {
-          const manifest = JSON.parse(data)
-          app.commandLine.appendSwitch('ppapi-flash-path', pepperFlashSystemPluginPath)
-          app.commandLine.appendSwitch('ppapi-flash-version', manifest.version)
+          manifest = JSON.parse(data)
           flashInstalled = true
         }
       } finally {
         appActions.changeSetting(settings.FLASH_INSTALLED, flashInstalled)
-        cb && cb(flashInstalled)
+        cb && cb({flashInstalled, manifest, pepperFlashSystemPluginPath})
       }
     })
   } catch (e) {
-    cb && cb(flashInstalled)
+    cb && cb({flashInstalled, manifest: undefined})
   }
 }
 
-module.exports.init = () => {
-  setImmediate(module.exports.checkFlashInstalled)
+module.exports.init = (state) => {
+  const siteSettings = require('./state/siteSettings')
+  const braveryDefaults = siteSettings.braveryDefaults(state, appConfig)
+  setImmediate(() => module.exports.checkFlashInstalled(state, ({flashInstalled, manifest, pepperFlashSystemPluginPath}) => {
+    if (!flashInstalled) {
+      return
+    }
+    if (braveryDefaults.flash) {
+      app.commandLine.appendSwitch('ppapi-flash-path', pepperFlashSystemPluginPath)
+      app.commandLine.appendSwitch('ppapi-flash-version', manifest.version)
+    }
+  }))
 }
 
 module.exports.resourceName = 'flash'

js/stores/appStore.js

@@ -351,12 +351,18 @@ function handleChangeSettingAction (settingKey, settingValue) {
   }
 }
 
-const applyReducers = (state, action) => [
+const preReducers = [
   require('../../app/browser/reducers/downloadsReducer'),
-  require('../../app/browser/reducers/flashReducer'),
   require('../../app/browser/reducers/tabsReducer'),
   require('../../app/browser/reducers/clipboardReducer')
-].reduce(
+]
+
+const postReducers = [
+  require('../../app/browser/reducers/flashReducer')
+]
+
+const applyReducers = (reducers, state, action) =>
+  reducers.reduce(
     (appState, reducer) => {
       const newState = reducer(appState, action)
       assert.ok(action.actionType === appConstants.APP_SET_STATE || Immutable.Map.isMap(newState),
@@ -371,7 +377,7 @@ const handleAppAction = (action) => {
 
   const ledger = require('../../app/ledger')
 
-  appState = applyReducers(appState, action)
+  appState = applyReducers(preReducers, appState, action)
 
   switch (action.actionType) {
     case appConstants.APP_SET_STATE:
@@ -571,8 +577,6 @@ const handleAppAction = (action) => {
     case appConstants.APP_ALLOW_FLASH_ONCE:
       {
         const propertyName = action.isPrivate ? 'temporarySiteSettings' : 'siteSettings'
-        console.log(siteUtil.getOrigin(action.url))
-        console.log(propertyName)
         appState = appState.set(propertyName,
           siteSettings.mergeSiteSetting(appState.get(propertyName), siteUtil.getOrigin(action.url), 'flash', 1))
         break
@@ -826,6 +830,8 @@ const handleAppAction = (action) => {
     default:
   }
 
+  appState = applyReducers(postReducers, appState, action)
+
   emitChanges()
 }