[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
dbates at webkit.org
dbates at webkit.org
Thu Apr 8 00:52:46 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 70357725c9a5783db2346176af44fbb7daaefc5e
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 2 19:57:48 2010 +0000
2010-01-02 Daniel Bates <dbates at webkit.org>
Reviewed by Adam Barth.
https://bugs.webkit.org/show_bug.cgi?id=33109
Cleans up the XSSAuditor test directory by removing unnecessary test scripts.
The patch for bug #33107 added notifyDone() functionality to the script
echo-intertag.pl. So, we can substitute this script for scripts echo-intertag-and-notify.php,
echo-intertag-post-and-notify.pl, and echo-intertag-post.pl.
* http/tests/security/xssAuditor/link-opens-new-window.html: Modified to call script echo-intertag.pl.
* http/tests/security/xssAuditor/resources/echo-intertag-and-notify.php: Removed.
* http/tests/security/xssAuditor/resources/echo-intertag-post-and-notify.pl: Removed.
* http/tests/security/xssAuditor/resources/echo-intertag-post.pl: Removed.
* http/tests/security/xssAuditor/script-tag-post-control-char.html: Modified to call script echo-intertag.pl.
* http/tests/security/xssAuditor/script-tag-post-null-char.html: Modified to call script echo-intertag.pl.
* http/tests/security/xssAuditor/script-tag-post.html: Modified to call script echo-intertag.pl.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52688 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 374f6b2..eccbaf2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,26 @@
Reviewed by Adam Barth.
+ https://bugs.webkit.org/show_bug.cgi?id=33109
+
+ Cleans up the XSSAuditor test directory by removing unnecessary test scripts.
+
+ The patch for bug #33107 added notifyDone() functionality to the script
+ echo-intertag.pl. So, we can substitute this script for scripts echo-intertag-and-notify.php,
+ echo-intertag-post-and-notify.pl, and echo-intertag-post.pl.
+
+ * http/tests/security/xssAuditor/link-opens-new-window.html: Modified to call script echo-intertag.pl.
+ * http/tests/security/xssAuditor/resources/echo-intertag-and-notify.php: Removed.
+ * http/tests/security/xssAuditor/resources/echo-intertag-post-and-notify.pl: Removed.
+ * http/tests/security/xssAuditor/resources/echo-intertag-post.pl: Removed.
+ * http/tests/security/xssAuditor/script-tag-post-control-char.html: Modified to call script echo-intertag.pl.
+ * http/tests/security/xssAuditor/script-tag-post-null-char.html: Modified to call script echo-intertag.pl.
+ * http/tests/security/xssAuditor/script-tag-post.html: Modified to call script echo-intertag.pl.
+
+2010-01-02 Daniel Bates <dbates at webkit.org>
+
+ Reviewed by Adam Barth.
+
https://bugs.webkit.org/show_bug.cgi?id=33107
Removes the use of window.setTimeout from the XSSAuditor tests:
diff --git a/LayoutTests/http/tests/security/xssAuditor/link-opens-new-window.html b/LayoutTests/http/tests/security/xssAuditor/link-opens-new-window.html
index 48c338c..c80b009 100644
--- a/LayoutTests/http/tests/security/xssAuditor/link-opens-new-window.html
+++ b/LayoutTests/http/tests/security/xssAuditor/link-opens-new-window.html
@@ -19,6 +19,6 @@ window.onload = function()
</script>
</head>
<body>
-<a id="anchorLink" href="http://localhost:8000/security/xssAuditor/resources/echo-intertag-and-notify.php?q=<script>alert(/XSS/)</script>" target="_blank">Click me</a>
+<a id="anchorLink" href="http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl?notifyDone=1&q=<script>alert(/XSS/)</script>" target="_blank">Click me</a>
</body>
</html>
diff --git a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-and-notify.php b/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-and-notify.php
deleted file mode 100644
index 57b7e07..0000000
--- a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-and-notify.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<?php
-echo $_GET['q'];
-?>
-<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-post-and-notify.pl b/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-post-and-notify.pl
deleted file mode 100755
index 47732a3..0000000
--- a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-post-and-notify.pl
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/perl -wT
-use strict;
-use CGI;
-
-my $cgi = new CGI;
-
-print "Content-Type: text/html; charset=UTF-8\n\n";
-
-print "<!DOCTYPE html>\n";
-print "<html>\n";
-print "<body>\n";
-print $cgi->param('q');
-print "<script>\n";
-print "if (window.layoutTestController)\n";
-print " layoutTestController.notifyDone();\n";
-print "</script>\n";
-print "</body>\n";
-print "</html>\n";
diff --git a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-post.pl b/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-post.pl
deleted file mode 100755
index fe7957b..0000000
--- a/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag-post.pl
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl -wT
-use strict;
-use CGI;
-
-my $cgi = new CGI;
-
-print "Content-Type: text/html; charset=UTF-8\n\n";
-
-print "<!DOCTYPE html>\n";
-print "<html>\n";
-print "<body>\n";
-print $cgi->param('q');
-print "</body>\n";
-print "</html>\n";
diff --git a/LayoutTests/http/tests/security/xssAuditor/script-tag-post-control-char.html b/LayoutTests/http/tests/security/xssAuditor/script-tag-post-control-char.html
index f41de36..d161e0f 100644
--- a/LayoutTests/http/tests/security/xssAuditor/script-tag-post-control-char.html
+++ b/LayoutTests/http/tests/security/xssAuditor/script-tag-post-control-char.html
@@ -12,7 +12,8 @@ if (window.layoutTestController) {
<body>
<iframe name="tg" src="about:blank"></iframe>
<form target="tg" method="POST" id="theForm"
- action="http://localhost:8000/security/xssAuditor/resources/echo-intertag-post-and-notify.pl">
+ action="http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl">
+<input type="hidden" name="notifyDone" value="1">
<input type="text" name="q" value="<script>alert(/XSS%05/)</script>">
</form>
<script>
diff --git a/LayoutTests/http/tests/security/xssAuditor/script-tag-post-null-char.html b/LayoutTests/http/tests/security/xssAuditor/script-tag-post-null-char.html
index 014960d..7c5471e 100644
--- a/LayoutTests/http/tests/security/xssAuditor/script-tag-post-null-char.html
+++ b/LayoutTests/http/tests/security/xssAuditor/script-tag-post-null-char.html
@@ -12,7 +12,8 @@ if (window.layoutTestController) {
<body>
<iframe name="tg" src="about:blank"></iframe>
<form target="tg" method="POST" id="theForm"
- action="http://localhost:8000/security/xssAuditor/resources/echo-intertag-post-and-notify.pl">
+ action="http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl">
+<input type="hidden" name="notifyDone" value="1">
<input type="text" name="q" value="<script>al%00ert(/XSS/)</script>">
</form>
<script>
diff --git a/LayoutTests/http/tests/security/xssAuditor/script-tag-post.html b/LayoutTests/http/tests/security/xssAuditor/script-tag-post.html
index 67b2ec1..275e871 100644
--- a/LayoutTests/http/tests/security/xssAuditor/script-tag-post.html
+++ b/LayoutTests/http/tests/security/xssAuditor/script-tag-post.html
@@ -12,7 +12,8 @@ if (window.layoutTestController) {
<body>
<iframe name="tg" src="about:blank"></iframe>
<form target="tg" method="POST" id="theForm"
- action="http://localhost:8000/security/xssAuditor/resources/echo-intertag-post-and-notify.pl">
+ action="http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl">
+<input type="hidden" name="notifyDone" value="1">
<input type="text" name="q" value="<script>alert(/XSS/)</script>">
</form>
<script>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list