0003733: Logging for authorization denied

JumpMind · Sep 21, 2018 · 4826ff4 · 4826ff4
1 parent 180c7a6
commit 4826ff4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -57,6 +57,7 @@
 import org.jumpmind.db.sql.Row;
 import org.jumpmind.db.sql.SqlException;
 import org.jumpmind.db.util.BinaryEncoding;
+import org.jumpmind.exception.HttpException;
 import org.jumpmind.exception.InvalidRetryException;
 import org.jumpmind.exception.IoException;
 import org.jumpmind.symmetric.ISymmetricEngine;
@@ -649,6 +650,8 @@ protected void logOrRethrow(Throwable ex) throws IOException {
             throw (AuthenticationException) ex;
         } else if (ex instanceof SyncDisabledException) {
             throw (SyncDisabledException) ex;
+        } else if (ex instanceof HttpException) {
+            throw (HttpException) ex;
         } else if (ex instanceof IOException) {
             throw (IOException) ex;
         } else if (ex instanceof InvalidRetryException) {

diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpIncomingTransport.java b/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpIncomingTransport.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 
 import org.apache.commons.io.IOUtils;
+import org.jumpmind.exception.HttpException;
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.service.IParameterService;
 import org.jumpmind.symmetric.service.RegistrationNotOpenException;
@@ -98,8 +99,9 @@ public InputStream openStream() throws IOException {
         if (manualRedirects) {
             connection = this.openConnectionCheckRedirects(connection);
         }
-
-        switch (connection.getResponseCode()) {
+
+        int code = connection.getResponseCode();
+        switch (code) {
         case WebConstants.REGISTRATION_NOT_OPEN:
             throw new RegistrationNotOpenException();
         case WebConstants.REGISTRATION_REQUIRED:
@@ -109,14 +111,18 @@ public InputStream openStream() throws IOException {
         case WebConstants.SC_SERVICE_BUSY:
             throw new ConnectionRejectedException();
         case WebConstants.SC_SERVICE_UNAVAILABLE:
-            throw new ServiceUnavailableException();
-        case WebConstants.SC_FORBIDDEN:
+            throw new ServiceUnavailableException();
+        // TODO: In 3.10, let's switch from 403 to 659
+        case WebConstants.SC_FORBIDDEN:
+        case 403:
             throw new AuthenticationException();
         case WebConstants.SC_NO_CONTENT:
-            throw new NoContentException();
-        default:
-            is = HttpTransportManager.getInputStreamFrom(connection);
-            return is;
+            throw new NoContentException();
+        case WebConstants.SC_OK:
+            is = HttpTransportManager.getInputStreamFrom(connection);
+            return is;
+        default:
+            throw new HttpException(code, "Received an unexpected response code of " + code + " from the server");
         }
     }
 

diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpOutgoingTransport.java b/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpOutgoingTransport.java
@@ -290,13 +290,14 @@ private void analyzeResponseCode(int code) throws IOException {
             throw new ConnectionRejectedException();
         } else if (WebConstants.SC_SERVICE_UNAVAILABLE == code) {
             throw new ServiceUnavailableException();
-        } else if (WebConstants.SC_FORBIDDEN == code) {
+        } else if (WebConstants.SC_FORBIDDEN == code || code == 403) {
+            // TODO: In 3.10, let's switch from 403 to 659
             throw new AuthenticationException();
         } else if (WebConstants.SYNC_DISABLED == code) {
             throw new SyncDisabledException();
         } else if (WebConstants.REGISTRATION_REQUIRED == code) {
             throw new RegistrationRequiredException();
-        } else if (200 != code) {
+        } else if (code != WebConstants.SC_OK) {
             throw new HttpException(code, "Received an unexpected response code of " + code + " from the server");
         }
     }

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/web/WebConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/web/WebConstants.java
@@ -60,6 +60,8 @@ public class WebConstants {
     public static final int SC_SERVICE_BUSY = 670;
 
     public static final int SC_NO_CONTENT = 204;
+
+    public static final int SC_OK = 200;
 
     public static final String ACK_BATCH_NAME = "batch-";