backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

client-side (wombat) fix: postMessage() override was treating targetOrigin as hostname, instead of origin prefix.

Browse Source 
Check if starts with targetOrigin starts with the WB_wombat_location.origin in target window, prints via console.warn() otherwise.
This commit is contained in:
Ilya Kreymer 2017-07-09 15:41:24 -07:00
parent 1d7e5a73e5
commit b3b843405a
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pywb/static/wombat.js
View File

@ -18,7 +18,7 @@ This file is part of pywb, https://github.com/ikreymer/pywb
*/ */
//============================================ //============================================
// Wombat JS-Rewriting Library v2.30 // Wombat JS-Rewriting Library v2.31
//============================================ //============================================
@ -1960,19 +1960,14 @@ var _WBWombat = function($wbwindow, wbinfo) {
from = window.WB_wombat_location.origin; from = window.WB_wombat_location.origin;
} }
var to = targetOrigin; var to_origin = targetOrigin;
if (to == this.location.origin) { if (starts_with(to_origin, this.location.origin)) {
to = "*"; to_origin = "*";
} else {
var to_host = to.split("//", 2);
if (to_host.length == 2) {
to = to_host[1];
}
} }
var new_message = {"from": from, var new_message = {"from": from,
"to_host": to, "to_origin": to_origin,
"src_id": src_id, "src_id": src_id,
"message": message, "message": message,
"from_top": from_top, "from_top": from_top,
@ -1980,7 +1975,6 @@ var _WBWombat = function($wbwindow, wbinfo) {
if (targetOrigin != "*") { if (targetOrigin != "*") {
targetOrigin = this.location.origin; targetOrigin = this.location.origin;
//targetOrigin = "*";
} }
//console.log("Sending " + from + " -> " + to + " (" + targetOrigin + ") " + message); //console.log("Sending " + from + " -> " + to + " (" + targetOrigin + ") " + message);
@ -1999,8 +1993,8 @@ var _WBWombat = function($wbwindow, wbinfo) {
if (event.data.from && event.data.message) { if (event.data.from && event.data.message) {
if (event.data.to_host != "*" && win.WB_wombat_location && event.data.to_host != win.WB_wombat_location.host) { if (event.data.to_origin != "*" && win.WB_wombat_location && !starts_with(event.data.to_origin, win.WB_wombat_location.origin)) {
console.log("Skipping " + win.WB_wombat_location.host + " not " + event.data.to_host); console.warn("Skipping message event to " + event.data.to_origin + " doesn't start with origin " + win.WB_wombat_location.origin);
return; return;
} }