From 9a705e911485af200937ed4fbbd216f1ecefdea2 Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Wed, 16 Nov 2022 12:04:34 +0100
Subject: explicit error messages for http non-200

cf. #133
---
 .../at/asit/pdfover/gui/bku/MobileBKUConnector.java     | 17 +++++++++++++++--
 .../pdfover/gui/workflow/states/MobileBKUState.java     |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'pdf-over-gui/src/main/java')

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
index 58762b03..29bf880f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
@@ -40,6 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import at.asit.pdfover.commons.Constants;
+import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.bku.mobile.ATrustParser;
 import at.asit.pdfover.gui.workflow.states.MobileBKUState;
 import at.asit.pdfover.gui.workflow.states.MobileBKUState.UsernameAndPassword;
@@ -60,6 +61,12 @@ public class MobileBKUConnector implements BkuSlConnector {
         state.storeRememberedCredentialsTo(this.credentials);
     }
 
+    private class UserDisplayedError extends Exception {
+        private final @Nonnull String msg;
+        @Override public @Nonnull String getMessage() { return this.msg; }
+        private UserDisplayedError(@Nonnull String s) { this.msg = s; }
+    }
+
     public @Nonnull UsernameAndPassword credentials = new UsernameAndPassword();
 
     /**
@@ -75,6 +82,9 @@ public class MobileBKUConnector implements BkuSlConnector {
                 currentRequest = presentResponseToUserAndReturnNextRequest(ISNOTNULL(response.html));
             log.debug("Returning security layer response:\n{}", response.slResponse);
             return response.slResponse;
+        } catch (UserDisplayedError e) {
+            state.showUnrecoverableError(e.getMessage());
+            throw new IllegalStateException("unreachable", e); /* showUnrecoverableError always throws */
         } catch (UserCancelledException e) {
             throw e;
         } catch (Exception e) {
@@ -93,7 +103,7 @@ public class MobileBKUConnector implements BkuSlConnector {
      * @throws URISyntaxException
      * @throws InterruptedException
      */
-    private @Nonnull ATrustParser.Result sendHTTPRequest(CloseableHttpClient httpClient, ClassicHttpRequest request) throws IOException, ProtocolException, URISyntaxException {
+    private @Nonnull ATrustParser.Result sendHTTPRequest(CloseableHttpClient httpClient, ClassicHttpRequest request) throws IOException, ProtocolException, URISyntaxException, UserDisplayedError {
         long now = System.nanoTime();
         if ((lastHTTPRequestTime != null) && ((now - lastHTTPRequestTime) < 2e+9)) { /* less than 2s since last request */
             ++loopHTTPRequestCounter;
@@ -115,7 +125,10 @@ public class MobileBKUConnector implements BkuSlConnector {
             }
 
             if (httpStatus != HttpStatus.SC_OK) {
-                throw new IOException("Got HTTP status " + httpStatus + " " + Optional.ofNullable(response.getReasonPhrase()).orElse("(null)"));
+                switch (httpStatus) {
+                    case HttpStatus.SC_REQUEST_TOO_LONG: throw new UserDisplayedError(Messages.getString("atrusterror.http_413"));
+                    default: throw new UserDisplayedError(Messages.formatString("atrusterror.http_generic", httpStatus, Optional.ofNullable(response.getReasonPhrase()).orElse("(null)")));
+                }
             }
                         
             Header refreshHeader = response.getHeader("refresh");
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
index e1ecf39c..cec7acd5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
@@ -215,7 +215,7 @@ public class MobileBKUState extends State {
 	}
 
 	/**
-	 * Show an error message to the user with only an "ok" option
+	 * Show an error message to the user with only an "ok" option;
 	 * throws UserCancelledException afterwards
 	 */
 	public void showUnrecoverableError(final @Nonnull String errorMessage) throws UserCancelledException {
-- 
cgit v1.2.3