Skip to content
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

Preserve order of rel attributes (#336) #352

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −5
Open

Preserve order of rel attributes (#336) #352

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 java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ final class ForJava9AndLater extends Java8Shim {
}

@Override public <T> Set<T> setCopyOf(Collection<? extends T> c) {
return Set.copyOf(c);
return Collections.unmodifiableSet(new LinkedHashSet<>(c));
}
}
7 changes: 4 additions & 3 deletions owasp-java-html-sanitizer/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 @@ -33,6 +33,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -428,7 +429,7 @@ public HtmlPolicyBuilder requireRelNofollowOnLinks() {
public HtmlPolicyBuilder requireRelsOnLinks(String... linkValues) {
this.invalidateCompiledState();
if (this.extraRelsForLinks == null) {
this.extraRelsForLinks = new HashSet<>();
this.extraRelsForLinks = new LinkedHashSet<>();
}
for (String linkValue : linkValues) {
linkValue = HtmlLexer.canonicalKeywordAttributeValue(linkValue);
Expand Down Expand Up @@ -1112,8 +1113,8 @@ static final class JoinRelsOnLinksPolicies

public JoinableElementPolicy join(
Iterable<? extends JoinableElementPolicy> toJoin) {
Set<String> extra = new HashSet<>();
Set<String> skip = new HashSet<>();
Set<String> extra = new LinkedHashSet<>();
Set<String> skip = new LinkedHashSet<>();
for (JoinableElementPolicy ep : toJoin) {
RelsOnLinksPolicy p = (RelsOnLinksPolicy) ep;
extra.addAll(p.extra);
Expand Down
26 changes: 25 additions & 1 deletion owasp-java-html-sanitizer/src/test/java/org/owasp/html/SanitizersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,30 @@ public static final void testLinks() {
s.sanitize("<a name=\"header\" id=\"header\">Header text</a>"));
}

@Test
public static final void testLinksRelAttributeAdditionsOrder() {
// Issue 336.
PolicyFactory pf = Sanitizers.LINKS.and(
new HtmlPolicyBuilder()
.allowElements("a")
.requireRelsOnLinks("noopener", "noreferrer")
.toFactory());

assertEquals(
"<a href=\"foo.html\" rel=\"nofollow noopener noreferrer\">Link text</a>",
pf.sanitize("<a href=\"foo.html\">Link text</a>"));

pf = Sanitizers.LINKS.and(
new HtmlPolicyBuilder()
.allowElements("a")
.requireRelsOnLinks("noreferrer", "noopener")
.toFactory());

assertEquals(
"<a href=\"foo.html\" rel=\"nofollow noreferrer noopener\">Link text</a>",
pf.sanitize("<a href=\"foo.html\">Link text</a>"));
}

@Test
public static final void testExplicitlyAllowedProtocolsAreCaseInsensitive() {
// Issue 24.
Expand Down Expand Up @@ -552,7 +576,7 @@ public static final void testStyleGlobally() {
String want = "<h1 style=\"color:green\">This is some green text</h1>";
assertEquals(want, policyBuilder.sanitize(input));
}

static int fac(int n) {
int ifac = 1;
for (int i = 1; i <= n; ++i) {
Expand Down