Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-01-23 02:25:07 +00:00
Code Issues Projects Releases Wiki Activity

fix: match origin pattern for non static hosts

Browse source
This commit is contained in:
Ifedapo Olarewaju 2018-06-05 22:08:52 +01:00
parent 9a64c5b0e1
commit 644da749df
4 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/plugins/Dropbox/index.js
View file

@ -35,6 +35,7 @@ module.exports = class Dropbox extends Plugin {
// merge default options with the ones set by user
this.opts = Object.assign({}, defaultOptions, opts)
this.opts.hostPattern = opts.hostPattern || opts.host
}
install () {

1
src/plugins/GoogleDrive/index.js
View file

@ -30,6 +30,7 @@ module.exports = class GoogleDrive extends Plugin {
// merge default options with the ones set by user
this.opts = Object.assign({}, defaultOptions, opts)
this.opts.hostPattern = opts.hostPattern || opts.host
}
install () {

1
src/plugins/Instagram/index.js
View file

@ -33,6 +33,7 @@ module.exports = class Instagram extends Plugin {
// merge default options with the ones set by user
this.opts = Object.assign({}, defaultOptions, opts)
this.opts.hostPattern = opts.hostPattern || opts.host
}
install () {

4
src/views/ProviderView/index.js
View file

@ -453,7 +453,9 @@ module.exports = class ProviderView {
const authWindow = window.open(link, '_blank')
const noProtocol = (url) => url.replace(/^(https?:|)\/\//, '')
const handleToken = (e) => {
if (noProtocol(e.origin) !== noProtocol(this.plugin.opts.host) || e.source !== authWindow) {
const allowedOrigin = new RegExp(noProtocol(this.plugin.opts.hostPattern))
if (!allowedOrigin.test(noProtocol(e.origin)) || e.source !== authWindow) {
console.log(`rejecting event from ${e.origin} vs allowed pattern ${this.plugin.opts.hostPattern}`)
return
}
authWindow.close()