Skip to content

Fix possible XSS #36

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix possible XSS #36

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
4 changes: 2 additions & 2 deletions core/src/main/java/gwtupload/client/BaseUploadStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ public void setError(String msg) {
*/
public void setFileNames(List<String> names) {
fileNames = names;
fileNameLabel.setHTML(Utils.convertCollectionToString(names, "<br/>"));
fileNameLabel.setHTML(Utils.convertCollectionToString(names, "<br/>", true));
if (prg instanceof HasText) {
((HasText) prg).setText(Utils.convertCollectionToString(names, ","));
((HasText) prg).setText(Utils.convertCollectionToString(names, ",", false));
}
}

Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/gwtupload/client/Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.google.gwt.http.client.RequestException;
import com.google.gwt.http.client.RequestTimeoutException;
import com.google.gwt.http.client.Response;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Composite;
Expand Down Expand Up @@ -191,7 +192,7 @@ public static void log(String msg, Throwable e) {
GWT.log(msg, e);
}
} else {
String html = (msg + "\n" + (e != null ? e.getMessage() :"")).replaceAll("\n", "<br/>");
String html = SafeHtmlUtils.fromString(msg + "\n" + (e != null ? e.getMessage() :"")).asString().replaceAll("\n", "<br/>");
mlog.setHTML(mlog.getHTML() + html);
}
}
Expand Down
11 changes: 8 additions & 3 deletions core/src/main/java/gwtupload/client/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.Collection;
import java.util.List;

import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.xml.client.Document;
import com.google.gwt.xml.client.Node;
import com.google.gwt.xml.client.NodeList;
Expand Down Expand Up @@ -102,15 +103,19 @@ public static boolean validateExtension(List<String> validExtensions, String fil
return valid;
}

public static String convertCollectionToString(Collection<String> strings, String separator) {
public static String convertCollectionToString(Collection<String> strings, String separator, boolean escape) {
String result = "";
boolean first = true;
for (String s : strings) {
if (first) {
result += s;
first = false;
} else {
result += separator + s;
result += separator;
}
if (escape) {
result += SafeHtmlUtils.fromString(s).asString();
} else {
result += s;
}
}
return result;
Expand Down