Merge pull request #2125 from kgaillot/ipc

Fix: executor: only send executor notifications to executor clients

Author: Ken Gaillot

daemons/execd/execd_commands.c

@@ -507,6 +507,15 @@ send_client_notify(gpointer key, gpointer value, gpointer user_data)
         crm_trace("Skipping notification to client without name");
         return;
     }
+    if (is_set(client->flags, pcmk__client_to_proxy)) {
+        /* We only want to notify clients of the executor IPC API. If we are
+         * running as Pacemaker Remote, we may have clients proxied to other
+         * IPC services in the cluster, so skip those.
+         */
+        crm_trace("Skipping executor API notification to %s IPC client",
+                  client->name);
+        return;
+    }
 
     rc = lrmd_server_send_notify(client, update_msg);
     if (rc == pcmk_rc_ok) {

daemons/execd/remoted_proxy.c

@@ -88,6 +88,11 @@ ipc_proxy_accept(qb_ipcs_connection_t * c, uid_t uid, gid_t gid, const char *ipc
     client->userdata = strdup(ipc_proxy->id);
     client->name = crm_strdup_printf("proxy-%s-%d-%.8s", ipc_channel, client->pid, client->id);
 
+    /* Allow remote executor to distinguish between proxied local clients and
+     * actual executor API clients
+     */
+    set_bit(client->flags, pcmk__client_to_proxy);
+
     g_hash_table_insert(ipc_clients, client->id, client);
 
     msg = create_xml_node(NULL, T_LRMD_IPC_PROXY);

include/crm/common/ipc_internal.h

@@ -121,8 +121,9 @@ struct pcmk__remote_s {
 };
 
 enum pcmk__client_flags {
-    pcmk__client_proxied    = 0x00001, /* ipc_proxy code only */
-    pcmk__client_privileged = 0x00002, /* root or cluster user */
+    pcmk__client_proxied    = (1 << 0), // Remote client behind proxy
+    pcmk__client_privileged = (1 << 1), // root or cluster user
+    pcmk__client_to_proxy   = (1 << 2), // Local client to be proxied
 };
 
 struct pcmk__client_s {