public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-20 08:51:28 +00:00
Code Issues Releases Wiki Activity

add some protection against opener attacks if external site is opened via window.open()

Browse Source
This commit is contained in:
Andrew Dolgov
2017-02-08 15:07:05 +03:00
parent 23c8ef7e36
commit 829d478f1b
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions2.php
View File

@@ -1957,7 +1957,7 @@
# $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" . # $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
# $filename . " (" . $ctype . ")" . "</a>"; # $filename . " (" . $ctype . ")" . "</a>";
$entry = "<div onclick=\"window.open('".htmlspecialchars($url)."')\" $entry = "<div onclick=\"openUrlPopup('".htmlspecialchars($url)."')\"
dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>"; dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
array_push($entries_html, $entry); array_push($entries_html, $entry);
@@ -2038,7 +2038,7 @@
else else
$filename = ""; $filename = "";
$rv .= "<div onclick='window.open(\"".htmlspecialchars($entry["url"])."\")' $rv .= "<div onclick='openUrlPopup(\"".htmlspecialchars($entry["url"])."\")'
dojoType=\"dijit.MenuItem\">".$filename . $title."</div>"; dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
}; };

12
js/functions.js
View File

@@ -2064,9 +2064,17 @@ function getSelectionText() {
return text.stripTags(); return text.stripTags();
} }
function openUrlPopup(url) {
var w = window.open("");
w.opener = null;
w.location = url;
}
function openArticlePopup(id) { function openArticlePopup(id) {
window.open("backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + var w = window.open("",
"&csrf_token=" + getInitParam("csrf_token"),
"ttrss_article_popup", "ttrss_article_popup",
"height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no"); "height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");
w.opener = null;
w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + getInitParam("csrf_token");
} }

5
js/viewfeed.js
View File

@@ -1729,7 +1729,10 @@ function hlClicked(event, id) {
function openArticleInNewWindow(id) { function openArticleInNewWindow(id) {
toggleUnread(id, 0, false); toggleUnread(id, 0, false);
window.open("backend.php?op=article&method=redirect&id=" + id);
var w = window.open("");
w.opener = null;
w.location = "backend.php?op=article&method=redirect&id=" + id;
} }
function isCdmMode() { function isCdmMode() {