diff --git a/src/main/java/caosdb/server/ServerProperties.java b/src/main/java/caosdb/server/ServerProperties.java index bbe8927950c2fb311bcbbbb85675d293ef62984b..52c7c33c8e8ac33f1f917a9923ee61bac1840121 100644 --- a/src/main/java/caosdb/server/ServerProperties.java +++ b/src/main/java/caosdb/server/ServerProperties.java @@ -150,10 +150,10 @@ public class ServerProperties extends Properties { String[] confFiles = confDir.list(); Arrays.sort(confFiles, Comparator.naturalOrder()); for (String confFile : confFiles) { - // prevent backup files from being read - if (confFile.endsWith(".conf")) { - loadConfigFile(serverProperties, new File(confDir, confFile)); - } + // prevent backup files from being read + if (confFile.endsWith(".conf")) { + loadConfigFile(serverProperties, new File(confDir, confFile)); + } } } diff --git a/src/main/java/caosdb/server/accessControl/Pam.java b/src/main/java/caosdb/server/accessControl/Pam.java index d45ddfb3b48c7ab317a48d3e590a5dd32066028e..d8eb41f0a1ecc3d90d99c69e4c5e424c36b75852 100644 --- a/src/main/java/caosdb/server/accessControl/Pam.java +++ b/src/main/java/caosdb/server/accessControl/Pam.java @@ -31,10 +31,14 @@ import java.util.Set; import org.apache.shiro.authz.AuthorizationException; import org.jvnet.libpam.PAMException; import org.jvnet.libpam.UnixUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Pam implements UserSource { - + public static class DefaultPamScriptCaller implements PamScriptCaller { + + private Logger logger = LoggerFactory.getLogger(getClass()); private final String pam_script; @@ -46,6 +50,7 @@ public class Pam implements UserSource { } public Process getProcess(final String username, final String password) throws IOException { + final File script = new File(this.pam_script); final ProcessBuilder pb = new ProcessBuilder(script.getAbsolutePath(), username, password); @@ -59,6 +64,7 @@ public class Pam implements UserSource { try { pam_authentication = getProcess(username, password); + logger.info("call pam script"); return pam_authentication.waitFor() == 0; } catch (final IOException e) { throw new RuntimeException(e);