Skip to content

fix(SVGDepictor): escape string injected in svg #144

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
thsa merged 1 commit into from
Sep 1, 2025
Merged

fix(SVGDepictor): escape string injected in svg #144

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
51 changes: 41 additions & 10 deletions src/main/java/com/actelion/research/chem/SVGDepictor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,37 @@ private void write(String s) {
buffer.append("\n");
}

public static String escapeXML(String s) {
StringBuilder sb = new StringBuilder();

int length = s.length();
for (int i = 0; i < length; i++) {
int c = s.codePointAt(i);
char ch = (char) c;
switch (c) {
case '&':
sb.append("&amp;");
break;
case '<':
sb.append("&lt;");
break;
case '>':
sb.append("&gt;");
break;
case '\"':
sb.append("&quot;");
break;
case '\'':
sb.append("&apos;");
break;
default:
sb.append(ch);
}
}

return sb.toString();
}

@Override
protected void drawBlackLine(DepictorLine theLine) {
int x1 = (int) theLine.x1;
Expand All @@ -107,7 +138,7 @@ protected void drawBlackLine(DepictorLine theLine) {
"y1=\"" + y1 + "\" " +
"x2=\"" + x2 + "\" " +
"y2=\"" + y2 + "\" " +
"style=\"stroke:" + currentColor + "; stroke-width:" + lineWidth + "\"/>";
"style=\"stroke:" + escapeXML(currentColor) + "; stroke-width:" + lineWidth + "\"/>";
write(s);
}

Expand All @@ -123,7 +154,7 @@ protected void drawDottedLine(DepictorLine theLine) {
"y1=\"" + y1 + "\" " +
"x2=\"" + x2 + "\" " +
"y2=\"" + y2 + "\" " +
"style=\"stroke:" + currentColor + "; stroke-width:" + lineWidth + "\"/>";
"style=\"stroke:" + escapeXML(currentColor) + "; stroke-width:" + lineWidth + "\"/>";

write(s);
}
Expand All @@ -138,7 +169,7 @@ protected void drawPolygon(GenericPolygon p) {
s.append(" ");
}
s.append("\" " +
"style=\"fill:" + currentColor + "; stroke:" + currentColor + "; stroke-width:"+lineWidth+"\"/>");
"style=\"fill:" + escapeXML(currentColor) + "; stroke:" + escapeXML(currentColor) + "; stroke-width:"+lineWidth+"\"/>");
write(s.toString());
}

Expand All @@ -151,7 +182,7 @@ protected void drawString(String theString, double x, double y) {
"stroke=\"none\" " +
// "font-family=\" " + currentFont.getName() + "\" " +
"font-size=\"" + currentFont.getSize() + "\" " +
"fill=\"" + currentColor + "\">" + theString +
"fill=\"" + escapeXML(currentColor) + "\">" + escapeXML(theString) +
"</text>";
write(s);
}
Expand All @@ -162,7 +193,7 @@ protected void fillCircle(double x, double y, double d) {
"cx=\"" + (int) (x+d/2) + "\" " +
"cy=\"" + (int) (y+d/2) + "\" " +
"r=\"" + (int) (d/2) + "\" " +
"fill=\"" + currentColor + "\" />";
"fill=\"" + escapeXML(currentColor) + "\" />";
write(s);
}

Expand Down Expand Up @@ -204,7 +235,7 @@ protected void setRGB(int rgb) {
@Override
protected void onDrawBond(int bond, double x1, double y1, double x2, double y2) {
String s = "<line " +
"id=\"" + getId() + ":Bond:" + bond + "\" " +
"id=\"" + escapeXML(getId()) + ":Bond:" + bond + "\" " +
"class=\"event\" " + // class to respond to the mouse event
"x1=\"" + (int) (x1) + "\" " +
"y1=\"" + (int) (y1) + "\" " +
Expand All @@ -220,7 +251,7 @@ protected void onDrawBond(int bond, double x1, double y1, double x2, double y2)
protected void onDrawAtom(int atom, String symbol, double x, double y) {
int r = DEFAULT_ELEM_WIDTH;
String s = "<circle " +
"id=\"" + getId() + ":Atom:" + atom + "\" " +
"id=\"" + escapeXML(getId()) + ":Atom:" + atom + "\" " +
"class=\"event\" " + // class to respond to the mouse event
"cx=\"" + (int) (x) + "\" " +
"cy=\"" + (int) (y) + "\" " +
Expand All @@ -233,7 +264,7 @@ protected void onDrawAtom(int atom, String symbol, double x, double y) {
@Override
public String toString() {
String header = "<svg " +
"id=\"" + getId() + "\" " +
"id=\"" + escapeXML(getId()) + "\" " +
"xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" " +
"width=\"" + width + "px\" " +
"height=\"" + height + "px\" " +
Expand All @@ -243,9 +274,9 @@ public String toString() {

String style = legacyMode ?
"<style>" +
" #" + getId() +
" #" + escapeXML(getId()) +
" {pointer-events:none; } " + // Disable Mouse events on the root element so they get passed to the childs
" #" + getId() + " .event " +
" #" + escapeXML(getId()) + " .event " +
" { pointer-events:all;} " + // Enable Mouse events for elements possessing the class "event"
" </style>\n"
: "<g style=\"font-size:"+getTextSize()+"px; fill-opacity:1; stroke-opacity:1; fill:black; stroke:black;"
Expand Down