Skip to content

JSPWIKI-1283 see jira for details #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spyhunter99 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JSPWIKI-1283 see jira for details #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,12 +326,17 @@ protected void pushBack( final int c ) throws IOException {

/**
* Writes HTML for error message. Does not add it to the document, you have to do it yourself.
* <p>
* The error string is HTML-escaped here, because the wiki rendering pipeline serializes the
* document with output escaping disabled, so any markup in the message would otherwise be
* emitted verbatim into the page (e.g. attacker-controlled plugin parameters echoed back in
* exception messages).
*
* @param error The error string.
* @return An Element containing the error.
*/
public static Element makeError( final String error ) {
return new Element( "span" ).setAttribute( "class", "error" ).addContent( error );
return new Element( "span" ).setAttribute( "class", "error" ).addContent( TextUtil.replaceEntities( error ) );
}

/**
Expand Down
9 changes: 9 additions & 0 deletions jspwiki-main/src/test/java/org/apache/wiki/parser/MarkupParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,13 @@ public void testCleanLink3()
Assertions.assertEquals( "Clean (link)", MarkupParser.cleanLink("Clean (link)") );
}

@Test
public void testMakeErrorEscapesHtml()
{
// Error messages are rendered with output escaping disabled, so makeError must
// neutralize markup carried in e.g. plugin exception messages.
final String text = MarkupParser.makeError( "Faulty pattern <img src=x onerror=alert(1)>" ).getText();
Assertions.assertEquals( "Faulty pattern &lt;img src=x onerror=alert(1)&gt;", text );
}

}
Loading