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

wb_frame.js: make more safe, check that frame actually exists before accessing

Browse Source
This commit is contained in:
Ilya Kreymer 2016-10-19 20:57:56 -07:00
parent 7b45df7338
commit 8b77f66a10
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pywb/static/wb_frame.js
View File

@ -106,7 +106,7 @@ function set_state(state) {
} }
var label = document.getElementById("_wb_label"); var label = document.getElementById("_wb_label");
if (label) { if (label && window._wb_js) {
if (state.is_live) { if (state.is_live) {
label.innerHTML = _wb_js.banner_labels.LIVE_MSG; label.innerHTML = _wb_js.banner_labels.LIVE_MSG;
} else { } else {
@ -135,14 +135,18 @@ function extract_ts_cookie(value) {
} }
function init_pm() { function init_pm(frame) {
var frame = document.getElementById(IFRAME_ID).contentWindow; if (!frame) {
return;
}
var frame_win = frame.contentWindow;
window.addEventListener("message", function(event) { window.addEventListener("message", function(event) {
if (event.source == window.parent) { if (event.source == window.parent) {
// Pass to replay frame // Pass to replay frame
frame.postMessage(event.data, "*"); frame_win.postMessage(event.data, "*");
} else if (event.source == frame) { } else if (event.source == frame_win) {
// Check if iframe url change message // Check if iframe url change message
if (typeof(event.data) == "object" && event.data["wb_type"]) { if (typeof(event.data) == "object" && event.data["wb_type"]) {
@ -180,11 +184,9 @@ function handle_message(state) {
function update_wb_url(state) { function update_wb_url(state) {
//if (curr_state && curr_state.url == state.url && curr_state.ts == state.ts) { if (window._wb_js) {
// return; state['capture_str'] = _wb_js.ts_to_date(state.ts, true);
//} }
state['capture_str'] = _wb_js.ts_to_date(state.ts, true);
push_state(state); push_state(state);
} }
@ -201,15 +203,21 @@ function outer_hash_changed(event) {
return; return;
} }
var frame = document.getElementById(IFRAME_ID).contentWindow; var frame = document.getElementById(IFRAME_ID);
var message = {"wb_type": "outer_hashchange", "hash": window.location.hash} if (frame) {
var message = {"wb_type": "outer_hashchange", "hash": window.location.hash}
frame.postMessage(message, "*", undefined, true); frame.contentWindow.postMessage(message, "*", undefined, true);
}
} }
function init_hash_connect() { function init_hash_connect() {
var frame = document.getElementById(IFRAME_ID); var frame = document.getElementById(IFRAME_ID);
if (!frame) {
return;
}
if (window.location.hash) { if (window.location.hash) {
var curr_url = wbinfo.capture_url + window.location.hash; var curr_url = wbinfo.capture_url + window.location.hash;
@ -226,13 +234,13 @@ function init_hash_connect() {
} }
// Init Post Message connect // Init Post Message connect
init_pm(); init_pm(frame);
} }
document.addEventListener("DOMContentLoaded", init_hash_connect); document.addEventListener("DOMContentLoaded", init_hash_connect);
// Load Banner // Load Banner
if (_wb_js) { if (window._wb_js) {
_wb_js.load(); _wb_js.load();
} }