@@ -17,19 +17,20 @@

 #include <memory>

 #include <vector>

-#include "request.h"

+#include "conversation.h"

 #include "dual_control.h"

-#include "validator.h"

+#include "generator.h"

 #include "logger.h"

-#include "conversation.h"

-#include "user.h"

-#include "token.h"

-#include "sys_pwd.h"

-#include "sys_unistd.h"

+#include "request.h"

+#include "session.h"

 #include "sys_fstream.h"

 #include "sys_pam.h"

+#include "sys_pwd.h"

 #include "sys_syslog.h"

-#include "session.h"

+#include "sys_unistd.h"

+#include "token.h"

+#include "user.h"

+#include "validator.h"

 namespace

 {

@@ -40,7 +41,10 @@ dual_control initialize()

     unistd unistd (unistd::create());

     directory directory (directory::create (unistd, pwd));

     fstreams fstreams (fstreams::create());

-    tokens tokens (tokens::create (fstreams));

+    sys_time time (sys_time::get());

+    int code_digits = 6;

+    totp_generator generator = totp_generator (time, "\x00", code_digits);

+    tokens tokens (tokens::create (fstreams, generator));

     validator validator (validator::create (directory, tokens));

     pam pam (pam::create());

     conversation conversation (conversation::create (pam));

@@ -67,4 +71,3 @@ PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, int argc,

 {

     return dc.setcred (pam_request ( pamh, flags, argc, argv));

 }

-

@@ -35,17 +35,15 @@ class system init_system()

 installer init_installer()

 {

     fstreams fstreams (fstreams::create());

-    tokens tokens (tokens::create (fstreams));

     pwd pwd (pwd::create());

     unistd unistd (unistd::create());

     directory directory (directory::create (unistd, pwd));

     stdlib stdlib (stdlib::get());

     sys_time time (sys_time::get());

     int code_digits = 6;

-    auto the_generator = std::make_shared<totp_generator> (time, "\x00",

-                         code_digits);

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

-                                            the_generator));

+    totp_generator generator = totp_generator (time, "\x00", code_digits);

+    tokens tokens (tokens::create (fstreams, generator));

+    installer installer (installer::create (tokens, unistd, directory, generator));

     return installer;

 }

@@ -59,4 +57,3 @@ int main (int argc, char *argv[])

     std::cout << generated_token << std::endl;

     return 0;

 }

-

@@ -27,11 +27,11 @@ private:

     tokens tokens_;

     unistd unistd_;

     directory directory_;

-    std::shared_ptr<totp_generator> generator_;

+    totp_generator generator_;

 public:

     impl (const tokens &tokens, const unistd &unistd,

           const directory &directory,

-          const std::shared_ptr<totp_generator> generator) :

+          const totp_generator generator) :

         tokens_ (tokens), unistd_ (unistd), directory_ (directory),

         generator_ (generator) {}

     std::string install_token() const override

@@ -51,7 +51,7 @@ public:

         }

         user user (found_user[0]);

-        std::string token (generator_->generate_token());

+        std::string token (generator_.generate_token());

         tokens_.save (user, token);

         return token;

     }

@@ -60,9 +60,7 @@ public:

 }

 installer installer::create (const tokens &tokens, const unistd &unistd,

-                             const directory &directory, const std::shared_ptr<totp_generator> generator)

+                             const directory &directory, const totp_generator &generator)

 {

-    return installer (std::make_shared<impl> (tokens, unistd, directory,

-                      generator));

+    return installer (std::make_shared<impl> (tokens, unistd, directory, generator));

 }

-

@@ -45,8 +45,7 @@ public:

     }

     static installer create (const tokens &tokens, const unistd &unistd,

                              const directory &directory,

-                             const std::shared_ptr<totp_generator> generator);

+                             const totp_generator &generator);

 };

 #endif

-

@@ -52,5 +52,6 @@ public:

     static unistd create();

 };

-#endif

+template class std::shared_ptr<unistd_ifc>;

+#endif

@@ -26,21 +26,27 @@ class tokens_impl : public tokens_ifc

 {

 private:

     fstreams fstreams_;

+    totp_generator generator_;

 public:

-    tokens_impl (const fstreams &fstreams) :

-        fstreams_ (fstreams) {}

+    tokens_impl (const fstreams &fstreams, const totp_generator generator) :

+        fstreams_ (fstreams), generator_(generator) {}

     std::string token (const user &user) const override

     {

-        const std::string file_path (user.home_directory() + "/.dual_control");

-        std::vector<char> line (7);

+        // return generator_.generate_token();

+        // Get key

+        const std::string file_path (user.home_directory() + "/.dual_control");

         fstreams::pstream stream (fstreams_.open_fstream (file_path));

         if (!stream->good()) {

             return "";

         }

+        // TODO: decode key

+        std::vector<char> line (32);

         stream->getline (line.data(), line.size());

+

+        // TODO: generate the token

         return std::string (line.data());

     }

     void save (const user &user, const std::string &token) const override

@@ -52,9 +58,9 @@ public:

     }

 };

 }

-tokens tokens::create (const fstreams &fstreams)

+

+tokens tokens::create (const fstreams &fstreams, const totp_generator &generator)

 {

     return tokens (tokens::delegate

-                   (new tokens_impl (fstreams)));

+                   (new tokens_impl (fstreams, generator)));

 }

-

@@ -18,6 +18,7 @@

 #include "user.h"

 #include "sys_fstream.h"

+#include "generator.h"

 class tokens_ifc

 {

@@ -50,8 +51,7 @@ public:

     {

         return delegate_->save (user, token);

     }

-    static tokens create (const fstreams &fstreams);

+    static tokens create (const fstreams &fstreams, const totp_generator &generator);

 };

 #endif

-

@@ -21,6 +21,7 @@

 #include "test_util.h"

 #include "user.h"

 #include "sys_fstream.h"

+#include "generator.h"

 class fake_user : public user_ifc

 {

@@ -82,6 +83,16 @@ public:

     }

 };

+class fake_totp_generator : public token_generator_ifc

+{

+private:

+    std::string expected_token = "<unspecified>";

+public:

+    std::string generate_token () const override {

+        return expected_token;

+    }

+};

+

 int reads_from_the_right_file ()

 {

     //given

@@ -91,11 +102,11 @@ int reads_from_the_right_file ()

     std::string token ("123456");

     fstreams test_streams (fstreams::delegate (new fake_fstreams (token_file,

                            token)));

+    totp_generator generator (totp_generator::delegate (new fake_totp_generator ()));

     //file_reader test_file_reader (file_reader::delegate (new fake_file_reader));

     user test_user (user::delegate (new fake_user (home_directory)));

-    tokens supplier (tokens::create (

-                         test_streams));

+    tokens supplier (tokens::create (test_streams, generator));

     //when

     std::string actual = supplier.token (test_user);

@@ -113,9 +124,10 @@ int returns_empty_string_if_file_open_fail()

     std::string token_file = home_directory + "/.not_dual_control";

     fstreams test_streams (fstreams::delegate (new fake_fstreams (token_file,

                            "654321")));

+    totp_generator generator (totp_generator::delegate (new fake_totp_generator ()));

+

     user test_user (user::delegate (new fake_user (home_directory)));

-    tokens supplier (tokens::create (

-                         test_streams));

+    tokens supplier (tokens::create (test_streams, generator));

     //when

     std::string actual = supplier.token (test_user);

@@ -132,8 +144,9 @@ int writes_the_token ()

     user test_user (user::delegate (new fake_user (home_directory)));

     mock_write_fstreams *mockfs (new mock_write_fstreams);

     fstreams test_streams{fstreams::delegate (mockfs)};

+    totp_generator generator (totp_generator::delegate (new fake_totp_generator ()));

     std::string token ("token");

-    tokens tokens (tokens::create (test_streams));

+    tokens tokens (tokens::create (test_streams, generator));

     //when

     tokens.save (test_user, token);

@@ -162,4 +175,3 @@ int main (int argc, char *argv[])

 {

     return !run_tests();

 }

-

@@ -61,4 +61,3 @@ validator validator::create (const directory &directory,

             tokens));

     return validator (delegate);

 }

-

@@ -17,6 +17,7 @@

 #include "user.h"

 #include "token.h"

+#include "generator.h"

 class validator_ifc

 {

@@ -53,4 +54,3 @@ public:

 };

 #endif

-