@@ -9,8 +9,8 @@ else

 endif

 INTEGRATION_OBJS = sys_syslog.o sys_fstream.o sys_unistd.o sys_pwd.o sys_pam.o \

-                   sys_stdlib.o sys_time.o

-OBJS = dual_control.o request.o validator.o conversation.o user.o token.o logger.o session.o installer.o system.o generator.o base32.o

+                   sys_stdlib.o sys_time.o random_source.o

+OBJS = dual_control.o request.o validator.o conversation.o user.o token.o logger.o session.o installer.o system.o generator.o base32.o random_source.o

 TEST_SOURCES := $(wildcard *_test.cc)

 TESTS := $(patsubst %.cc,%.out,$(TEST_SOURCES))

 TESTRUNS := $(patsubst %.out,RUN_%,$(TESTS))

@@ -38,12 +38,14 @@ installer init_installer()

 {

     fstreams fstreams (fstreams::create());

-    random_source_ifc foo (fstreams);

-    auto bytes = foo.get_random_bytes(16);

+    random_source foo (random_source::create(fstreams));

+    auto bytes = foo.get_random_bytes (16);

     std::cout << "I'm random: ";

+

     for (auto byte: bytes) {

-        std::cout << static_cast<unsigned int>(byte) << ", ";

+        std::cout << static_cast<unsigned int> (byte) << ", ";

     }

+

     std::cout << std::endl;

     pwd pwd (pwd::create());

new file mode 100644

@@ -0,0 +1,38 @@

+/* Copyright (C) CJ Affiliate

+ *

+ * You may use, distribute and modify this code under  the

+ * terms of the  GNU General Public License  version 2  or

+ * later.

+ *

+ * You should have received a copy of the license with this

+ * file. If not, you will find a copy in the "LICENSE" file

+ * at https://github.com/cjdev/dual-control.

+ */

+

+#include "random_source.h"

+#include "sys_fstream.h"

+

+namespace

+{

+class impl : public random_source_ifc

+{

+private:

+    fstreams fstreams_;

+public:

+    impl (fstreams fstreams)

+        : fstreams_ (fstreams)

+    {}

+    std::vector<uint8_t> get_random_bytes (int length) const override {

+        std::string file_path = "/dev/urandom";

+        fstreams::pstream random_source = fstreams_.open_fstream (file_path);

+

+        std::vector<uint8_t> result (length);

+        random_source->read (reinterpret_cast<char *> (result.data()), length);

+        return result;

+    }

+};

+}

+

+random_source random_source::create(fstreams &fstreams) {

+    return random_source(random_source::delegate (new impl (fstreams)));

+};

@@ -22,36 +22,29 @@

 class random_source_ifc

 {

- private:

-    fstreams fstreams_;

- public:

-    random_source_ifc (fstreams fstreams)

-        : fstreams_ (fstreams)

-    {}

-    virtual std::vector<uint8_t> get_random_bytes (int length) const {

-        std::string file_path = "/dev/urandom";

-        fstreams::pstream random_source = fstreams_.open_fstream(file_path);

-

-        std::vector<uint8_t> result(length);

-        random_source->read(reinterpret_cast<char *>(result.data()), length);

-        return result;

-        /* return {}; */

+public:

+    virtual std::vector<uint8_t> get_random_bytes (int length) const

+    {

+        return {};

     }

 };

 class random_source

 {

- public:

+public:

     using delegate = std::shared_ptr<random_source_ifc>;

- private:

+private:

     delegate delegate_;

- public:

+public:

     random_source (delegate delegate)

         : delegate_ (delegate)

     {}

-    std::vector<uint8_t> get_random_bytes (int length) const {

-        return delegate_->get_random_bytes(length);

+    std::vector<uint8_t> get_random_bytes (int length) const

+    {

+        return delegate_->get_random_bytes (length);

     }

+

+    static random_source create(fstreams &fstreams);

 };

 #endif