lws_stub: improvements

Author: lws-team

include/libwebsockets/lws-stub.h

@@ -106,6 +106,16 @@ lws_stub_request(struct lws_stub_manager *mgr,
 LWS_VISIBLE LWS_EXTERN void
 lws_stub_destroy(struct lws_stub_manager **_mgr);
 
+/**
+ * lws_stub_get_secret() - Retrieve the generated secret for a stub manager
+ *
+ * \param mgr: The manager returned by lws_stub_spawn
+ *
+ * Returns pointer to the 128-char secret string, or NULL if mgr is invalid.
+ */
+LWS_VISIBLE LWS_EXTERN const char *
+lws_stub_get_secret(struct lws_stub_manager *mgr);
+
 
 LWS_VISIBLE LWS_EXTERN int
 lws_callback_stub_client(struct lws *wsi, enum lws_callback_reasons reason,

lib/core-net/stub.c

@@ -57,6 +57,7 @@ struct lws_stub_manager {
 	struct lws_context		*cx;
 	struct lws_vhost		*vh;
 	char				uds_path[256];
+	char				stub_name[128];
 	char				secret[129];
 	struct lws_spawn_piped		*lsp;
 	struct lws_stub_config		config;
@@ -92,7 +93,12 @@ lws_stub_spawn(const struct lws_stub_config *config)
 	mgr->cx = config->cx;
 	mgr->vh = config->vh;
 	memcpy(&mgr->config, config, sizeof(mgr->config));
-	lws_strncpy(mgr->uds_path, config->uds_path, sizeof(mgr->uds_path));
+	if (config->uds_path)
+		lws_strncpy(mgr->uds_path, config->uds_path, sizeof(mgr->uds_path));
+	mgr->config.uds_path = mgr->uds_path;
+	if (config->stub_name)
+		lws_strncpy(mgr->stub_name, config->stub_name, sizeof(mgr->stub_name));
+	mgr->config.stub_name = mgr->stub_name;
 	mgr->protocols = config->protocols;
 
 	/* Generate a secure 128-char secret */
@@ -147,7 +153,7 @@ lws_stub_spawn(const struct lws_stub_config *config)
 #endif
 
 	mgr->exec_array[n++] = exe_path;
-	lwsl_notice("%s: Spawning stub with exe: %s\n", __func__, exe_path);
+	lwsl_vhost_notice(mgr->vh, "%s: Spawning stub '%s' with exe: %s\n", __func__, config->stub_name, exe_path);
 	/* Construct the stub argument dynamically */
 	lws_snprintf(mgr->stub_arg, sizeof(mgr->stub_arg), "--lws-stub=%s", config->stub_name);
 	mgr->exec_array[n++] = mgr->stub_arg;
@@ -165,43 +171,43 @@ lws_stub_spawn(const struct lws_stub_config *config)
 		if (stdin_fd) {
 			DWORD bw;
 			if (!WriteFile(stdin_fd, mgr->secret, 128, &bw, NULL)) {
-				lwsl_err("%s: Failed writing secret to pipe\n", __func__);
+				lwsl_vhost_err(mgr->vh, "%s: stub '%s' failed writing secret to pipe\n", __func__, config->stub_name);
 				goto spawn_fail;
 			}
 			if (config->extra_payload && config->extra_payload_len) {
 				if (!WriteFile(stdin_fd, config->extra_payload, (DWORD)config->extra_payload_len, &bw, NULL)) {
-					lwsl_err("%s: Failed writing extra payload to pipe\n", __func__);
+					lwsl_vhost_err(mgr->vh, "%s: stub '%s' failed writing extra payload to pipe\n", __func__, config->stub_name);
 					goto spawn_fail;
 				}
 			}
 		} else {
-			lwsl_err("%s: No stdin pipe available\n", __func__);
+			lwsl_vhost_err(mgr->vh, "%s: stub '%s' no stdin pipe available\n", __func__, config->stub_name);
 			goto spawn_fail;
 		}
 #else
 		if (stdin_fd >= 0) {
 			if (write(stdin_fd, mgr->secret, 128) < 0) {
-				lwsl_err("%s: Failed writing secret to pipe\n", __func__);
+				lwsl_vhost_err(mgr->vh, "%s: stub '%s' failed writing secret to pipe\n", __func__, config->stub_name);
 				goto spawn_fail;
 			}
 			if (config->extra_payload && config->extra_payload_len) {
 				if (write(stdin_fd, config->extra_payload, (unsigned int)config->extra_payload_len) < 0) {
-					lwsl_err("%s: Failed writing extra payload to pipe\n", __func__);
+					lwsl_vhost_err(mgr->vh, "%s: stub '%s' failed writing extra payload to pipe\n", __func__, config->stub_name);
 					goto spawn_fail;
 				}
 			}
 		} else {
-			lwsl_err("%s: No stdin pipe available\n", __func__);
+			lwsl_vhost_err(mgr->vh, "%s: stub '%s' no stdin pipe available\n", __func__, config->stub_name);
 			goto spawn_fail;
 		}
 #endif
 	} else {
-		lwsl_vhost_err(mgr->vh, "%s: Failed to spawn stub %s\n", __func__, config->stub_name);
+		lwsl_vhost_err(mgr->vh, "%s: Failed to spawn stub '%s'\n", __func__, config->stub_name);
 		lws_free(mgr);
 		return NULL;
 	}
 
-	lwsl_vhost_notice(mgr->vh, "%s: Spawned stub %s\n", __func__, config->stub_name);
+	lwsl_vhost_notice(mgr->vh, "%s: Spawned stub '%s'\n", __func__, config->stub_name);
 
 	if (!mgr->sul.list.owner && !mgr->wsi_client)
 		lws_stub_client_connect(mgr);
@@ -210,7 +216,7 @@ lws_stub_spawn(const struct lws_stub_config *config)
 
 spawn_fail:
 	lws_spawn_piped_kill_child_process(mgr->lsp);
-	lwsl_vhost_err(mgr->vh, "%s: Failed to initialize spawned stub %s\n", __func__, config->stub_name);
+	lwsl_vhost_err(mgr->vh, "%s: Failed to initialize spawned stub '%s'\n", __func__, config->stub_name);
 	lws_free(mgr);
 	return NULL;
 }
@@ -238,7 +244,7 @@ lws_stub_server_init(const struct lws_stub_config *config, char *secret_out, voi
 	}
 
 	if (rx < 64) {
-		lwsl_err("%s: Failed to read secret from stdin\n", __func__);
+		lwsl_err("%s: stub '%s': Failed to read secret from stdin\n", __func__, config->stub_name ? config->stub_name : "unknown");
 		return -1;
 	}
 	secret_out[128] = '\0';
@@ -249,7 +255,7 @@ lws_stub_server_init(const struct lws_stub_config *config, char *secret_out, voi
 		 * and unknown to the child, and the pipe remains open for future IPC. */
 		ssize_t n = read(0, (void *)extra_out, (unsigned int)extra_len);
 		if (n < 0) {
-			lwsl_err("%s: Failed to read extra payload\n", __func__);
+			lwsl_err("%s: stub '%s': Failed to read extra payload\n", __func__, config->stub_name ? config->stub_name : "unknown");
 			/* Non-fatal */
 		}
 	}
@@ -265,7 +271,7 @@ lws_stub_server_init(const struct lws_stub_config *config, char *secret_out, voi
 	unlink(info.iface);
 	vh_uds = lws_create_vhost(config->cx, &info);
 	if (!vh_uds) {
-		lwsl_err("%s: Failed to create UDS vhost\n", __func__);
+		lwsl_err("%s: stub '%s': Failed to create UDS vhost\n", __func__, config->stub_name ? config->stub_name : "unknown");
 		return -1;
 	}
 
@@ -295,6 +301,23 @@ static const lws_retry_bo_t stub_retry = {
 static void
 stub_retry_cb(lws_sorted_usec_list_t *sul);
 
+static int
+lws_stub_child_is_alive(struct lws_stub_manager *mgr)
+{
+	if (!mgr || !mgr->lsp)
+		return 0;
+
+#if !defined(WIN32)
+	if (mgr->lsp->child_pid <= 0)
+		return 0;
+	if (kill(mgr->lsp->child_pid, 0) == 0 || errno == EPERM)
+		return 1;
+	return 0;
+#else
+	return 1;
+#endif
+}
+
 static int
 lws_stub_client_connect(struct lws_stub_manager *mgr)
 {
@@ -317,16 +340,22 @@ lws_stub_client_connect(struct lws_stub_manager *mgr)
 	i.retry_and_idle_policy = &stub_retry;
 	i.method		= "RAW"; /* RAW connection */
 
-	lwsl_vhost_notice(mgr->vh, "protocol %s, addr %s\n", i.protocol, i.address);
+	lwsl_vhost_notice(mgr->vh, "%s: stub '%s', protocol %s, addr %s\n", __func__, mgr->config.stub_name, i.protocol, i.address);
 	mgr->wsi_client = lws_client_connect_via_info(&i);
 	if (!mgr->wsi_client) {
 		if (mgr->ctry < 10) {
 			uint32_t ms = stub_retry.retry_ms_table[
 				mgr->ctry < stub_retry.retry_ms_table_count ?
 				mgr->ctry : stub_retry.retry_ms_table_count - 1];
 			mgr->ctry++;
-			if (mgr->ctry > 1)
-				lwsl_notice("%s: Synchronous connect failed (errno %d), retrying in %u ms (attempt %d)\n", __func__, LWS_ERRNO, (unsigned int)ms, mgr->ctry);
+			if (mgr->ctry > 1) {
+				int alive = lws_stub_child_is_alive(mgr);
+				lwsl_vhost_notice(mgr->vh, "%s: stub '%s': Synchronous connect failed (errno %d), stub process %s (PID %d), retrying in %u ms (attempt %d)\n",
+						  __func__, mgr->config.stub_name, LWS_ERRNO,
+						  alive ? "is alive" : "has DIED/DOES NOT EXIST",
+						  mgr->lsp ? (int)mgr->lsp->child_pid : -1,
+						  (unsigned int)ms, mgr->ctry);
+			}
 			lws_sul_schedule(mgr->cx, 0, &mgr->sul, stub_retry_cb, ms * 1000);
 		}
 
@@ -354,14 +383,19 @@ lws_callback_stub_client(struct lws *wsi, enum lws_callback_reasons reason,
 		return 0;
 
 	switch (reason) {
-	case LWS_CALLBACK_CLIENT_CONNECTION_ERROR:
-		lwsl_err("%s: Client connection failed\n", __func__);
+	case LWS_CALLBACK_CLIENT_CONNECTION_ERROR: {
+		int alive = lws_stub_child_is_alive(mgr);
+		lwsl_vhost_err(mgr->vh, "%s: stub '%s': Client connection failed (stub process %s, PID %d)\n",
+			       __func__, mgr->config.stub_name,
+			       alive ? "is alive" : "has DIED/DOES NOT EXIST",
+			       mgr->lsp ? (int)mgr->lsp->child_pid : -1);
 		mgr->wsi_client = NULL;
 		lws_retry_sul_schedule(mgr->cx, 0, &mgr->sul, &stub_retry, stub_retry_cb, &mgr->ctry);
 		break;
+	}
 
 	case LWS_CALLBACK_RAW_CONNECTED:
-		lwsl_notice("%s: UDS connected to stub\n", __func__);
+		lwsl_vhost_notice(mgr->vh, "%s: stub '%s': UDS connected\n", __func__, mgr->config.stub_name);
 		mgr->ctry = 0; /* Reset retry counter on success */
 		if (mgr->config.connected_cb)
 			mgr->config.connected_cb(mgr);
@@ -409,7 +443,7 @@ lws_callback_stub_client(struct lws *wsi, enum lws_callback_reasons reason,
 		if (req->rx_cb) {
 			int m = lejp_parse(&req->jctx, (uint8_t *)in, (int)len);
 			if (m < 0 && m != LEJP_CONTINUE) {
-				lwsl_err("%s: lejp parse failed: %d\n", __func__, m);
+				lwsl_vhost_err(mgr->vh, "%s: stub '%s' lejp parse failed: %d\n", __func__, mgr->config.stub_name, m);
 				lws_dll2_remove(&req->list);
 				lws_free(req->tx_buf);
 				lejp_destruct(&req->jctx);
@@ -509,4 +543,12 @@ lws_stub_destroy(struct lws_stub_manager **_mgr)
 	lws_free(mgr);
 	*_mgr = NULL;
 }
+
+const char *
+lws_stub_get_secret(struct lws_stub_manager *mgr)
+{
+	if (!mgr)
+		return NULL;
+	return mgr->secret;
+}
 #endif

lib/roles/http/server/lejp-conf.c

@@ -1438,12 +1438,13 @@ lwsws_get_config_vhosts(struct lws_context *context,
 	struct jpargs a;
 	char dd[128];
 
-	if (lws_cmdline_option_cx(context, "--lws-dht-dnssec-monitor-root")) {
+	if (lws_cmdline_option_cx(context, "--lws-dht-dnssec-monitor-root") ||
+	    lws_cmdline_option_cx(context, "--lws-stub")) {
 		struct lws_context_creation_info i;
 
-		lwsl_notice("%s: monitor process: skipping vhost parsing\n", __func__);
+		lwsl_notice("%s: stub/monitor process: skipping vhost parsing\n", __func__);
 		memset(&i, 0, sizeof(i));
-		i.vhost_name = "root-monitor-dummy";
+		i.vhost_name = "stub-dummy";
 		i.port = CONTEXT_PORT_NO_LISTEN;
 		i.options = info->options | LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT | LWS_SERVER_OPTION_VH_INSTANTIATE_ALL_PROTOCOLS;
 		i.protocols = info->protocols;

plugins/protocol_lws_cert_dist_client/protocol_lws_cert_dist_client.c

@@ -609,17 +609,16 @@ callback_cert_dist_client(struct lws *wsi, enum lws_callback_reasons reason,
 					break;
 				}
 
-				/* Build UDS payload */
-				/* Expected by stub: {"secret":"...","subdomain":"...","fullchain":"...","privkey":"..."} */
-				int est_len = (pss->cert_len * 2) + (pss->key_len * 2) + (int)strlen(pss->subdomain) + (int)strlen(vhd->secret) + 128;
+				const char *sec = lws_stub_get_secret(vhd->stub_mgr);
+				int est_len = (pss->cert_len * 2) + (pss->key_len * 2) + (int)strlen(pss->subdomain) + (sec ? (int)strlen(sec) : 0) + 128;
 				pss->uds_tx = malloc((size_t)est_len + LWS_PRE);
 				if (!pss->uds_tx) {
 					lwsl_err("%s: OOM alloc uds tx\n", __func__);
 					break;
 				}
 				pss->uds_tx_len = lws_snprintf(pss->uds_tx + LWS_PRE, (size_t)est_len,
 					"{\"secret\":\"%s\",\"subdomain\":\"%s\",\"fullchain\":\"",
-					vhd->secret, pss->subdomain);
+					sec ? sec : "", pss->subdomain);
 
 				char *p = pss->uds_tx + LWS_PRE + pss->uds_tx_len;
 				char *src = pss->cert;
@@ -704,21 +703,46 @@ callback_cert_dist_client(struct lws *wsi, enum lws_callback_reasons reason,
 	case LWS_CALLBACK_PROTOCOL_INIT:
 		{
 			const char *stub = lws_cmdline_option_cx(lws_get_context(wsi), "--lws-stub");
-                        char uds_path[256];
-                        char stub_name[256];
-
-                        if (!in)
-				return 0;
-
-			const char *vh_name = lws_get_vhost_name(lws_get_vhost(wsi));
 
 			if (stub) {
-				char expected_stub[256];
-				lws_snprintf(expected_stub, sizeof(expected_stub), "stub-%s", vh_name);
-				if (strcmp(stub, expected_stub))
+				if (strncmp(stub, "stub-client-", 12) && strncmp(stub, "stub-", 5))
 					return 0;
+
+				const char *orig_vh = strncmp(stub, "stub-client-", 12) == 0 ? stub + 12 : stub + 5;
+				char uds_path[256];
+				lws_snprintf(uds_path, sizeof(uds_path), "/var/run/lws-cert-dist-stub-%s.sock", orig_vh);
+
+				vhd = lws_protocol_vh_priv_zalloc(lws_get_vhost(wsi),
+								  lws_get_protocol(wsi),
+								  sizeof(struct vhd_cert_dist_client));
+				if (!vhd) return -1;
+				vhd->cx = lws_get_context(wsi);
+				vhd->vh = lws_get_vhost(wsi);
+				vhd->protocol = lws_get_protocol(wsi);
+				lws_strncpy(vhd->vh_name, orig_vh, sizeof(vhd->vh_name));
+				vhd->is_stub = 1;
+
+				struct lws_stub_config sc;
+				memset(&sc, 0, sizeof(sc));
+				sc.cx = vhd->cx;
+				sc.vh = vhd->vh;
+				sc.stub_name = stub;
+				sc.uds_path = uds_path;
+				sc.protocols = stub_protocols;
+
+				lws_dll2_add_tail(&vhd->list_vhd, &active_client_vhds);
+				if (lws_stub_server_init(&sc, vhd->secret, vhd->reload_cmd, sizeof(vhd->reload_cmd))) {
+					lws_dll2_remove(&vhd->list_vhd);
+					return -1;
+				}
+				return 0;
 			}
 
+			if (!in)
+				return 0;
+
+			const char *vh_name = lws_get_vhost_name(lws_get_vhost(wsi));
+
 			vhd = lws_protocol_vh_priv_get(lws_get_vhost(wsi), lws_get_protocol(wsi));
 			if (vhd)
 				return 0;
@@ -731,9 +755,11 @@ callback_cert_dist_client(struct lws *wsi, enum lws_callback_reasons reason,
 				return -1;
 			}
 
+			char uds_path[256];
+			char stub_name[256];
 			lws_strncpy(vhd->vh_name, vh_name, sizeof(vhd->vh_name));
 			lws_snprintf(uds_path, sizeof(uds_path), "/var/run/lws-cert-dist-stub-%s.sock", vh_name);
-			lws_snprintf(stub_name, sizeof(stub_name), "stub-%s", vh_name);
+			lws_snprintf(stub_name, sizeof(stub_name), "stub-client-%s", vh_name);
 
 			lwsl_notice("%s: allocated vhd\n", __func__);
 
@@ -764,26 +790,6 @@ callback_cert_dist_client(struct lws *wsi, enum lws_callback_reasons reason,
 				pvo = pvo->next;
 			}
 
-
-		if (stub) {
-                        struct lws_stub_config sc;
-
-			vhd->is_stub = 1;
-			memset(&sc, 0, sizeof(sc));
-			sc.cx = vhd->cx;
-			sc.vh = vhd->vh;
-			sc.stub_name = stub_name;
-			sc.uds_path = uds_path;
-			sc.protocols = stub_protocols;
-
-			lws_dll2_add_tail(&vhd->list_vhd, &active_client_vhds);
-			if (lws_stub_server_init(&sc, vhd->secret, vhd->reload_cmd, sizeof(vhd->reload_cmd))) {
-				lws_dll2_remove(&vhd->list_vhd);
-				return -1;
-			}
-			return 0;
-		}
-
 		lwsl_vhost_notice(lws_get_vhost(wsi), "%s: Protocol init. euid=%d\n", __func__, (int)getuid());
 
 		struct vhd_cert_dist_client *old_vhd = NULL;