From 285b94edca353f8b1e7ddc5c5e1d801ff33f778f Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Mon, 27 Apr 2020 18:56:31 +0200
Subject: [PATCH] FIX: Rewrote Pam.java to work with new pam_authentication.c.
For issue #11
---
src/main/java/caosdb/server/accessControl/Pam.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/caosdb/server/accessControl/Pam.java b/src/main/java/caosdb/server/accessControl/Pam.java
index 606fddb6..d66abb21 100644
--- a/src/main/java/caosdb/server/accessControl/Pam.java
+++ b/src/main/java/caosdb/server/accessControl/Pam.java
@@ -4,8 +4,9 @@
*
* Copyright (C) 2018 Research Group Biomedical Physics,
* Max-Planck-Institute for Dynamics and Self-Organization Göttingen
- * Copyright (C) 2019 IndiScale GmbH
- * Copyright (C) 2019 Timm Fitschen (t.fitschen@indiscale.com)
+ * Copyright (C) 2019, 2020 Indiscale GmbH <info@indiscale.com>
+ * Copyright (C) 2019 Timm Fitschen <t.fitschen@indiscale.com>
+ * Copyright (C) 2020 Daniel Hornung <d.hornung@indiscale.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -70,9 +71,11 @@ public class Pam implements UserSource {
final File script = new File(this.pam_script);
- final ProcessBuilder pb = new ProcessBuilder(script.getAbsolutePath(), username, password);
+ final ProcessBuilder pb = new ProcessBuilder(script.getAbsolutePath(), username);
pb.directory(script.getParentFile());
- return pb.start();
+ final Process p = pb.start();
+ p.getOutputStream().write(password.getBytes());
+ return p;
}
@Override
--
GitLab