Add warning to log, when fpm socket was not registered on the expected path

Author: JoshuaBehrens

sapi/fpm/fpm/fpm_sockets.c

@@ -396,9 +396,20 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
 static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp) /* {{{ */
 {
 	struct sockaddr_un sa_un;
+    size_t socket_length = sizeof(sa_un.sun_path);
+    size_t address_length = strlen(wp->config->listen_address);
 
 	memset(&sa_un, 0, sizeof(sa_un));
-	strlcpy(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path));
+	strlcpy(sa_un.sun_path, wp->config->listen_address, socket_length);
+
+    if (address_length >= socket_length) {
+        zlog(
+            ZLOG_WARNING,
+            "[pool %s] cannot bind to UNIX socket '%s' as path is too long (found length: %lu, maximal length: %lu), trying cut socket path instead '%s'",
+            wp->config->name, wp->config->listen_address, address_length, socket_length, sa_un.sun_path
+        );
+    }
+
 	sa_un.sun_family = AF_UNIX;
 	return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un));
 }

sapi/fpm/fpm/fpm_unix.c

@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/un.h>
 #include <pwd.h>
 #include <grp.h>
 
@@ -63,6 +64,25 @@ static struct passwd *fpm_unix_get_passwd(struct fpm_worker_pool_s *wp, const ch
 	return pwd;
 }
 
+static inline bool fpm_unix_check_listen_address(struct fpm_worker_pool_s *wp, const char *address, int flags)
+{
+    struct sockaddr_un test_socket;
+    size_t address_length = strlen(address);
+    size_t socket_length = sizeof(test_socket.sun_path);
+
+    if (wp->listen_address_domain != FPM_AF_UNIX) {
+        return true;
+    }
+
+    if (address_length < socket_length) {
+        return true;
+    }
+
+    zlog(flags, "[pool %s] cannot bind to UNIX socket '%s' as path is too long (found length: %lu, maximal length: %lu)", wp->config->name, address, address_length, socket_length);
+
+    return false;
+}
+
 static inline bool fpm_unix_check_passwd(struct fpm_worker_pool_s *wp, const char *name, int flags)
 {
 	return !name || fpm_unix_is_id(name) || fpm_unix_get_passwd(wp, name, flags);
@@ -88,8 +108,10 @@ bool fpm_unix_test_config(struct fpm_worker_pool_s *wp)
 {
 	struct fpm_worker_pool_config_s *config = wp->config;
 	return (
+		fpm_unix_check_listen_address(wp, config->listen_address, ZLOG_ERROR) &&
 		fpm_unix_check_passwd(wp, config->user, ZLOG_ERROR) &&
 		fpm_unix_check_group(wp, config->group, ZLOG_ERROR) &&
+        fpm_unix_check_listen_address(wp, config->listen_address, ZLOG_SYSERROR) &&
 		fpm_unix_check_passwd(wp, config->listen_owner, ZLOG_SYSERROR) &&
 		fpm_unix_check_group(wp, config->listen_group, ZLOG_SYSERROR)
 	);