session server UPDATE hidden unix path without base

Author: Roytak

modules/libnetconf2-netconf-server@2025-11-11.yang

@@ -340,10 +340,7 @@ module libnetconf2-netconf-server {
               type empty;
               description
                 "Indicates that the UNIX socket path is not configured via YANG, but is instead
-                 determined by internal server API settings.
-
-                 The parent directory must be set by an internal server API setting.
-                 The final resolved path must be within the configured parent directory.";
+                 determined by internal server API settings.";
             }
           }
         }

src/session_server.c

@@ -461,33 +461,36 @@ char *
 nc_server_unix_get_socket_path(const struct nc_endpt *endpt)
 {
     LY_ARRAY_COUNT_TYPE i;
-    const char *filename = NULL;
+    const char *p = NULL;
     char *path = NULL;
 
     /* check the endpoints options for type of socket path */
     if (endpt->opts.unix->path_type == NC_UNIX_SOCKET_PATH_FILE) {
         /* UNIX socket endpoints always have only one bind, get its address */
-        filename = endpt->binds[0].address;
+        p = endpt->binds[0].address;
+
+        /* it is relative, we need to construct the full path */
+        if (nc_session_unix_construct_socket_path(p, &path)) {
+            return NULL;
+        }
     } else if (endpt->opts.unix->path_type == NC_UNIX_SOCKET_PATH_HIDDEN) {
-        /* search the mappings */
+        /* search the mappings, no need to construct the path */
         LY_ARRAY_FOR(server_opts.unix_paths, i) {
             if (!strcmp(server_opts.unix_paths[i].endpt_name, endpt->name)) {
-                filename = server_opts.unix_paths[i].path;
+                p = server_opts.unix_paths[i].path;
                 break;
             }
         }
-        if (!filename) {
+        if (!p) {
             ERR(NULL, "UNIX socket path mapping for endpoint \"%s\" not found.", endpt->name);
         }
+
+        path = strdup(p);
+        NC_CHECK_ERRMEM_RET(!path, NULL);
     } else {
         ERRINT;
     }
 
-    /* construct the full socket path */
-    if (nc_session_unix_construct_socket_path(filename, &path)) {
-        return NULL;
-    }
-
     return path;
 }
 

src/session_server.h

@@ -471,8 +471,9 @@ int nc_server_get_unix_socket_path(const char *endpoint_name, char **socket_path
 /**
  * @brief Set the base directory for UNIX socket paths.
  *
- * All UNIX socket paths will be relative to this directory.
+ * All YANG defined UNIX socket paths will be relative to this directory.
  * It must exist and be writable by the server process.
+ * This does not apply to "hidden" UNIX socket paths set via ::nc_server_set_unix_socket_path().
  *
  * @param[in] dir Base directory for UNIX socket paths.
  * @return 0 on success, 1 on error.

tests/test_unix_socket.c

@@ -59,9 +59,9 @@ setup_glob_f(void **state)
     assert_int_equal(ret, 0);
 
     /* set two hidden paths for UNIX sockets */
-    ret = nc_server_set_unix_socket_path("unix", "nc2_test_unix_sock");
+    ret = nc_server_set_unix_socket_path("unix", "/tmp/nc2_test_unix_sock");
     assert_int_equal(ret, 0);
-    ret = nc_server_set_unix_socket_path("unix2", "nc2_test_unix_sock2");
+    ret = nc_server_set_unix_socket_path("unix2", "/tmp/nc2_test_unix_sock2");
     assert_int_equal(ret, 0);
 
     return 0;