Skip to content

Fix allowAttributes().globally() (#247) #248

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

Merged
merged 3 commits into from
Feb 2, 2024
Merged

Fix allowAttributes().globally() (#247) #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b0afbc
Fix allowAttributes().globally() (#247)
mymhealthltd-joshengland Jan 24, 2022
a69a021
Allow styling when any attribute name matches "style" globally
mikesamuel Jan 27, 2022
5dbd607
Merge branch 'main' into bugfix/issue-247
mikesamuel Jan 15, 2024
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
9 changes: 4 additions & 5 deletions src/main/java/org/owasp/html/HtmlPolicyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,12 +965,11 @@ public AttributeBuilder matching(
*/
@SuppressWarnings("synthetic-access")
public HtmlPolicyBuilder globally() {
if(attributeNames.get(0).equals("style")) {
return allowStyling();
} else {
return HtmlPolicyBuilder.this.allowAttributesGlobally(
policy, attributeNames);
if (attributeNames.contains("style")) {
allowStyling();
}
return HtmlPolicyBuilder.this.allowAttributesGlobally(
policy, attributeNames);
}

/**
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/owasp/html/HtmlPolicyBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,12 @@ public static final void testTextareaIsNotTextArea() {
assertEquals("x<textArea>y</textArea>", textAreaPolicy.sanitize(input));
}

@Test
public static final void testHtmlPolicyBuilderDefinitionWithNoAttributesDefinedGlobally() {
// Does not crash with a runtime exception
new HtmlPolicyBuilder().allowElements().allowAttributes().globally().toFactory();
}

@Test
public static final void testCSSFontSize() {
HtmlPolicyBuilder builder = new HtmlPolicyBuilder();
Expand Down