cli UPDATE add known_hosts mode to config

Author: Petr Hanzlik

cli/commands.c

@@ -1479,8 +1479,11 @@ cmd_knownhosts(const char *arg, char **UNUSED(tmp_config_file))
             goto cleanup;
         }
 
+        opts.knownhosts_mode = knownhosts_mode;
         nc_client_ssh_set_knownhosts_mode(knownhosts_mode);
         nc_client_ssh_ch_set_knownhosts_mode(knownhosts_mode);
+
+        store_config();
         goto cleanup;
     }
 

cli/configuration.c

@@ -14,15 +14,13 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-
 #define _GNU_SOURCE
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -40,9 +38,9 @@
 #include "compat.h"
 #include "configuration.h"
 #include "linenoise/linenoise.h"
-#include "netopeer2-cli.h"
+#include "netopeer2_cli_yang.h"
 
-struct cli_opts opts = {.output_format = LYD_XML};
+struct cli_opts opts = {.output_format = LYD_XML, .knownhosts_mode = -1};
 
 /* NetConf Client home (appended to ~/) */
 #define NCC_DIR ".netopeer2-cli"
@@ -254,10 +252,11 @@ store_history(void)
     free(history_file);
 }
 
-void 
-load_auth_pref(struct lyd_node *match, int auth_pref_type) 
+static void
+load_auth_pref(struct lyd_node *match, int auth_pref_type)
 {
     uint16_t pref_value;
+
     if (!strcmp(lyd_get_value(match), "disabled")) {
         pref_value = -1;
     } else {
@@ -266,6 +265,24 @@ load_auth_pref(struct lyd_node *match, int auth_pref_type)
     nc_client_ssh_set_auth_pref(auth_pref_type, pref_value);
 }
 
+static int
+str2knownhosts_mode(const char *mode_str)
+{
+    if (!strcmp(mode_str, "accept")) {
+        return  NC_SSH_KNOWNHOSTS_ACCEPT;
+    } else if (!strcmp(mode_str, "accept-new")) {
+        return NC_SSH_KNOWNHOSTS_ACCEPT_NEW;
+    } else if (!strcmp(mode_str, "skip")) {
+        return NC_SSH_KNOWNHOSTS_SKIP;
+    } else if (!strcmp(mode_str, "strict")) {
+        return NC_SSH_KNOWNHOSTS_STRICT;
+    } else if (!strcmp(mode_str, "ask")) {
+        return NC_SSH_KNOWNHOSTS_ASK;
+    } else {
+        return -1;
+    }    
+}
+
 void
 load_config(void)
 {
@@ -275,7 +292,7 @@ load_config(void)
 
 #ifdef NC_ENABLED_SSH_TLS
     const char *key_pub, *key_priv;
-    struct lyd_node *auth_pref, *parent, *key;
+    struct lyd_node *parent = NULL, *key = NULL, *auth_pref = NULL;
 #endif
 
     if ((netconf_dir = get_netconf_dir()) == NULL) {
@@ -383,10 +400,12 @@ load_config(void)
 
     /* <netconf-client> -> <authentication> -> <knownhost-mode>*/
     lyd_find_path(auth_pref, "knownhost-mode", 0, &match);
-    str2knownhosts_mode(lyd_get_value(match), &opts.knownhosts_mode);
 
-    nc_client_ssh_set_knownhosts_mode(opts.knownhosts_mode);
-    nc_client_ssh_ch_set_knownhosts_mode(opts.knownhosts_mode);
+    if (match) {
+        opts.knownhosts_mode = str2knownhosts_mode(lyd_get_value(match));    
+        nc_client_ssh_set_knownhosts_mode(opts.knownhosts_mode);
+        nc_client_ssh_ch_set_knownhosts_mode(opts.knownhosts_mode);
+    }
 #endif /* NC_ENABLED_SSH_TLS */
 
 cleanup:
@@ -396,8 +415,8 @@ load_config(void)
     free(netconf_dir);
 }
 
-int 
-store_auth_pref(int pref_type, struct lyd_node *auth_pref_parent, const char *auth_pref_name) 
+static int
+store_auth_pref(int pref_type, struct lyd_node *auth_pref_parent, const char *auth_pref_name)
 {
     int pref_value;
     char buf[23];
@@ -417,6 +436,24 @@ store_auth_pref(int pref_type, struct lyd_node *auth_pref_parent, const char *au
     return 0;
 }
 
+static const char *
+knownhosts_mode2str(NC_SSH_KNOWNHOSTS_MODE mode)
+{
+    if (mode == NC_SSH_KNOWNHOSTS_ACCEPT) {
+        return "accept";
+    } else if (mode == NC_SSH_KNOWNHOSTS_ACCEPT_NEW) {
+        return "accept-new";
+    } else if (mode == NC_SSH_KNOWNHOSTS_ASK) {
+        return "ask";
+    } else if (mode == NC_SSH_KNOWNHOSTS_SKIP) {
+        return "skip";
+    } else if (mode == NC_SSH_KNOWNHOSTS_STRICT) {
+        return "strict";
+    } else {
+        return NULL;
+    }
+}
+
 void
 store_config(void)
 {
@@ -458,7 +495,7 @@ store_config(void)
     } else {
         ERROR(__func__, "Unknown format.");
         goto cleanup;
-    }   
+    }
 
     if (lyd_new_term(root, NULL, "output-format", str, 0, NULL)) {
         goto cleanup;
@@ -483,18 +520,18 @@ store_config(void)
     }
 
     /* pref */
-    if (lyd_new_inner(auth, NULL, "method-preference", 0,&pref)) {
+    if (lyd_new_inner(auth, NULL, "method-preference", 0, &pref)) {
         goto cleanup;
     }
-    
+
     if (store_auth_pref(NC_SSH_AUTH_PUBLICKEY, pref, "publickey")) {
         goto cleanup;
     }
-    
+
     if (store_auth_pref(NC_SSH_AUTH_PASSWORD, pref, "password")) {
         goto cleanup;
     }
-    
+
     if (store_auth_pref(NC_SSH_AUTH_INTERACTIVE, pref, "interactive")) {
         goto cleanup;
     }
@@ -518,6 +555,19 @@ store_config(void)
             }
         }
     }
+
+    /* knownhost-mode */
+    if (opts.knownhosts_mode != -1) {
+        str = knownhosts_mode2str(opts.knownhosts_mode);
+        if (!str) {
+            ERROR(__func__, "Unknown known host mode.");
+            goto cleanup;
+        }
+
+        if (lyd_new_term(auth, NULL, "knownhost-mode", str, 0, NULL)) {
+            goto cleanup;
+        }
+    }
 #endif /* NC_ENABLED_SSH_TLS */
 
     /* get netconf dir */
@@ -542,4 +592,4 @@ store_config(void)
     free(history_file);
     free(netconf_dir);
     free(config_file);
-}
+}

cli/configuration.h

@@ -26,6 +26,7 @@ struct cli_opts {
     LYD_FORMAT output_format;
     uint32_t output_flag;
     char *config_editor;
+    int knownhosts_mode;
 };
 
 extern struct cli_opts opts;