From bf341b8a6164dad70ce289862bff828782c68213 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 22 Nov 2010 02:15:03 +0000
Subject: Merged bookmarks XSS fixes in r7406 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@7410 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/bookmarks/actions/add.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'mod/bookmarks/actions/add.php')

diff --git a/mod/bookmarks/actions/add.php b/mod/bookmarks/actions/add.php
index e633244c1..60859f90f 100644
--- a/mod/bookmarks/actions/add.php
+++ b/mod/bookmarks/actions/add.php
@@ -20,6 +20,14 @@ if (!$title || !$address) {
 	forward(REFERER);
 }
 
+// don't allow malicious code.
+// put this in a context of a link so HTMLawed knows how to filter correctly.
+$xss_test = "<a href=\"$address\"></a>";
+if ($xss_test != filter_tags($xss_test)) {
+	register_error(elgg_echo('bookmarks:save:failed'));
+	forward(REFERER);
+}
+
 //create a new bookmark object
 $entity = new ElggObject;
 $entity->subtype = "bookmarks";
-- 
cgit v1.2.3