Changeset 17330 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

Timestamp:

2020-11-22T22:54:01+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #20131 - remote control: report errors in case of OSM API error (load_and_zoom) or no valid identifier (load_object)

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -43 +43 @@
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerErrorException;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerForbiddenException;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerOsmApiException;
 import org.openstreetmap.josm.io.remotecontrol.handler.VersionHandler;
 import org.openstreetmap.josm.tools.Logging;
@@ -185 +186 @@
             String get = in.readLine();
             if (get == null) {
-                sendError(out);
+                sendInternalError(out, null);
                 return;
             }
@@ -192 +193 @@
             StringTokenizer st = new StringTokenizer(get);
             if (!st.hasMoreTokens()) {
-                sendError(out);
+                sendInternalError(out, null);
                 return;
             }
             String method = st.nextToken();
             if (!st.hasMoreTokens()) {
-                sendError(out);
+                sendInternalError(out, null);
                 return;
             }
@@ -252 +253 @@
                 String help = "No command specified! The following commands are available:<ul>" + usage
                         + "</ul>" + "See <a href=\""+websiteDoc+"\">"+websiteDoc+"</a> for complete documentation.";
-                sendHeader(out, "400 Bad Request", "text/html", true);
-                out.write(String.format(
-                        RESPONSE_TEMPLATE,
-                        "<title>Bad Request</title>",
-                        "<h1>HTTP Error 400: Bad Request</h1>" +
-                        "<p>" + help + "</p>"));
-                out.flush();
+                sendBadRequest(out, help);
             } else {
                 // create handler object
@@ -273 +268 @@
                     out.write(handler.getContent());
                     out.flush();
+                } catch (RequestHandlerOsmApiException ex) {
+                    Logging.debug(ex);
+                    sendBadGateway(out, ex.getMessage());
                 } catch (RequestHandlerErrorException ex) {
                     Logging.debug(ex);
-                    sendError(out);
+                    sendInternalError(out, ex.getMessage());
                 } catch (RequestHandlerBadRequestException ex) {
                     Logging.debug(ex);
@@ -289 +287 @@
             Logging.error(e);
             try {
-                sendError(out);
+                sendInternalError(out, e.getMessage());
             } catch (IOException e1) {
                 Logging.warn(e1);
@@ -302 +300 @@
     }
 
-    /**
-     * Sends a 500 error: server error
-     *
-     * @param out
-     *            The writer where the error is written
-     * @throws IOException
-     *             If the error can not be written
-     */
-    private static void sendError(Writer out) throws IOException {
-        sendHeader(out, "500 Internal Server Error", "text/html", true);
+    private static void sendError(Writer out, int errorCode, String errorName, String help) throws IOException {
+        sendHeader(out, errorCode + " " + errorName, "text/html", true);
         out.write(String.format(
                 RESPONSE_TEMPLATE,
-                "<title>Internal Error</title>",
-                "<h1>HTTP Error 500: Internal Server Error</h1>"
+                "<title>" + errorName + "</title>",
+                "<h1>HTTP Error " + errorCode + ": " + errorName + "</h1>" +
+                (help == null ? "" : "<p>"+Utils.escapeReservedCharactersHTML(help) + "</p>")
         ));
         out.flush();
@@ -321 +312 @@
 
     /**
-     * Sends a 501 error: not implemented
-     *
-     * @param out
-     *            The writer where the error is written
-     * @throws IOException
-     *             If the error can not be written
-     */
-    private static void sendNotImplemented(Writer out) throws IOException {
-        sendHeader(out, "501 Not Implemented", "text/html", true);
-        out.write(String.format(
-                RESPONSE_TEMPLATE,
-                "<title>Not Implemented</title>",
-                "<h1>HTTP Error 501: Not Implemented</h1>"
-        ));
-        out.flush();
-    }
-
-    /**
-     * Sends a 403 error: forbidden
+     * Sends a 500 error: internal server error
      *
      * @param out
@@ -348 +321 @@
      *             If the error can not be written
      */
+    private static void sendInternalError(Writer out, String help) throws IOException {
+        sendError(out, 500, "Internal Server Error", help);
+    }
+
+    /**
+     * Sends a 501 error: not implemented
+     *
+     * @param out
+     *            The writer where the error is written
+     * @throws IOException
+     *             If the error can not be written
+     */
+    private static void sendNotImplemented(Writer out) throws IOException {
+        sendError(out, 501, "Not Implemented", null);
+    }
+
+    /**
+     * Sends a 502 error: bad gateway
+     *
+     * @param out
+     *            The writer where the error is written
+     * @param help
+     *            Optional HTML help content to display, can be null
+     * @throws IOException
+     *             If the error can not be written
+     */
+    private static void sendBadGateway(Writer out, String help) throws IOException {
+        sendError(out, 502, "Bad Gateway", help);
+    }
+
+    /**
+     * Sends a 403 error: forbidden
+     *
+     * @param out
+     *            The writer where the error is written
+     * @param help
+     *            Optional HTML help content to display, can be null
+     * @throws IOException
+     *             If the error can not be written
+     */
     private static void sendForbidden(Writer out, String help) throws IOException {
-        sendHeader(out, "403 Forbidden", "text/html", true);
-        out.write(String.format(
-                RESPONSE_TEMPLATE,
-                "<title>Forbidden</title>",
-                "<h1>HTTP Error 403: Forbidden</h1>" +
-                (help == null ? "" : "<p>"+Utils.escapeReservedCharactersHTML(help) + "</p>")
-        ));
-        out.flush();
+        sendError(out, 403, "Forbidden", help);
     }
 
@@ -367 +373 @@
      */
     private static void sendBadRequest(Writer out, String help) throws IOException {
-        sendHeader(out, "400 Bad Request", "text/html", true);
-        out.write(String.format(
-                RESPONSE_TEMPLATE,
-                "<title>Bad Request</title>",
-                "<h1>HTTP Error 400: Bad Request</h1>" +
-                (help == null ? "" : ("<p>" + Utils.escapeReservedCharactersHTML(help) + "</p>"))
-        ));
-        out.flush();
+        sendError(out, 400, "Bad Request", help);
     }