-
-
Notifications
You must be signed in to change notification settings - Fork 8.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
df600eb
commit 00064be
Showing
3 changed files
with
57 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
package lib.form; | ||
|
||
import com.gargoylesoftware.htmlunit.html.HtmlElement; | ||
import com.gargoylesoftware.htmlunit.html.HtmlElementUtil; | ||
import com.gargoylesoftware.htmlunit.html.HtmlPage; | ||
import hudson.model.FreeStyleProject; | ||
import hudson.model.Job; | ||
import hudson.util.ComboBoxModel; | ||
import jenkins.model.OptionalJobProperty; | ||
import org.jvnet.hudson.test.HudsonTestCase; | ||
import org.jvnet.hudson.test.Issue; | ||
import org.jvnet.hudson.test.TestExtension; | ||
|
||
//TODO meant to be merged back into ComboBoxTest after security release to avoid conflict during the upmerge process | ||
public class ComboBoxSEC1525Test extends HudsonTestCase { | ||
public static class XssProperty extends OptionalJobProperty<Job<?,?>> { | ||
@TestExtension("testEnsureXSSnotPossible") | ||
public static class DescriptorImpl extends OptionalJobProperty.OptionalJobPropertyDescriptor { | ||
|
||
@Override | ||
public String getDisplayName() { | ||
return "XSS Property"; | ||
} | ||
|
||
public ComboBoxModel doFillXssItems() { | ||
return new ComboBoxModel("<h1>HACK</h1>"); | ||
} | ||
} | ||
} | ||
|
||
@Issue("SECURITY-1525") | ||
public void testEnsureXSSnotPossible() throws Exception { | ||
XssProperty xssProperty = new XssProperty(); | ||
FreeStyleProject p = createFreeStyleProject(); | ||
p.addProperty(xssProperty); | ||
|
||
WebClient wc = new WebClient(); | ||
|
||
HtmlPage configurePage = wc.getPage(p, "configure"); | ||
int numberOfH1Before = configurePage.getElementsByTagName("h1").size(); | ||
|
||
HtmlElement comboBox = configurePage.getElementByName("_.xss"); | ||
HtmlElementUtil.click(comboBox); | ||
|
||
// no additional h1, meaning the "payload" is not interpreted | ||
int numberOfH1After = configurePage.getElementsByTagName("h1").size(); | ||
|
||
assertEquals(numberOfH1Before, numberOfH1After); | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
test/src/test/resources/lib/form/ComboBoxSEC1525Test/XssProperty/config.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?jelly escape-by-default='true'?> | ||
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form"> | ||
<f:entry field="xss"> | ||
<f:combobox /> | ||
</f:entry> | ||
</j:jelly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters