From nobody Tue Jan 27 17:24:57 2026 X-Original-To: dev-commits-src-all@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 4f0sjP70Hsz6Q8X7 for ; Tue, 27 Jan 2026 17:24:57 +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 4f0sjP6H36z3SNr for ; Tue, 27 Jan 2026 17:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769534697; 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=taSSSx/ndhwtgK1GwaFTSLqFa+7kKqiJz1BI/H3MhTg=; b=aS/tp9Nmj5IzQCDwp7gWpbyjafeE0rsaWPbncbxJxix2l+l359bvzyynTk3df3eGflxCd7 ADWKKyjwAekbSBtpR9nTE4WvrvwMajtFHAjwNiBy7VyjBqti3b3oh9xcWH88noTQpE04zl MliVhZEwZeCSpMkO2Z1T/QB25MBjqZdDHnMzXd2jG+NkUMCt5+F2LCQ5Oc2snUQ1WcgqM2 Wd97XBK4H8PgfAP0HKHu12uXRWrNWJUeet5ifezVoXK+fMuTtD3Lyj3AkPkGfRl7budRqF neO88cCmRi1oSKg68iOkIlpGhSDxcLLo+gx1M+dAsZwhWeBpoXLWqPcov7H8aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769534697; 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=taSSSx/ndhwtgK1GwaFTSLqFa+7kKqiJz1BI/H3MhTg=; b=GNz3stAINJMrWxXdywgKtEjEVUR0po8vLRaR3XoJkU7O44EM5Aa9LvRDnMwDJLfnsyutCx myJZhD4Ga/voGzFMNfhId73fRH4NOK8AvjApjgBSW0d6nXjDV8wawMe5Mcvj8WXlvsEYQg SXUrzG3guwIm7hpWMfrDGfh57HG82r7HgR/tL+FmRIA2tas6LEAEIIa1QH4rTR6LeaFV9o i+EM/bAwiK8ZNvXV7hlqiOFrtfqdTfjoPxASYOWMOfVRk53/QfS8Den9x+pKNJlHVDLOkF tPa7tqMUIh8tWxUuJQxPe4ZjsxKf696QYRPzOs74Xj0k5n4KCUpLL39+3rbHOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769534697; a=rsa-sha256; cv=none; b=ptNZeTZsU11QtOel7qH3Ym8n9SKZcDIeS7YFrTHOMuWLH5G/RJxWuPJ2egADHr8dIeHIDU P6Hb0MOEH+8pIM4QGtFby+4ivASJV4qFC0InjP6gDletyM8r+0xmz8/Qu8qH4GOSpKTuQC QVkF1KF2LZ6xBHoZas6bKnSIybX0yWvqW/s+mU9ZA05ND+FkS57lmYi9KF87dgymJGpI34 z7Etyp1fqDbamAlkvBByc6udt5NFi1lWJUe3Twltak11nN8+zluxQufUM9dAJJwODGunt1 lsWI9SjusaoiVxrikJPJlSh5E7Iu1eqHpqcnUNXVGAOO5CmizWJSlHWLlcupOw== 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 4f0sjP5bNyz1Zh for ; Tue, 27 Jan 2026 17:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8613 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 17:24:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: b61a43a8bdc3 - stable/15 - periodic: Support RFC 5424 syslog timestamps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: b61a43a8bdc3106a35f90904bd64d1bf3691df84 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 17:24:57 +0000 Message-Id: <6978f4e9.8613.585e5c7@gitrepo.freebsd.org> The branch stable/15 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=b61a43a8bdc3106a35f90904bd64d1bf3691df84 commit b61a43a8bdc3106a35f90904bd64d1bf3691df84 Author: Joseph Mingrone AuthorDate: 2026-01-08 19:22:58 +0000 Commit: Joseph Mingrone CommitDate: 2026-01-27 17:23:43 +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