@@ -3,6 +3,18 @@

 #include <security/pam_modules.h>

+class token_conversation {

+    public:

+        virtual ~token_conversation() {}

+        virtual std::string token() = 0;

+        virtual std::string user_name() = 0;

+}

+

+class pam_token_conversation : token_conversation {

+    public:

+        pam_token_conversation(pam_handle_t *pamh);

+}

+

 char const *ask_for_token(pam_handle_t *pamh);

 #endif

@@ -4,25 +4,15 @@

 #include <cstdlib>

 #include "logging.h"

-#include "token.h"

 #include "conversation.h"

+#include "validator.h"

-PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) {

-    const char *returned_token = ask_for_token(pamh);

+extern validator system_validator;

-    int returned_token_length = strlen(returned_token);

-    char working_token[returned_token_length + 1];

-    strcpy(working_token, returned_token);

-    char *colon = strchr(working_token, ':');

-    if(!colon) {

-        return PAM_AUTH_ERR;

-    }

-

-    *colon = 0;

-    char *user = working_token;

-    char *token = colon + 1;

+PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) {

-    int returned_validation = validate_token(user, token);

+    pam_token_conversation conversation(pamh);

+    int returned_validation = system_validator.validate(conversation.user_name(), conversation.token());

     if (returned_validation) {

         log_success();

@@ -10,65 +10,10 @@

 #include <memory>

 #include <fstream>

-#include "token.h"

-#include "test_support.h"

-

-

-typedef struct passwd passwd_t;

-class user {

-    private:

-        std::vector<char> passwd_buffer;

-        std::shared_ptr<passwd_t> sys_user_info;

-

-    public:

-        user(const std::string &user_name);

-        bool valid();

-        const std::string token();

-

-};

-

-const std::string user::token() {

-    // compute the token file path

-    std::string filepath = (std::string)sys_user_info->pw_dir + "/.dual_control";

-    // does the file exist?

-    std::ifstream token_file(filepath);

-    if (!token_file.good()) {

-        return "";

-    }

-

-    // read file

-    int token_length = 6;

-    std::vector<char> token_buffer(token_length + 1);

-    token_file.read(token_buffer.data(), token_length);

-    // return contents

-    return token_buffer.data();

-}

-

-bool user::valid() {

-    return sys_user_info;

-}

-

-user::user(const std::string &user_name) :

-        passwd_buffer(sysconf(_SC_GETPW_R_SIZE_MAX)) {

-    std::shared_ptr<passwd> temp_passwd(new passwd);

-    struct passwd *found_passwd(0);

-    getpwnam_r(user_name.c_str(), sys_user_info.get(), passwd_buffer.data(), passwd_buffer.size(), &found_passwd);

-

-    if (found_passwd) {

-        sys_user_info = temp_passwd;

-    }

-}

-

-int validate_token(const char *c_user_name, const char *c_token) {

-

-   user_p user(create_user(c_user_name));

-

-   validator_p validator(create_validator(user));

+#include "test_support.h"

-   return validator->valid(c_token);

-}

@@ -2,6 +2,7 @@

 #define _VALIDATOR_H

 #include <string>

+#include <memory>

 #include "user.h"

 #include "token.h"

@@ -17,4 +18,5 @@ class validator {

         bool validate(const std::string &user, const std::string &token);

 };

+

 #endif