From 8c427e96aada65bbb677a2accc673896599a5ea7 Mon Sep 17 00:00:00 2001
From: William Enright <william.enright@savoirfairelinux.com>
Date: Mon, 6 Jul 2020 17:12:39 -0400
Subject: [PATCH] Fixed incorrect condition for user revocation status
Change-Id: Ib0b84399cebdd3af2d5a7ffc56e8398235769d4e
---
.../jami/jams/server/servlets/api/admin/users/UserServlet.java | 2 +-
.../jami/jams/server/servlets/api/auth/user/UserServlet.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java
index 6e6f1fb3..a8191bf5 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java
@@ -58,7 +58,7 @@ public class UserServlet extends HttpServlet {
statementList.addStatement(st1);
User user = dataStore.getUserDao().getObjects(statementList).get(0);
if(certificateAuthority.getLatestCRL().get() != null) {
- user.setRevoked(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) == null);
+ user.setRevoked(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null);
}
else user.setRevoked(false);
resp.getOutputStream().write(JsonStream.serialize(user).getBytes());
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
index 56806c52..dad2985e 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
@@ -77,7 +77,7 @@ public class UserServlet extends HttpServlet {
statementList.addStatement(st);
User user = dataStore.getUserDao().getObjects(statementList).get(0);
if(certificateAuthority.getLatestCRL().get() != null) {
- user.setRevoked(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) == null);
+ user.setRevoked(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null);
}
else user.setRevoked(false);
resp.getOutputStream().write(JsonStream.serialize(user).getBytes());
--
GitLab