From 303672d9cccd41bbfefae1a8c95faa68e6e63c74 Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Tue, 10 Jul 2018 15:17:30 +0200
Subject: [PATCH] dird: refactored pam auth

- allocate memory from head so multiple console connections can run simultaneously
- refactored some function calls
---
 core/src/dird/auth_pam.cc  | 56 +++++++++++++++++++-------------------
 core/src/dird/auth_pam.h   |  2 +-
 core/src/dird/ua_server.cc |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/core/src/dird/auth_pam.cc b/core/src/dird/auth_pam.cc
index b96847d0820..021afd4bf2a 100644
--- a/core/src/dird/auth_pam.cc
+++ b/core/src/dird/auth_pam.cc
@@ -21,20 +21,22 @@
 
 #include "auth_pam.h"
 
-#include "bareos.h"
 #include <cstring>
 #include <security/pam_appl.h>
 
+#include "bareos.h"
+#include "ua.h"
+
 static const int debuglevel = 200;
 
 static const std::string service_name("bareos");
 
 struct PamData {
    std::string username_;
-   BareosSocket *bs_;
+   BareosSocket *UA_sock_;
 
-   PamData(BareosSocket *bs, std::string username) {
-      bs_ = bs;
+   PamData(BareosSocket *UA_sock, std::string username) {
+      UA_sock_ = UA_sock;
       username_ = username;
    }
 };
@@ -43,15 +45,15 @@ struct PamData {
  * PAM-Callback called by Bareos PAM-Handler
  *
  */
-static bool pam_conv_callback_send_message(BareosSocket *bs, const char *msg, int msg_style)
+static bool PamConvSendMessage(BareosSocket *UA_sock, const char *msg, int msg_style)
 {
    char buf = msg_style;
-   if (!bs->send((const char*)&buf, 1)) {
-      Dmsg0(debuglevel, "pam_conv_callback_send_message error\n");
+   if (!UA_sock->send((const char*)&buf, 1)) {
+      Dmsg0(debuglevel, "PamConvSendMessage error\n");
       return false;
    }
-   if (!bs->send(msg, strlen(msg) +1)) {
-      Dmsg0(debuglevel, "pam_conv_callback_send_message error\n");
+   if (!UA_sock->send(msg, strlen(msg) +1)) {
+      Dmsg0(debuglevel, "PamConvSendMessage error\n");
       return false;
    }
    return true;
@@ -86,34 +88,30 @@ static int PamConversionCallback(int num_msg, const struct pam_message **msgm,
    for ( ; i < num_msg && !error; i++) {
       switch (msgm[i]->msg_style) {
          case PAM_PROMPT_ECHO_OFF:
-         case PAM_PROMPT_ECHO_ON: {
-            BareosSocket *bs = pam_data->bs_;
-               if (!pam_conv_callback_send_message(bs,
+         case PAM_PROMPT_ECHO_ON:
+               if (!PamConvSendMessage(pam_data->UA_sock_,
                      msgm[i]->msg, msgm[i]->msg_style)) {
                error = true;
                break;
             }
-            if (bs->IsStop() || bs->IsError()) {
+            if (pam_data->UA_sock_->IsStop() || pam_data->UA_sock_->IsError()) {
                error = true;
                break;
             }
-            if (bs->recv()) {
-               resp[i].resp = actuallystrdup(bs->msg);
+            if (pam_data->UA_sock_->recv()) {
+               resp[i].resp = actuallystrdup(pam_data->UA_sock_->msg);
             }
-            if (bs->IsStop() || bs->IsError()) {
+            if (pam_data->UA_sock_->IsStop() || pam_data->UA_sock_->IsError()) {
                error = true;
                break;
             }
             break;
-         }
          case PAM_ERROR_MSG:
-         case PAM_TEXT_INFO: {
-            BareosSocket *bs = pam_data->bs_;
-            if (!pam_conv_callback_send_message(bs,
+         case PAM_TEXT_INFO:
+            if (!PamConvSendMessage(pam_data->UA_sock_,
                   msgm[i]->msg, PAM_PROMPT_ECHO_ON)) {
                error = true;
                break;
-            }
          }
          default:
             Dmsg3(debuglevel, "message[%d]: pam error type: %d error: \"%s\"\n",
@@ -141,13 +139,16 @@ static int PamConversionCallback(int num_msg, const struct pam_message **msgm,
    return PAM_SUCCESS;
 }
 
-bool PamAuthenticateUseragent(BareosSocket *bs, std::string username)
+bool PamAuthenticateUseragent(BareosSocket *UA_sock, std::string username)
 {
-   PamData pam_data(bs, username);
-   const struct pam_conv pam_conversation = {PamConversionCallback, (void *) &pam_data};
-   pam_handle_t *pamh = nullptr;
+   std::unique_ptr<PamData> pam_callback_data(new PamData(UA_sock, username));
+   std::unique_ptr<struct pam_conv> pam_conversation_container(new struct pam_conv);
+   struct pam_handle *pamh; /* pam session handle */
+
+   pam_conversation_container->conv = PamConversionCallback;
+   pam_conversation_container->appdata_ptr = pam_callback_data.get();
 
-   int err = pam_start(service_name.c_str(), nullptr, &pam_conversation, &pamh);
+   int err = pam_start(service_name.c_str(), nullptr, pam_conversation_container.get(), &pamh);
    if (err != PAM_SUCCESS) {
       Dmsg1(debuglevel, "PAM start failed: %s\n", pam_strerror(pamh, err));
    }
@@ -168,8 +169,7 @@ bool PamAuthenticateUseragent(BareosSocket *bs, std::string username)
    }
 
    if (err == PAM_SUCCESS) {
-      if (!pam_conv_callback_send_message(bs,
-         "", PAM_SUCCESS)) {
+      if (!PamConvSendMessage(UA_sock, "", PAM_SUCCESS)) {
          Dmsg1(debuglevel, "PAM end failed: %s\n", pam_strerror(pamh, err));
          return false;
       }
diff --git a/core/src/dird/auth_pam.h b/core/src/dird/auth_pam.h
index b6122fc2732..27b7c8106fa 100644
--- a/core/src/dird/auth_pam.h
+++ b/core/src/dird/auth_pam.h
@@ -25,6 +25,6 @@
 #include <string>
 
 class BareosSocket;
-bool PamAuthenticateUseragent(BareosSocket *bs, std::string username);
+bool PamAuthenticateUseragent(BareosSocket *UA_sock, std::string username);
 
 #endif /* BAREOS_DIRD_AUTH_PAM_H_ */
diff --git a/core/src/dird/ua_server.cc b/core/src/dird/ua_server.cc
index 70ad1aa2a7c..de76a29b4a5 100644
--- a/core/src/dird/ua_server.cc
+++ b/core/src/dird/ua_server.cc
@@ -93,7 +93,7 @@ void *HandleUserAgentClientRequest(BareosSocket *user_agent_socket)
       goto getout;
    }
 
-   if (!PamAuthenticateUseragent(user_agent_socket, ua->cons ? ua->cons->name() : std::string("user"))) {
+   if (!PamAuthenticateUseragent(ua->UA_sock, ua->cons ? ua->cons->name() : std::string("user"))) {
       goto getout;
    }