Skip to content

JSPWIKI-1281 see jira for details #527

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
+14 −1
Open

JSPWIKI-1281 see jira for details #527

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
2 changes: 1 addition & 1 deletion jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ private void addEntryHTML( final Context context, final DateFormat entryFormat,
buffer.append("<div class=\"weblogentryheading\">\n");

final Date entryDate = entry.getLastModified();
buffer.append( entryFormat != null ? entryFormat.format(entryDate) : entryDate );
buffer.append( entryFormat != null ? TextUtil.replaceEntities( entryFormat.format(entryDate) ) : entryDate );
buffer.append("</div>\n");

//
Expand Down
13 changes: 13 additions & 0 deletions jspwiki-main/src/test/java/org/apache/wiki/plugin/WeblogPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,17 @@ public void testWeblogEntriesWithPreviewAndTrimming() throws WikiException {
Assertions.assertTrue( res.contains( "<div class=\"weblogentrybody\">\nAnother blog entry <a href=\"/test/Wiki.jsp?page="+ blogEntryPage + "\">(more)</a>\n</div>\n" ), res );
}

@Test
public void testEntryFormatIsEscaped() throws WikiException {
final WeblogEntryPlugin wep = new WeblogEntryPlugin();
testEngine.saveText( wep.getNewEntryPage( testEngine, "Test5" ), "Blog entry" );
// A SimpleDateFormat quoted literal in an author-supplied entryFormat must not be emitted as raw markup.
final String src = "[{WeblogPlugin days='90' entryFormat=\"'<script>alert(document.cookie)</script>'\"}]";
testEngine.saveText( "Test5", src );

final String res = testEngine.getI18nHTML( "Test5" );
Assertions.assertFalse( res.contains( "<script>" ), res );
Assertions.assertFalse( res.contains( "<script>alert(document.cookie)</script>" ), res );
}

}
Loading