From nobody Wed Jan 28 01:05:31 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f13wq61C6z6PsHj for ; Wed, 28 Jan 2026 01:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f13wq3LRlz3dcn for ; Wed, 28 Jan 2026 01:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769562331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Irg0P7XWZWZ79doSTCt36oWV81rZIUg+bot+C3thcY=; b=TQjx6p5PXOfCOwIg5awP28FK8555Cp2MSQW+cdi5WIu8G8QFj/5wcuwMR8P0AVxZ4hVop3 Ck08Pll3SaNNWorh4N9Pv2P7YeOnHqUs0ilG/bYG8RBJ27NUdjd40llk7GgkAU/nkfnhf0 dREFQLQRIu/4QrI62mQIGxpwzDBIwXYArmMfJR7Gx1IXw87VODix3pRnfw7MsHveqZd+yJ HNBBD4sNDw4l1WId7XWyUHtvPtsATwLIPgZXgFzCH2m8PBom5ivPLxg/2aOUe4xXlwV81m Gm1zEdZ4zU/O0Z+PhdNIPVT9XNQ8xLD3eNc96POFKQFnN5mTsXK4PmmPpy5RZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769562331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Irg0P7XWZWZ79doSTCt36oWV81rZIUg+bot+C3thcY=; b=YmXpT4ui+rbKtj58BLx+x5eDfONKtBTlpu23Z4bZnpC3PxzUd3OfSr5Qk2SjOgT8DhVoQR yckLvsaO9OkQjC2DXjFzsJoYc+QrrNpigmWD/sCHvIUhiXPestnr/mLRB5g51ylCCCg0bj n38t1tzkv85lRHarf3BwhNWxqL/4sQ7XIiwxfRMYPS/xMax3JB5VexbMRZbIKecim71Gy4 JU9O3d/gndUDpDb26c/t1KtOE6agrx/916QhYGWyAeg1Xn86EDmVDZlJF9S+5KGUfiGHMc dclv/N5lsJonNJwmJbPn10GlfR9nbLnrCIOm3BYF84eITztfWJEJEpf11X2oAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769562331; a=rsa-sha256; cv=none; b=IQhZnfI2Iaon3CyjWdLRhI9Yc91OKI2vR5WAKmghKCuGfVWd5wPn/xT86H9CTWAfFFPpEU OXXUc0VYU9m8aRu13318tgVMzZ5BV9jHlGDV5m1PcA21Q85Mt0f2xJRa7rdlnk6bY16Xa8 hLH+4F90cdTlrz3QRXCH5i7ua65/2wt6HJxAEuYmmLxU5aVJmClfKs4QgCGalHMQu1B7Uf 70en6+FsLFC4Lt9RsRo4DdnXqLLzJK4ECH2h+brA9AtfjnaUi5/SmcLlDAZqYNeQbZMgm+ D8Jv/+oYRnbE0XQ5mIHBUHctjYpWTlK1FALbCirPl9fPrznl3GhULgzz+jUXWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f13wq2vFmzWdm for ; Wed, 28 Jan 2026 01:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e603 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Jan 2026 01:05:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 7aee235907f3 - stable/14 - periodic: Support RFC 5424 syslog timestamps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7aee235907f3d9ca512a5803e43da4d070afbf21 Auto-Submitted: auto-generated Date: Wed, 28 Jan 2026 01:05:31 +0000 Message-Id: <697960db.e603.655dd106@gitrepo.freebsd.org> The branch stable/14 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=7aee235907f3d9ca512a5803e43da4d070afbf21 commit 7aee235907f3d9ca512a5803e43da4d070afbf21 Author: Joseph Mingrone AuthorDate: 2026-01-08 19:22:58 +0000 Commit: Joseph Mingrone CommitDate: 2026-01-28 01:03:36 +0000 periodic: Support RFC 5424 syslog timestamps This is based on an initial implementation by michaelo in https://reviews.freebsd.org/D54361. PR: 270497 Reported by: michaelo Reviewed by: michaelo Tested by: michaelo MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54606 (cherry picked from commit 8ac6427b1bb95470f6c755202d1c0391ed8eefbd) --- usr.sbin/periodic/etc/daily/460.status-mail-rejects | 13 ++++++++++--- usr.sbin/periodic/etc/security/800.loginfail | 11 +++++++++-- usr.sbin/periodic/etc/security/900.tcpwrap | 11 +++++++++-- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/460.status-mail-rejects b/usr.sbin/periodic/etc/daily/460.status-mail-rejects index b33e0062f3d7..a9ec3c8d1a51 100755 --- a/usr.sbin/periodic/etc/daily/460.status-mail-rejects +++ b/usr.sbin/periodic/etc/daily/460.status-mail-rejects @@ -36,8 +36,15 @@ case "$daily_status_mail_rejects_enable" in echo echo Checking for rejected mail hosts: - yesterday=$(date -v-1d '+%b %e') - today=$(date '+%b %e') + # Support both RFC 3164 (traditional) and RFC 5424 syslog timestamps. + today_3164="$(date '+%b %e ')" + today_5424="$(date -I)" + prefix_today="(^${today_3164}|^<[0-9]{1,3}>1 ${today_5424}T)" + + yesterday_3164="$(date -v-1d '+%b %e ')" + yesterday_5424="$(date -v-1d -I)" + prefix_yesterday="(^${yesterday_3164}|^<[0-9]{1,3}>1 ${yesterday_5424}T)" + n=$(($daily_status_mail_rejects_logs - 2)) rc=$({ while [ $n -ge 0 ] @@ -61,7 +68,7 @@ case "$daily_status_mail_rejects_enable" in n=$(($n - 1)) done cat /var/log/maillog - } | sed -Ene "/^$today/q" -e "/^$yesterday/{"' + } | sed -En -e "/$prefix_today/q" -e "/$prefix_yesterday/{"' s/.*ruleset=check_relay,.* relay=([^,]+), reject=([^ ]*).*/\2 check_relay \1/p t end s/.*ruleset=check_rcpt,.* arg1=,]+).* reject=([^ ]+) .* ([^ ]+)/\2 check_rcpt \1 \3/p diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 19bf9a4b3b91..91564185b653 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -39,7 +39,14 @@ fi LOG="${security_status_logdir}" -yesterday=`date -v-1d "+%b %e "` +# Support both RFC 3164 (traditional) and RFC 5424 syslog timestamps. +yesterday_3164="$(date -v-1d '+%b %e ')" +prefix_3164="^${yesterday_3164}" + +yesterday_5424="$(date -v-1d -I)" +prefix_5424="^<[0-9]{1,3}>1 ${yesterday_5424}T" + +prefix="(${prefix_3164}|${prefix_5424})" catmsgs() { find ${LOG} -name 'auth.log.*' -mtime -2 | @@ -57,7 +64,7 @@ if check_yesno_period security_status_loginfail_enable then echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*: .*\b(fail(ures?|ed)?|invalid|bad|illegal|auth.*error)\b" | + n=$(catmsgs | egrep -ia "${prefix}.*\b(fail(ures?|ed)?|invalid|bad|illegal|auth.*error)\b" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0 fi diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap index bbbc04a03988..8f6f17ebd756 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -39,7 +39,14 @@ fi LOG="${security_status_logdir}" -yesterday=`date -v-1d "+%b %e "` +# Support both RFC 3164 (traditional) and RFC 5424 syslog timestamps. +yesterday_3164="$(date -v-1d '+%b %e ')" +prefix_3164="^${yesterday_3164}" + +yesterday_5424="$(date -v-1d -I)" +prefix_5424="^<[0-9]{1,3}>1 ${yesterday_5424}T" + +prefix="(${prefix_3164}|${prefix_5424})" catmsgs() { find ${LOG} -name 'messages.*' -mtime -2 | @@ -57,7 +64,7 @@ if check_yesno_period security_status_tcpwrap_enable then echo "" echo "${host} refused connections:" - n=$(catmsgs | grep -i "^$yesterday.*refused connect" | + n=$(catmsgs | egrep -ia "${prefix}.*refused connect" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0 fi