OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 21:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'security' into security-rc

Browse Source 
Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/util/RobustReflectionConverter.java
	core/src/main/resources/lib/layout/layout.jelly
	war/pom.xml
This commit is contained in:
Jesse Glick committed 2014-02-11 21:00:54 -05:00
2 parents 80063cc8ae 7541e83cc9
commit abc77438d2
20 files changed
+194 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/hudson/markup/MyspacePolicyTest.java
+2 -4
View File
@@ -34,9 +34,7 @@ public class MyspacePolicyTest extends Assert {
assertIntact("<table><tr><th>header</th></tr><tr><td>something</td></tr></table>");
assertIntact("<h1>title</h1><blockquote>blurb</blockquote>");
assertIntact("<iframe src='nested'></iframe>");
assertIntact("<iframe src='http://kohsuke.org'></iframe>");
assertReject("javascript","<iframe src='javascript:foo'></iframe>");
assertReject("iframe", "<iframe src='nested'></iframe>");
assertReject("script","<script>window.alert(5);</script>");
assertReject("script","<script src='http://foo/evil.js'></script>");
@@ -47,7 +45,7 @@ public class MyspacePolicyTest extends Assert {
assertIntact("<div style='background-color:white'>inline CSS</div>");
assertIntact("<br><hr>");
assertIntact("<form method='post' action='http://sun.com/'><input type='text' name='foo'><input type='password' name='pass'></form>");
assertReject("sun.com", "<form method='post' action='http://sun.com/'><input type='text' name='foo'><input type='password' name='pass'></form>");
}
private void assertIntact(String input) {