compat UPDATE move socket UID get into compat

Author: michalvasko

CMakeLists.txt

@@ -313,16 +313,6 @@ find_package(LibYANG ${LIBYANG_DEP_SOVERSION} REQUIRED)
 target_link_libraries(netconf2 ${LIBYANG_LIBRARIES})
 include_directories(${LIBYANG_INCLUDE_DIRS})
 
-# function compatibility - getpeereid on QNX
-if(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
-    target_link_libraries(netconf2 -lsocket)
-    list(APPEND CMAKE_REQUIRED_LIBRARIES socket)
-    list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES pthread)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_QNX_SOURCE)
-    check_symbol_exists(getpeereid "sys/types.h;unistd.h" HAVE_GETPEEREID)
-    list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_QNX_SOURCE)
-endif()
-
 # set sources
 target_sources(netconf2 PRIVATE ${libsrc} ${compatsrc})
 

CMakeModules/UseCompat.cmake

@@ -83,6 +83,19 @@ macro(USE_COMPAT)
         check_symbol_exists(crypt_r "unistd.h" HAVE_CRYPT_R)
     endif()
 
+    # unsock_get_uid
+    check_symbol_exists(SO_PEERCRED "sys/socket.h" HAVE_SO_PEERCRED)
+    if(NOT HAVE_SO_PEERCRED)
+        if(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
+            target_link_libraries(netconf2 -lsocket)
+            list(APPEND CMAKE_REQUIRED_LIBRARIES socket)
+            list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES pthread)
+            list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_QNX_SOURCE)
+        endif()
+        check_symbol_exists(getpeereid "sys/types.h;unistd.h" HAVE_GETPEEREID)
+        list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_QNX_SOURCE)
+    endif()
+
     test_big_endian(IS_BIG_ENDIAN)
 
     check_include_file("stdatomic.h" HAVE_STDATOMIC)

compat/compat.c

@@ -13,6 +13,8 @@
  */
 #define _POSIX_C_SOURCE 200809L /* fdopen, _POSIX_PATH_MAX, strdup */
 #define _ISOC99_SOURCE /* vsnprintf */
+#define _QNX_SOURCE /* getpeereid */
+#define _GNU_SOURCE /* SO_PEERCRED */
 
 #include "compat.h"
 
@@ -24,7 +26,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <sys/un.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -424,3 +429,30 @@ timegm(struct tm *tm)
 }
 
 #endif
+
+int
+unsock_get_uid(int sock, uid_t *uid)
+{
+    int r;
+
+#if defined(HAVE_SO_PEERCRED)
+    struct ucred ucred;
+    socklen_t len;
+
+    len = sizeof(ucred);
+    r = getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len);
+    if (!r) {
+        *uid = ucred.uid;
+    }
+#elif defined(GETPEEREUID)
+    r = getpeereid(sock, uid, NULL);
+#else
+    (void)sock;
+    (void)uid;
+
+    r = -1;
+    errno = ENOSYS;
+#endif
+
+    return r;
+}

compat/compat.h.in

@@ -79,8 +79,10 @@
 #cmakedefine HAVE_STRDUPA
 #cmakedefine HAVE_STRCHRNUL
 #cmakedefine HAVE_GET_CURRENT_DIR_NAME
-#cmakedefine HAVE_CRYPT_R
 #cmakedefine HAVE_TIMEGM
+#cmakedefine HAVE_CRYPT_R
+#cmakedefine HAVE_SO_PEERCRED
+#cmakedefine HAVE_GETPEEREID
 
 #ifndef bswap64
 #define bswap64(val) \
@@ -218,12 +220,10 @@ char *get_current_dir_name(void);
 
 #ifndef HAVE_CRYPT_R
 
-# if !defined (__FreeBSD__)
 /* unused anyway */
 struct crypt_data {
     char a;
 };
-# endif
 
 char *crypt_r(const char *phrase, const char *setting, struct crypt_data *data);
 #endif
@@ -232,4 +232,14 @@ char *crypt_r(const char *phrase, const char *setting, struct crypt_data *data);
 time_t timegm(struct tm *tm);
 #endif
 
+/**
+ * @brief Get UID of the owner of a socket.
+ *
+ * @param[in] sock Socket to analyze.
+ * @param[out] uid Socket owner UID.
+ * @return 0 on success,
+ * @return -1 on error.
+ */
+int unsock_get_uid(int sock, uid_t *uid);
+
 #endif /* _COMPAT_H_ */

src/session_server.c

@@ -12,8 +12,7 @@
  *
  *     https://opensource.org/licenses/BSD-3-Clause
  */
-#define _QNX_SOURCE /* getpeereid */
-#define _GNU_SOURCE /* threads, SO_PEERCRED */
+#define _GNU_SOURCE /* threads */
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -2325,43 +2324,6 @@ nc_server_set_address_port(struct nc_endpt *endpt, struct nc_bind *bind, const c
     return ret;
 }
 
-#if defined (SO_PEERCRED) || defined (HAVE_GETPEEREID)
-
-/**
- * @brief Get UID of the owner of a socket.
- *
- * @param[in] sock Socket to analyze.
- * @param[out] uid Socket owner UID.
- * @return 0 on success,
- * @return -1 on error.
- */
-static int
-nc_get_uid(int sock, uid_t *uid)
-{
-    int r;
-
-#ifdef SO_PEERCRED
-    struct ucred ucred;
-    socklen_t len;
-
-    len = sizeof(ucred);
-    r = getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len);
-    if (!r) {
-        *uid = ucred.uid;
-    }
-#else
-    r = getpeereid(sock, uid, NULL);
-#endif
-
-    if (r < 0) {
-        ERR(NULL, "Failed to get owner UID of a UNIX socket (%s).", strerror(errno));
-        return -1;
-    }
-    return 0;
-}
-
-#endif
-
 /**
  * @brief Fully accept a session on a connected UNIX socket.
  *
@@ -2373,14 +2335,13 @@ nc_get_uid(int sock, uid_t *uid)
 static int
 nc_accept_unix_session(struct nc_session *session, int sock)
 {
-#if defined (SO_PEERCRED) || defined (HAVE_GETPEEREID)
     struct passwd *pw, pw_buf;
     char *username;
     uid_t uid = 0;
     char *buf = NULL;
     size_t buf_len = 0;
 
-    if (nc_get_uid(sock, &uid)) {
+    if (unsock_get_uid(sock, &uid)) {
         close(sock);
         return -1;
     }
@@ -2405,13 +2366,6 @@ nc_accept_unix_session(struct nc_session *session, int sock)
     session->ti.unixsock.sock = sock;
 
     return 1;
-#else
-    (void)session;
-    (void)sock;
-
-    ERR(session, "Unable to learn the identity of the client connected to the UNIX socket, terminating.");
-    return -1;
-#endif
 }
 
 API int