From b99d2822a0190d72587b347e6141fdf6e96d1535 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 7 Feb 2020 11:56:02 +0100
Subject: [PATCH] BUG: unnecessary check if user exists removed
---
src/main/java/caosdb/server/accessControl/Pam.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/caosdb/server/accessControl/Pam.java b/src/main/java/caosdb/server/accessControl/Pam.java
index d640a66f..aef25d0e 100644
--- a/src/main/java/caosdb/server/accessControl/Pam.java
+++ b/src/main/java/caosdb/server/accessControl/Pam.java
@@ -24,7 +24,6 @@
*/
package caosdb.server.accessControl;
-import caosdb.server.caching.Cache;
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
@@ -37,6 +36,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.shiro.authz.AuthorizationException;
import org.jvnet.libpam.PAMException;
import org.jvnet.libpam.UnixUser;
+import caosdb.server.caching.Cache;
/**
* PAM UserSource for authenticating users via the Host's pam module.
@@ -260,7 +260,7 @@ public class Pam implements UserSource {
/** @see {@link UserSource#isValid(String, String)}. */
@Override
public boolean isValid(final String username, final String password) {
- if (isUserExisting(username)) {
+ if (username != null && isIncorporated(username)) {
return isValid(getPamScriptCaller(), username, password);
}
return false;
--
GitLab