session client UPDATE store absolute SSH key paths

Author: michalvasko

src/session_client_ssh.c

@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <pthread.h>
 #include <pwd.h>
 #include <stddef.h>
@@ -876,14 +877,25 @@ _nc_client_ssh_add_keypair(const char *pub_key, const char *priv_key, struct nc_
     }
 
     /* add the keys */
-    ++opts->key_count;
-    opts->keys = nc_realloc(opts->keys, opts->key_count * sizeof *opts->keys);
+    opts->keys = nc_realloc(opts->keys, (opts->key_count + 1) * sizeof *opts->keys);
     NC_CHECK_ERRMEM_RET(!opts->keys, -1);
-    opts->keys[opts->key_count - 1].pubkey_path = strdup(pub_key);
-    opts->keys[opts->key_count - 1].privkey_path = strdup(priv_key);
-    opts->keys[opts->key_count - 1].privkey_crypt = 0;
 
-    NC_CHECK_ERRMEM_RET(!opts->keys[opts->key_count - 1].pubkey_path || !opts->keys[opts->key_count - 1].privkey_path, -1);
+    opts->keys[opts->key_count].pubkey_path = realpath(pub_key, NULL);
+    if (!opts->keys[opts->key_count].pubkey_path) {
+        ERR(NULL, "Invalid public key path \"%s\" (%s).", pub_key, strerror(errno));
+        return -1;
+    }
+    opts->keys[opts->key_count].privkey_path = realpath(priv_key, NULL);
+    if (!opts->keys[opts->key_count].privkey_path) {
+        ERR(NULL, "Invalid private key path \"%s\" (%s).", priv_key, strerror(errno));
+        free(opts->keys[opts->key_count].pubkey_path);
+        return -1;
+    }
+    opts->keys[opts->key_count].privkey_crypt = 0;
+    ++opts->key_count;
+
+    /* use normalized path */
+    priv_key = opts->keys[opts->key_count - 1].privkey_path;
 
     /* check encryption */
     if ((key = fopen(priv_key, "r"))) {

tests/test_client_ssh.c

@@ -383,14 +383,14 @@ test_nc_client_ssh_adding_keypair(void **state)
     assert_int_equal(ret, 1);
 
     /* add second keypair */
-    ret = nc_client_ssh_add_keypair("key_pub", "key_priv");
+    ret = nc_client_ssh_add_keypair(TESTS_DIR "/data/key_rsa.pub", TESTS_DIR "/data/key_rsa");
     assert_int_equal(ret, 0);
     ret = nc_client_ssh_get_keypair_count();
     assert_int_equal(ret, 2);
     ret = nc_client_ssh_get_keypair(1, &pubkey1, &pubkey2);
     assert_int_equal(ret, 0);
-    assert_string_equal(pubkey1, "key_pub");
-    assert_string_equal(pubkey2, "key_priv");
+    assert_string_equal(pubkey1, TESTS_DIR "/data/key_rsa.pub");
+    assert_string_equal(pubkey2, TESTS_DIR "/data/key_rsa");
 
     /* delete first keypair */
     ret = nc_client_ssh_del_keypair(0);
@@ -402,7 +402,7 @@ test_nc_client_ssh_adding_keypair(void **state)
     assert_int_equal(ret, -1);
 
     /* try to add keypair that is already set */
-    ret = nc_client_ssh_add_keypair("key_pub", "key_priv");
+    ret = nc_client_ssh_add_keypair(TESTS_DIR "/data/key_rsa.pub", TESTS_DIR "/data/key_rsa");
     assert_int_equal(ret, -1);
     ret = nc_client_ssh_get_keypair_count();
     assert_int_equal(ret, 1);