From 5d9f770aef2d72766ba2953966fbe81ad9c01b98 Mon Sep 17 00:00:00 2001
From: "eugene.livis" <elivis@basistech.com>
Date: Wed, 18 Oct 2023 14:17:15 -0400
Subject: [PATCH] Improved error handling
---
.../java/src/org/sleuthkit/datamodel/SleuthkitCase.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index 78484e88f..bb832bd52 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -112,7 +112,10 @@ public class SleuthkitCase {
private static final ResourceBundle bundle = ResourceBundle.getBundle("org.sleuthkit.datamodel.Bundle");
private static final int IS_REACHABLE_TIMEOUT_MS = 1000;
private static final String SQL_ERROR_CONNECTION_GROUP = "08";
- private static final String SQL_CONNECTION_REJECTED = "08006";
+ // either one of these mean connection was rejected by Postgres server
+ private static final String SQL_CONNECTION_REJECTED_1 = "08004";
+ private static final String SQL_CONNECTION_REJECTED_2 = "08006";
+
private static final String SQL_ERROR_AUTHENTICATION_GROUP = "28";
private static final String SQL_ERROR_PRIVILEGE_GROUP = "42";
private static final String SQL_ERROR_RESOURCE_GROUP = "53";
@@ -305,7 +308,8 @@ public static void tryConnect(CaseDbConnectionInfo info) throws TskCoreException
String sqlState = ex.getSQLState().toLowerCase();
if (sqlState.startsWith(SQL_ERROR_CONNECTION_GROUP)) {
- if (SQL_CONNECTION_REJECTED.equals(ex.getSQLState())) {
+ if (SQL_CONNECTION_REJECTED_1.equals(ex.getSQLState()) ||
+ SQL_CONNECTION_REJECTED_2.equals(ex.getSQLState())) {
if (info.isSslEnabled()) {
result = "Server rejected the SSL connection attempt. Check SSL configuration.";
} else {
--
GitLab