@@ -1,7 +1,7 @@

 CXXFLAGS += -fPIC -fno-stack-protector

 CFLAGS += -fPIC -fno-stack-protector

-OBJS = dual_control.o argument.o

+OBJS = dual_control.o argument.o dual_control_integrate.o

 MODULELIB = pam_dual_control.so

@@ -26,6 +26,9 @@ distclean: clean

 dual_control.o: dual_control.h

+dual_control_test: dual_control_test.o dual_control.o

+	$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^

+

 argument_test: argument_test.o argument.o

 	$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^

@@ -36,10 +39,11 @@ conversation_test: conversation_test.o conversation.o

 	$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^

 .PHONY: test

-test: validator_test conversation_test argument_test

+test: validator_test conversation_test argument_test dual_control_test

 	@./validator_test

 	@./conversation_test

 	@./argument_test

+	@./dual_control_test

 .PHONY: install

 install: $(OBJS)

@@ -1,20 +1,23 @@

-#include <security/pam_modules.h>

-#include <string>

-#include <memory>

-#include <vector>

-#include "argument.h"

 #include "dual_control.h"

-extern dual_control dc;

+class impl : public dual_control_ifc {

+    public:

+        int authenticate(pam_handle *handle, int flags, const std::vector<const std::string> &arguments );

+        int setcred(pam_handle *handle, int flags, const std::vector<const std::string> &arguments);

+};

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

-    std::vector<const std::string> arguments = convert_arguments(argc, argv);

-    return dc.authenticate(pamh, flags, arguments);

+int impl::setcred(pam_handle *handle, int flags, const std::vector<const std::string> &arguments) {

+    return PAM_SUCCESS;

 }

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

-    std::vector<const std::string> arguments = convert_arguments(argc, argv);

-    return dc.setcred(pamh, flags, arguments);

+int impl::authenticate(pam_handle *handle, int flags, const std::vector<const std::string> &arguments) {

+    return -1209342;

 }

+dual_control create_dual_control() {

+    return dual_control(new impl);

+}

+

+

+

@@ -8,21 +8,14 @@

 class dual_control_ifc {

     public:

+        virtual ~dual_control_ifc() {}

         virtual int authenticate(pam_handle_t *handle, int flags, const std::vector<const std::string> &arguments ) = 0;

         virtual int setcred(pam_handle_t *handle, int flags, const std::vector<const std::string> &arguments) = 0;

 };

-class dual_control : public dual_control_ifc {

-    private:

-        std::shared_ptr<dual_control_ifc> delegate_;

-    public:

-        int authenticate(pam_handle_t *handle, int flags, const std::vector<const std::string> &arguments ) {

-            return delegate_->authenticate(handle, flags, arguments);

-        }

-        int setcred(pam_handle_t *handle, int flags, const std::vector<const std::string> &arguments) {

-            return delegate_->setcred(handle, flags, arguments);

-        }

-};

+typedef std::shared_ptr<dual_control_ifc> dual_control;

+

+dual_control create_dual_control();

 #endif

new file mode 100644

@@ -0,0 +1,20 @@

+#include <security/pam_modules.h>

+#include <string>

+#include <memory>

+#include <vector>

+

+#include "argument.h"

+#include "dual_control.h"

+

+extern dual_control dc;

+

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

+    std::vector<const std::string> arguments = convert_arguments(argc, argv);

+    return dc->authenticate(pamh, flags, arguments);

+}

+

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

+    std::vector<const std::string> arguments = convert_arguments(argc, argv);

+    return dc->setcred(pamh, flags, arguments);

+}

+

@@ -1,11 +1,40 @@

-#include <security/pam_appl.h>

 #include <security/pam_modules.h>

-#include <cstdio>

-#include "conversation.h"

-#include "token.h"

+#include "dual_control.h"

 #include "test_util.h"

+int setcred_returns_success() {

+    //given

+    pam_handle *pamh(0);

+    dual_control dc(create_dual_control());

+    std::vector<const std::string> arguments;

+

+    //when

+    int result = dc->setcred(pamh, 0, arguments);

+

+    //then

+    checkint(PAM_SUCCESS, result, "function return");

+    succeed();

+

+}

+

+RESET_VARS_START

+RESET_VARS_END

+

+int runtests() {

+    test(setcred_returns_success);

+    succeed();

+}

+

+int main(int argc, char* argv[]) {

+   return !runtests();

+}

+

+

+

+// DELETE BELOW HERE

+

+/*

 const char *validated_user = "";

 const char *validated_token = "";

 const char *token_to_return = "";

@@ -44,18 +73,6 @@ void log_failure() {

     log_failure_invoked = 1;

 }

-int pam_sm_setcred_returns_success() {

-    //given

-

-    //when

-    int result = pam_sm_setcred(NULL, 0, 0, NULL);

-

-    //then

-    checkint(PAM_SUCCESS, result, "function return");

-    succeed();

-

-}

-

 int pam_sm_authenticate_validates_with_received_token() {

     // given

     token_to_return = "user:pin";

@@ -111,18 +128,6 @@ int fails_with_invalid_token() {

     //then

     return result == PAM_AUTH_ERR;

 }

+*/

-int runtests() {

-    test(pam_sm_authenticate_validates_with_received_token);

-    test(pam_sm_setcred_returns_success);

-    test(pam_sm_authenticate_success_invokes_log_success);

-    test(pam_sm_authenticate_fail_invokes_log_failure);

-    test(succeeds_with_valid_token);

-    test(fails_with_invalid_token);

-    succeed();

-}

-

-int main(int argc, char* argv[]) {

-   return !runtests();

-}