Bug 1228116 - Relax Security checks for DTD loads - backout dtd blocking test. r=sicking
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Wed, 25 Nov 2015 13:45:46 -0800
changeset 308457 cbed8d23f3804054c54a5ef14fab7dc698897725
parent 308456 7ace0805c2d399573ad74a25d8e0eaac16025acb
child 308458 9f7e0c71f6cb014d3c1afa900ec88df24cf9de8f
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs1228116
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1228116 - Relax Security checks for DTD loads - backout dtd blocking test. r=sicking
browser/base/content/test/general/bug_1182546.xml
browser/base/content/test/general/mochitest.ini
browser/base/content/test/general/test_bug1182546.html
deleted file mode 100644
--- a/browser/base/content/test/general/bug_1182546.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE html [
-  <!ENTITY % passwordManagerDTD SYSTEM "chrome://passwordmgr/locale/passwordManager.dtd">
-  %passwordManagerDTD;
-]>
-<window>&savedLogins.title;</window>
--- a/browser/base/content/test/general/mochitest.ini
+++ b/browser/base/content/test/general/mochitest.ini
@@ -20,23 +20,21 @@ support-files =
   offlineChild2.cacheManifest
   offlineChild2.cacheManifest^headers^
   offlineChild2.html
   offlineEvent.cacheManifest
   offlineEvent.cacheManifest^headers^
   offlineEvent.html
   subtst_contextmenu.html
   video.ogg
-  bug_1182546.xml
 
 [test_bug364677.html]
 [test_bug395533.html]
 [test_contextmenu.html]
 skip-if = toolkit == "gtk2" || toolkit == "gtk3" || (os == 'mac' && os_version != '10.6') # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304
 [test_contextmenu_input.html]
 skip-if = toolkit == "gtk2" || toolkit == "gtk3" || e10s # disabled on Linux due to bug 513558
 [test_feed_discovery.html]
 skip-if = e10s
 [test_offlineNotification.html]
 skip-if = buildapp == 'mulet' || e10s # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?
 [test_offline_gzip.html]
 skip-if = buildapp == 'mulet' || e10s # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?
-[test_bug1182546.html]
deleted file mode 100644
--- a/browser/base/content/test/general/test_bug1182546.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1182546
--->
-<head>
-  <title>Bug 1182546 - Test block loading DTD from random page</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<iframe id="testframe" src="bug_1182546.xml"></iframe>
-
-<script class="testbody" type="text/javascript">
-
-SimpleTest.waitForExplicitFinish();
-
-addLoadEvent(function() {
-  // make sure the DTD loader (nsExpatDriver) prevents accessing chrome: from random pages
-  var childNodes = testframe.contentDocument.documentElement.childNodes;
-
-  // make sure '&savedLogins.title;' from bug_1182546.xml does not translate into 'Saved Logins'
-  // the URL 'chrome://passwordmgr/locale/passwordManager.dtd' should not be accessible from content
-  var nodeValue = childNodes[0].nodeValue;
-  isnot(nodeValue, "Saved Logins",
-        "expatDriver should prevent accessing &savedLogins.title;");
-  ok(nodeValue.startsWith("XML Parsing Error: undefined entity"),
-  	 "expatDriver should not allow accessing chrome:");
-});
-
-addLoadEvent(SimpleTest.finish);
-
-</script>
-</body>
-</html>