diff --git a/jams-common/src/main/java/net/jami/jams/common/objects/user/User.java b/jams-common/src/main/java/net/jami/jams/common/objects/user/User.java index 068b4c3146378f5a8242b10eacad2acb0d625c79..3001e88ab4995513efb027c96b63708bd1bf2c18 100644 --- a/jams-common/src/main/java/net/jami/jams/common/objects/user/User.java +++ b/jams-common/src/main/java/net/jami/jams/common/objects/user/User.java @@ -88,6 +88,10 @@ public class User extends X509Entity implements BlockchainEntity, DatabaseObject return ethKey; } + public String getAccessLevelName() { + return this.accessLevel.name(); + } + @Override public void setKey(String key) { this.ethKey = key; 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 aecef83a0786b244cb117d4e8cb457a1dbf5c354..4d051cb336e751bd076f15607b7dc058f421dea0 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 @@ -85,7 +85,7 @@ public class LoginServlet extends HttpServlet { statementList.addStatement(statementElement); User user = dataStore.getUserDao().getObjects(statementList).get(0); if(certificateAuthority.getLatestCRL().get() != null) { - if(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null) + if(!user.getAccessLevelName().equals("ADMIN") && certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null) TomcatCustomErrorHandler.sendCustomError(resp, 401, "Invalid credentials provided!"); } }