Agent tests

Author: conormcd

src/clj_libssh2/agent.clj

@@ -26,10 +26,16 @@
       (throw (Exception. "Failed to initialize agent.")))
     (try
       (handle-errors session (libssh2-agent/connect ssh-agent))
-      (loop [previous nil]
-        (when-let [id (get-identity session ssh-agent previous)]
-          (when (not= 0 (libssh2-agent/userauth ssh-agent username id))
-            (recur id))))
+      (when-not (loop [success false
+                       previous nil]
+                  (if success
+                    success
+                    (if-let [id (get-identity session ssh-agent previous)]
+                      (recur
+                        (= 0 (libssh2-agent/userauth ssh-agent username id))
+                        id)
+                      false)))
+        (throw (Exception. "Failed to authenticate with the agent.")))
       (finally
         (handle-errors session (libssh2-agent/disconnect ssh-agent))
         (libssh2-agent/free ssh-agent)))))

test/clj_libssh2/test_agent.clj

@@ -0,0 +1,50 @@
+(ns clj-libssh2.test-agent
+  (:require [clojure.test :refer :all]
+            [clj-libssh2.libssh2 :as libssh2]
+            [clj-libssh2.libssh2.agent :as libssh2-agent]
+            [clj-libssh2.session :as session]
+            [clj-libssh2.test-utils :as test]))
+
+(test/fixtures)
+
+(defn agent-session
+  []
+  (session/open test/ssh-host
+                test/ssh-port
+                {:username (test/ssh-user)
+                 :agent true}))
+
+(defn open-and-close
+  []
+  (is (= 0 (count @session/sessions)))
+  (let [session (agent-session)]
+    (is (= 1 (count @session/sessions)))
+    (session/close session)
+    (is (= 0 (count @session/sessions)))))
+
+(deftest agent-authentication-works
+  (testing "A good session works"
+    (open-and-close))
+  (testing "If no identities match, we get an exception"
+    (with-redefs [libssh2-agent/userauth (constantly libssh2/ERROR_PUBLICKEY_UNVERIFIED)]
+      (is (thrown? Exception (open-and-close)))))
+  (testing "If there are no identities, we get an exception"
+    (with-redefs [libssh2-agent/get-identity (constantly 1)]
+      (is (thrown? Exception (open-and-close))))))
+
+(deftest agent-authentication-throws-but-doesn't-crash
+  (testing "when libssh2_agent_init fails"
+    (with-redefs [libssh2-agent/init (constantly nil)]
+      (is (thrown? Exception (open-and-close)))))
+  (testing "when libssh2_agent_connect fails"
+    (with-redefs [libssh2-agent/connect (constantly libssh2/ERROR_AGENT_PROTOCOL)]
+      (is (thrown? Exception (open-and-close)))))
+  (testing "when libssh2_agent_list_identities fails"
+    (with-redefs [libssh2-agent/list-identities (constantly libssh2/ERROR_BAD_USE)]
+      (is (thrown? Exception (open-and-close)))))
+  (testing "when libssh2_agent_get_identity fails"
+    (with-redefs [libssh2-agent/get-identity (constantly libssh2/ERROR_AGENT_PROTOCOL)]
+      (is (thrown? Exception (open-and-close)))))
+  (testing "when libssh2_agent_disconnect fails"
+    (with-redefs [libssh2-agent/disconnect (constantly libssh2/ERROR_SOCKET_DISCONNECT)]
+      (is (thrown? Exception (open-and-close))))))

test/script/setup.sh

@@ -67,6 +67,7 @@ generate_user_keys() {
 launch_ssh_agent() {
   require_executable ssh-agent
   eval "$(ssh-agent -s -a "${TMP_DIR}/agent.sock")" > /dev/null
+  ssh-add -D > /dev/null
 }
 
 launch_sshd() {