From 04e84a010d4810b70091a0f21dd46e24dd08afe7 Mon Sep 17 00:00:00 2001 From: Nick Anderson Date: Sat, 8 Aug 2026 08:58:10 -0500 Subject: [PATCH 1/2] Derived the Federated Reporting transport user and paths from the hub config Ticket: ENT-14405 Changelog: none --- misc/cf-support | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/misc/cf-support b/misc/cf-support index d8bb15a0e7..9003ec1c86 100755 --- a/misc/cf-support +++ b/misc/cf-support @@ -400,11 +400,18 @@ log_cmd "sestatus" log_cmd "semodule -l | grep cfengine" log_cmd "semanage fcontext -C -l" -# Federated Reporting transport: metadata only, the transport private key is here -if [ -d /opt/cfengine/federation ]; then - log_cmd "getent passwd cftransport" - log_cmd "ls -ldZ /opt /opt/cfengine /opt/cfengine/federation /opt/cfengine/federation/cftransport /opt/cfengine/federation/cftransport/.ssh" - log_cmd "ls -laZ /opt/cfengine/federation/cftransport/.ssh" +# Federated Reporting transport: metadata only, the transport private key is here. +# The transport user and prefix are configurable, so take them from the config +# the hub generated rather than assuming cftransport under /opt/cfengine. +_fr_config=/opt/cfengine/federation/bin/config.sh +# shellcheck source=/dev/null +[ -f "$_fr_config" ] && . "$_fr_config" +_fr_user="${CFE_FR_FEEDER_USERNAME:-cftransport}" +_fr_home="`dirname "${CFE_FR_TRANSPORT_DIR:-/opt/cfengine/federation/$_fr_user/source}"`" +if [ -d "$_fr_home" ]; then + log_cmd "getent passwd $_fr_user" + log_cmd "ls -ldZ `dirname "$_fr_home"` $_fr_home $_fr_home/.ssh" + log_cmd "ls -laZ $_fr_home/.ssh" log_cmd "ssh -V" fi From 2f7d983c461c7d838fa3fb1ec8eafa54e590530f Mon Sep 17 00:00:00 2001 From: Nick Anderson Date: Sat, 8 Aug 2026 08:58:28 -0500 Subject: [PATCH 2/2] Added sshd logs to the cf-support Federated Reporting collection Ticket: ENT-14405 Changelog: Title --- misc/cf-support | 3 +++ 1 file changed, 3 insertions(+) diff --git a/misc/cf-support b/misc/cf-support index 9003ec1c86..7dbc109aad 100755 --- a/misc/cf-support +++ b/misc/cf-support @@ -413,6 +413,9 @@ if [ -d "$_fr_home" ]; then log_cmd "ls -ldZ `dirname "$_fr_home"` $_fr_home $_fr_home/.ssh" log_cmd "ls -laZ $_fr_home/.ssh" log_cmd "ssh -V" + # sshd's own refusals for this user; the syslog capture above only matches + # CFEngine paths, and sshd does not always name one + log_cmd "journalctl -t sshd -t sshd-session --no-pager --lines 20 --grep '$_fr_user'" fi gzip_add $WORKDIR/outputs/previous