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

Commit

Permalink
Fix sending messages in hangouts on gmail
Browse files Browse the repository at this point in the history
Test Plan: Run the STR in the issue on both inbox.google.com and mail.google.com

Fix #3703

Auditors: @bridiver
  • Loading branch information
bbondy committed Sep 4, 2016
1 parent 20596da commit 6d212db
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/siteHacks.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

const URL = require('url')
const Filtering = require('./filtering')
const siteHacks = require('../js/data/siteHacks')
const {siteHacks} = require('../js/data/siteHacks')
const appConfig = require('../js/constants/appConfig')

const resourceName = 'siteHacks'
Expand Down
2 changes: 1 addition & 1 deletion js/components/frame.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const FrameStateUtil = require('../state/frameStateUtil')
const UrlUtil = require('../lib/urlutil')
const messages = require('../constants/messages.js')
const contextMenus = require('../contextMenus')
const siteHacks = require('../data/siteHacks')
const {siteHacks} = require('../data/siteHacks')
const ipc = global.require('electron').ipcRenderer
const clipboard = global.require('electron').clipboard
const FullScreenWarning = require('./fullScreenWarning')
Expand Down
11 changes: 10 additions & 1 deletion js/data/siteHacks.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,16 @@ const emptyDataURI = {
}
}

module.exports = {
/**
* Holds an array of [Primary URL, subresource URL] to allow 3rd party cookies for.
* Subresource URL can be '*' or undefined to indicate all.
*/
module.exports.cookieExceptions = [
['https://inbox.google.com', 'https://hangouts.google.com'],
['https://mail.google.com', 'https://hangouts.google.com']
]

module.exports.siteHacks = {
'sp1.nypost.com': emptyDataURI,
'sp.nasdaq.com': emptyDataURI,
'forbes.com': {
Expand Down
3 changes: 3 additions & 0 deletions js/state/contentSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const AppConstants = require('../constants/appConstants')
const appConfig = require('../constants/appConfig')
const config = require('../constants/config')
const settings = require('../constants/settings')
const {cookieExceptions} = require('../data/siteHacks')
const {passwordManagers, defaultPasswordManager} = require('../constants/passwordManagers')
const urlParse = require('url').parse
const siteSettings = require('./siteSettings')
Expand Down Expand Up @@ -137,6 +138,8 @@ const getContentSettingsFromSiteSettings = (appState) => {
addContentSettings(contentSettings.cookies, hostPattern, '*', 'block')
addContentSettings(contentSettings.cookies, hostPattern, parseSiteSettingsPattern(hostPattern), 'allow')
addContentSettings(contentSettings.referer, hostPattern, '*', 'block')
cookieExceptions.forEach((exceptionPair) =>
addContentSettings(contentSettings.cookies, exceptionPair[0], exceptionPair[1], 'allow'))
} else {
addContentSettings(contentSettings.cookies, hostPattern, '*', 'allow')
addContentSettings(contentSettings.referer, hostPattern, '*', 'allow')
Expand Down

0 comments on commit 6d212db

Please sign in to comment.