From 4d0ef143f0e75d9219ca7c61627f77ffb264a275 Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Mon, 3 May 2021 15:23:27 +0000
Subject: [PATCH] Fix no crl on login
Change-Id: I67098c08a4e4559a2f61ab1cd3d23abe542a9063
---
.../main/java/net/jami/jams/server/servlets/LoginServlet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
index 4d051cb3..45b64cad 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
@@ -84,8 +84,8 @@ public class LoginServlet extends HttpServlet {
StatementElement statementElement = new StatementElement("username", "=", object.getUsername(), "");
statementList.addStatement(statementElement);
User user = dataStore.getUserDao().getObjects(statementList).get(0);
- if(certificateAuthority.getLatestCRL().get() != null) {
- if(!user.getAccessLevelName().equals("ADMIN") && certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null)
+ if(!user.getAccessLevelName().equals("ADMIN") && certificateAuthority.getLatestCRL().get() != null) {
+ if(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null)
TomcatCustomErrorHandler.sendCustomError(resp, 401, "Invalid credentials provided!");
}
}
--
GitLab