@@ -36,15 +36,7 @@ public:

         generator_ (generator) {}

     std::string install_key() const override

     {

-        const char *c_user_name = unistd_.getlogin();

-

-        if (c_user_name == nullptr) {

-            return "";

-        }

-

-        std::string user_name = c_user_name;

-

-        auto found_user = directory_.find_user (user_name);

+        auto found_user = directory_.get_current_user ();

         if (found_user.empty()) {

             return "";

@@ -85,9 +85,11 @@ class fake_directory : public directory_ifc

 {

 private:

     std::string expected_user_name_;

+    bool has_current_user_;

 public:

-    fake_directory (const std::string &expected_user_name) :

-        expected_user_name_ (expected_user_name)

+    fake_directory (const std::string &expected_user_name, bool has_current_user = true) :

+        expected_user_name_ (expected_user_name),

+        has_current_user_ (has_current_user)

     {

     }

     std::vector<user> find_user (const std::string &user_name) const override

@@ -100,7 +102,14 @@ public:

         return rval;

     }

-

+    std::vector<user> get_current_user() const override

+    {

+        std::vector<user> result = {};

+        if (has_current_user_) {

+            result = {find_user(expected_user_name_)};

+        }

+        return result;

+    }

 };

 int installs_token()

@@ -128,29 +137,29 @@ int installs_token()

     succeed();

 }

-int unistd_does_not_find_user_name_nullptr_case()

-{

-    //given

-    std::string user_name ("user");

-    std::string key ("token");

-    auto  test_tokens = std::make_shared<mock_tokens>(key);

-    tokens tokens{test_tokens};

-    unistd unistd (std::make_shared<fail_unistd>());

-    directory directory (std::make_shared<fake_directory> (user_name));

-    totp_generator generator (std::make_shared<fake_totp_generator>());

-

-    installer installer = installer::create (tokens, unistd, directory,

-                          generator);

-

-    //when

-    auto returned = installer.install_key();

-

-    //then

-    check (test_tokens->captured_token == "",

-           "should not have installed a token");

-    check (returned == "", "did not return empty token");

-    succeed();

-}

+// int unistd_does_not_find_user_name_nullptr_case()

+// {

+//     //given

+//     std::string user_name ("user");

+//     std::string key ("token");

+//     auto  test_tokens = std::make_shared<mock_tokens>(key);

+//     tokens tokens{test_tokens};

+//     unistd unistd (std::make_shared<fail_unistd>());

+//     directory directory (std::make_shared<fake_directory> (user_name));

+//     totp_generator generator (std::make_shared<fake_totp_generator>());

+

+//     installer installer = installer::create (tokens, unistd, directory,

+//                           generator);

+

+//     //when

+//     auto returned = installer.install_key();

+

+//     //then

+//     check (test_tokens->captured_token == "",

+//            "should not have installed a token");

+//     check (returned == "", "did not return empty token");

+//     succeed();

+// }

 int unistd_does_not_find_user_name_empty_string_case()

 {

@@ -160,7 +169,7 @@ int unistd_does_not_find_user_name_empty_string_case()

     auto  test_tokens = std::make_shared<mock_tokens>(key);

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fake_unistd> (""));

-    directory directory (std::make_shared<fake_directory> (user_name));

+    directory directory (std::make_shared<fake_directory> (user_name, false));

     totp_generator generator (totp_generator (std::make_shared<fake_totp_generator>()));

     installer installer = installer::create (tokens, unistd, directory,

@@ -183,7 +192,7 @@ int directory_finds_no_user_info()

     auto  test_tokens = std::make_shared<mock_tokens>(key);

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fake_unistd> (user_name));

-    directory directory (std::make_shared<fake_directory> ("not the user"));

+    directory directory (std::make_shared<fake_directory> ("not the user", false));

     totp_generator generator (std::make_shared<fake_totp_generator>());

     installer installer = installer::create (tokens, unistd, directory,

@@ -201,7 +210,7 @@ int directory_finds_no_user_info()

 int run_tests()

 {

     test (installs_token);

-    test (unistd_does_not_find_user_name_nullptr_case);

+    // test (unistd_does_not_find_user_name_nullptr_case);

     test (unistd_does_not_find_user_name_empty_string_case);

     test (directory_finds_no_user_info);

     succeed();

@@ -55,6 +55,24 @@ public:

         return return_value;

     }

+

+    std::vector<user> get_current_user () const override {

+        const char *c_user_name = unistd_.getlogin();

+

+        if (c_user_name == nullptr) {

+            return {};

+        }

+

+        std::string user_name = c_user_name;

+

+        auto found_user = find_user (user_name);

+

+        if (found_user.empty()) {

+            return {};

+        }

+

+        return {found_user[0]};

+    }

 };

 }

@@ -62,4 +80,3 @@ directory directory::create (unistd &unistd, pwd &pwd)

 {

     return directory (delegate (new directory_impl (unistd, pwd)));

 }

-

@@ -54,6 +54,9 @@ public:

     {

         return std::vector<user>();

     }

+    virtual std::vector<user> get_current_user () const {

+        return {};

+    };

 };

 class directory : public directory_ifc

@@ -63,16 +66,18 @@ public:

 private:

     delegate delegate_;

 public:

-    directory (delegate delegate) : delegate_

-        (delegate) {}

-    directory() : directory (delegate (new directory_ifc)) {}

+    directory (delegate delegate) : delegate_ (delegate) {}

+    /* directory() : directory (delegate (new directory_ifc)) {} */

     std::vector<user> find_user (const std::string &user_name) const

     {

         return delegate_->find_user (user_name);

     }

+    std::vector<user> get_current_user () const

+    {

+        return delegate_->get_current_user();

+    }

     static directory create (unistd &unistd, pwd &pwd);

 };

 #endif

-

@@ -75,20 +75,25 @@ public:

 class fake_unistd : public unistd_ifc

 {

 private:

-    int expected_name_;

+    int expected_sysconf_name_;

+    const char *expected_username_;

     long int return_value_;

 public:

-    fake_unistd (int expected_name, long int return_value = 0)

-        : expected_name_ (expected_name),

+    fake_unistd (int expected_sysconf_name, long int return_value = 0, const char *expected_username = "<unspecified>")

+        : expected_sysconf_name_ (expected_sysconf_name),

+          expected_username_ (expected_username),

           return_value_ (return_value) {}

     long int sysconf (int name) const override

     {

-        if (name == expected_name_) {

+        if (name == expected_sysconf_name_) {

             return return_value_;

         }

         return -1;

     }

+    const char * getlogin() const override{

+        return expected_username_;

+    }

 };

 int find_user_happy()

@@ -158,12 +163,46 @@ int find_user_fails_on_pwnam_r_error_and_result_ok()

     succeed();

 }

+int get_current_user_happy_path()

+{

+    //given

+    std::string user_name ("user");

+    pwd test_pwd(pwd::delegate (new fake_pwd (user_name)));

+    unistd test_unistd (unistd::delegate (new fake_unistd (_SC_GETPW_R_SIZE_MAX, 0, user_name.c_str())));

+    directory directory (directory::create (test_unistd, test_pwd));

+

+    //when

+    std::vector<user> results = directory.get_current_user();

+

+    //then

+    check (!results.empty(), "user should have been found");

+    check (!(results[0].home_directory() == user_name), "user should have been found");

+    succeed();

+}

+

+int get_current_user_nullptr_path()

+{

+    //given

+    pwd test_pwd(pwd::delegate (new fake_pwd ("<unspecified>")));

+    unistd test_unistd (unistd::delegate (new fake_unistd (_SC_GETPW_R_SIZE_MAX, 0, nullptr)));

+    directory directory (directory::create (test_unistd, test_pwd));

+

+    //when

+    std::vector<user> results = directory.get_current_user();

+

+    //then

+    check (results.empty(), "user should have been found");

+    succeed();

+}

+

 int run_tests()

 {

     test (find_user_happy);

     test (user_not_found);

     test (find_user_passes_buffer_and_size);

     test (find_user_fails_on_pwnam_r_error_and_result_ok);

+    test (get_current_user_happy_path);

+    test (get_current_user_nullptr_path);

     succeed();

 }

@@ -171,4 +210,3 @@ int main (int argc, char **argv)

 {

     return !run_tests();

 }

-