Merge branch 'devel'

Author: michalvasko

CMakeLists.txt

@@ -43,11 +43,11 @@ endif()
 # Generic version of not only the library. Major version is reserved for really big changes of the project,
 # minor version changes with added functionality (new tool, functionality of the tool or library, ...) and
 # micro version is changed with a set of small changes or bugfixes anywhere in the project.
-set(NP2SRV_VERSION 2.1.16)
+set(NP2SRV_VERSION 2.1.23)
 
 # libyang required version
-set(LIBYANG_DEP_VERSION 2.0.128)
-set(LIBYANG_DEP_SOVERSION 2.14.0)
+set(LIBYANG_DEP_VERSION 2.0.178)
+set(LIBYANG_DEP_SOVERSION 2.20.2)
 set(LIBYANG_DEP_SOVERSION_MAJOR 2)
 
 # libnetconf2 required version
@@ -56,8 +56,8 @@ set(LIBNETCONF2_DEP_SOVERSION 3.1.0)
 set(LIBNETCONF2_DEP_SOVERSION_MAJOR 3)
 
 # sysrepo required version
-set(SYSREPO_DEP_VERSION 2.1.36)
-set(SYSREPO_DEP_SOVERSION 7.3.0)
+set(SYSREPO_DEP_VERSION 2.1.53)
+set(SYSREPO_DEP_SOVERSION 7.5.0)
 set(SYSREPO_DEP_SOVERSION_MAJOR 7)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=gnu99")
@@ -77,6 +77,7 @@ option(ENABLE_URL "Enable URL capability" ON)
 set(THREAD_COUNT 5 CACHE STRING "Number of threads accepting new sessions and handling requests")
 set(POLL_IO_TIMEOUT 10 CACHE STRING "Timeout in milliseconds of polling sessions for new data. It is also used for synchronization of low level IO such as sending a reply while a notification is being sent")
 set(YANG_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/yang/modules/netopeer2" CACHE STRING "Directory where to copy the YANG modules to")
+set(SCRIPT_DIR "${CMAKE_INSTALL_PREFIX}/share/netopeer2" CACHE STRING "Directory where to copy the install scripts to")
 
 # script options
 option(INSTALL_MODULES "Install required modules into sysrepo" ON)
@@ -114,10 +115,10 @@ if(NOT NP2SRV_SSH_AUTHORIZED_KEYS_PATTERN MATCHES "^[^%]*%s[^%]*$")
 endif()
 
 if(NOT SERVER_DIR)
-    if("${BUILD_TYPE_UPPER}" STREQUAL "RELEASE")
-        set(SERVER_DIR "/var/netopeer2")
-    else()
+    if("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG")
         set(SERVER_DIR "$ENV{HOME}/.netopeer2-server")
+    else()
+        set(SERVER_DIR "/var/netopeer2")
     endif()
 endif()
 
@@ -331,11 +332,9 @@ configure_file("${PROJECT_SOURCE_DIR}/src/config.h.in" "${PROJECT_BINARY_DIR}/co
 configure_file("${PROJECT_SOURCE_DIR}/service/netopeer2-server.service.in" "${PROJECT_BINARY_DIR}/netopeer2-server.service" @ONLY)
 include_directories(${PROJECT_BINARY_DIR})
 
-# set script dir
-set(SCRIPT_DIR "${PROJECT_SOURCE_DIR}/scripts/")
-
-# install the module files
+# install the modules and scripts
 install(DIRECTORY "${PROJECT_SOURCE_DIR}/modules/" DESTINATION ${YANG_MODULE_DIR})
+install(DIRECTORY "${PROJECT_SOURCE_DIR}/scripts/" DESTINATION ${SCRIPT_DIR} USE_SOURCE_PERMISSIONS)
 
 # install the binary, required modules, and default configuration
 install(TARGETS netopeer2-server DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -409,6 +408,6 @@ add_custom_target(cleancache
 )
 
 # uninstall
-add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_MODULE_PATH}/uninstall.cmake"
-    COMMAND ${SCRIPT_DIR}/remove.sh
+add_custom_target(uninstall ${SCRIPT_DIR}/remove.sh
+    COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_MODULE_PATH}/uninstall.cmake"
     COMMENT "Removing netopeer2 modules from sysrepo...")

README.md

@@ -56,6 +56,7 @@ the `distro` directory.
 * [libyang](https://github.com/CESNET/libyang)
 * [libnetconf2](https://github.com/CESNET/libnetconf2)
 * [sysrepo](https://github.com/sysrepo/sysrepo)
+* c_rehash (only for CLI and if TLS is supported, is an OpenSSL Perl script)
 
 ### Optional
 

cli/CMakeLists.txt

@@ -7,7 +7,7 @@ include(CheckFunctionExists)
 project(netopeer2-cli C)
 
 # set version
-set(NP2CLI_VERSION 2.0.64)
+set(NP2CLI_VERSION 2.0.65)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cli_version.h.in" "${PROJECT_BINARY_DIR}/cli_version.h" ESCAPE_QUOTES @ONLY)
 include_directories(${PROJECT_BINARY_DIR})
 
@@ -36,15 +36,21 @@ if(LIBNETCONF2_ENABLED_SSH)
     include_directories(${LIBSSH_INCLUDE_DIRS})
 endif()
 
-# dependencies - libssl
+# dependencies - libssl, c_rehash for hashing CA dir
 if(LIBNETCONF2_ENABLED_TLS)
     if(NOT OPENSSL_FOUND)
         message(FATAL_ERROR "libnetconf2 supports TLS but OpenSSL was not found, CLI compilation failed!")
     endif()
     target_link_libraries(netopeer2-cli ${OPENSSL_LIBRARIES})
     include_directories(${OPENSSL_INCLUDE_DIR})
+
+    find_program(C_REHASH c_rehash)
+    if(NOT C_REHASH)
+        message(FATAL_ERROR "c_rehash Perl OpenSSL script not found!")
+    endif()
 endif()
 
+# compat checks
 check_function_exists(eaccess HAVE_EACCESS)
 check_function_exists(mkstemps HAVE_MKSTEMPS)
 if(HAVE_MKSTEMPS)

cli/commands.c

@@ -70,6 +70,7 @@ extern int done;
 LYD_FORMAT output_format = LYD_XML;
 uint32_t output_flag;
 char *config_editor;
+char *ext_data_path;
 struct nc_session *session;
 volatile int interleave;
 int timed;
@@ -462,6 +463,27 @@ cli_send_recv(struct nc_rpc *rpc, FILE *output, NC_WD_MODE wd_mode, int timeout_
     return ret;
 }
 
+static LY_ERR
+cli_ext_data_clb(const struct lysc_ext_instance *ext, void *user_data, void **ext_data, ly_bool *ext_data_free)
+{
+    const char *path = user_data;
+    struct lyd_node *data;
+    LY_ERR r;
+
+    if (strcmp(ext->def->module->name, "ietf-yang-schema-mount") || strcmp(ext->def->name, "mount-point")) {
+        return LY_EINVAL;
+    }
+
+    /* parse the data file */
+    if ((r = lyd_parse_data_path(ext->def->module->ctx, path, 0, LYD_PARSE_STRICT, LYD_VALIDATE_PRESENT, &data))) {
+        return r;
+    }
+
+    *ext_data = data;
+    *ext_data_free = 1;
+    return LY_SUCCESS;
+}
+
 static char *
 trim_top_elem(char *data, const char *top_elem, const char *top_elem_ns)
 {
@@ -1255,6 +1277,12 @@ cmd_userrpc_help(void)
     printf("user-rpc [--help] [--content <file>] [--out <file>] [--rpc-timeout <seconds>]\n");
 }
 
+static void
+cmd_extdata_help(void)
+{
+    printf("ext-data [--help] [--path <file>]\n");
+}
+
 static void
 cmd_timed_help(void)
 {
@@ -1742,6 +1770,10 @@ cmd_connect_listen_ssh(struct arglist *cmd, int is_connect)
         }
     }
 
+    if (ext_data_path) {
+        ly_ctx_set_ext_data_clb((struct ly_ctx *)nc_session_get_ctx(session), cli_ext_data_clb, ext_data_path);
+    }
+
     return EXIT_SUCCESS;
 }
 
@@ -2558,6 +2590,10 @@ cmd_connect_listen_tls(struct arglist *cmd, int is_connect)
         }
     }
 
+    if (ext_data_path) {
+        ly_ctx_set_ext_data_clb((struct ly_ctx *)nc_session_get_ctx(session), cli_ext_data_clb, ext_data_path);
+    }
+
     ret = EXIT_SUCCESS;
 
 error_cleanup:
@@ -2618,6 +2654,10 @@ cmd_connect_listen_unix(struct arglist *cmd, int is_connect)
         goto error_cleanup;
     }
 
+    if (ext_data_path) {
+        ly_ctx_set_ext_data_clb((struct ly_ctx *)nc_session_get_ctx(session), cli_ext_data_clb, ext_data_path);
+    }
+
     ret = EXIT_SUCCESS;
 
 error_cleanup:
@@ -6609,6 +6649,35 @@ cmd_userrpc(const char *arg, char **tmp_config_file)
     return ret;
 }
 
+static int
+cmd_extdata(const char *arg, char **UNUSED(tmp_config_file))
+{
+    char *cmd, *args = strdupa(arg), *ptr = NULL;
+
+    cmd = strtok_r(args, " ", &ptr);
+    cmd = strtok_r(NULL, " ", &ptr);
+    if (cmd == NULL) {
+        printf("Current file: ");
+        printf("%s\n", ext_data_path);
+    } else if ((strcmp(cmd, "--help") == 0) || (strcmp(cmd, "-h") == 0)) {
+        cmd_extdata_help();
+    } else {
+        if (access(cmd, F_OK) == -1) {
+            ERROR(__func__, "Unable to access file \"%s\" (%s).", cmd, strerror(errno));
+            return EXIT_FAILURE;
+        }
+
+        free(ext_data_path);
+        ext_data_path = strdup(cmd);
+    }
+
+    if (session) {
+        ly_ctx_set_ext_data_clb((struct ly_ctx *)nc_session_get_ctx(session), cli_ext_data_clb, ext_data_path);
+    }
+
+    return EXIT_SUCCESS;
+}
+
 static int
 cmd_timed(const char *arg, char **UNUSED(tmp_config_file))
 {
@@ -6679,6 +6748,7 @@ COMMAND commands[] = {
         "ietf-subscribed-notifications <modify-subscription> operation with ietf-yang-push augments"},
     {"resync-sub", cmd_resyncsub, cmd_resyncsub_help, "ietf-yang-push <resync-subscription> operation"},
     {"user-rpc", cmd_userrpc, cmd_userrpc_help, "Send your own content in an RPC envelope"},
+    {"ext-data", cmd_extdata, cmd_extdata_help, "Set path to a data file with libyang ext data"},
     {"timed", cmd_timed, cmd_timed_help, "Time all the commands (that communicate with a server) from issuing an RPC"
         " to getting a reply"},
     /* synonyms for previous commands */

distro/pkg/rpm/netopeer2-server.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=netopeer2 NETCONF server
+#After=
+
+[Service]
+Type=notify
+ExecStart=/usr/bin/netopeer2-server -d -v2
+Restart=always
+SystemCallArchitectures=native
+KillMode=control-group
+
+[Install]
+WantedBy=multi-user.target

distro/pkg/rpm/netopeer2-server.sysusers

@@ -0,0 +1,2 @@
+# Type Name             ID      GECOS                   Home directory        Shell
+m      root             sysrepo