From 03f9e391f3ac34dac5a8a796b36f910c223e50b5 Mon Sep 17 00:00:00 2001 From: Larbi Gharib <larbi.gharib@savoirfairelinux.com> Date: Wed, 28 Apr 2021 12:34:14 +0000 Subject: [PATCH] Fix no Certificate on install Change-Id: I7cb852db69183cd0bb20ee12c4629a2ca93be3d4 --- .../net/jami/jams/server/servlets/filters/FilterUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java index 9d2482cf..6f3b4dcd 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java @@ -88,8 +88,8 @@ public class FilterUtils { StatementElement statementElement = new StatementElement("username", "=", token.getJWTClaimsSet().getSubject(), ""); 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) return false; } JWSVerifier jwsVerifier = new RSASSAVerifier(userAuthenticationModule.getAuthModulePubKey()); -- GitLab