Context Navigation

Changeset 14810 in josm for trunk/src/org

Timestamp:

2019-02-24T23:31:36+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17328 - visible html code in error message

Location:

trunk/src/org/openstreetmap/josm

Files:

r14340	r14810
335	335	String body = e.getErrorBody();
336	336	Object msg = null;
337		if (~~"text/html".equals(e.getContentType()~~) && body != null && body.startsWith("<") && body.contains("<html>")) {
	337	if (e.isHtml() && body != null && body.startsWith("<") && body.contains("<html>")) {
338	338	msg = new HtmlPanel(body);
339	339	} else {

-              r14273
+              r14810
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 /**
 …
         this.responseCode = responseCode;
         this.errorHeader = errorHeader;
         this.errorBody = errorBody;
+        this.errorBody = Utils.strip(errorBody);
         this.accessedUrl = accessedUrl;
         this.login = login;
         this.contentType = contentType;
+        checkHtmlBody();
+    }
 …
     public OsmApiException(String message, Throwable cause) {
         super(message, cause);
+    }
+    private void checkHtmlBody() {
+        if (errorBody != null && errorBody.matches("^<.*>.*<.*>$")) {
+            setContentType("text/html");
+            if (!errorBody.contains("<html>")) {
+                errorBody = "<html>" + errorBody + "</html>";
+            }
+        }
+    }
 …
         return contentType;
+    }
+    /**
+     * Determines if the exception has {@code text/html} as content type.
+     * @return {@code true} if the exception has {@code text/html} as content type.
+     * @since xxx
+     */
+    public final boolean isHtml() {
+        return "text/html".equals(contentType);
+    }
+}

Note: See TracChangeset for help on using the changeset viewer.