From nobody Thu Oct 30 01:52:16 2025 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 4cxnDJ5Dr0z6DTHR; Thu, 30 Oct 2025 01:52:16 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxnDJ3q4Sz3pL5; Thu, 30 Oct 2025 01:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789136; 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=sqhbgnMJqH6VT5p4meqG35PXXG/fUm3JKEzJZZA9oHk=; b=FtHiR9cZWP4R15PDf3EPjAqV5yLd6EJ1nCTmzIlPg1AMFTY2CfbVx+ajlXX4HaRLgQxMgJ WaXvYsnVoGGFwFO4J4b+hCftmWTS4ljAvvaY+dBUGASWaH/4kXnOi4fVOMQTIMGx+FY0ev EaoceIEDHsIJ4BErXg2WWPMvZky8wVZQ8lG4edtwGLX4MbDlj+pVPDJ9q2iNxT/fiwtRxT VRuhBELffyrD2emdjb3cQOGs+8FIO+70I9QaqIwgc/UJjnlRkaoWLDehCf2Ck95RU5nWWp 9nHTNbWSe66GZXDKmCmOvqALjmLMR5O7wagd9xYP5QY6G3pdozqcIKbJatHMlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789136; 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=sqhbgnMJqH6VT5p4meqG35PXXG/fUm3JKEzJZZA9oHk=; b=McoqtcN46XCvwO0Gd5Y+cM1AHxQ8RWsUvIod+xUnfFrl3hoAT+HShBUle1iaTTlHlNUGt5 l+onkliai6QHXIGPB8euVOv7Y6+rWEUIAI6sWp4JAPU5f04soIJTaF5NUsqQsFfmx9xm6K /+QWUhkTjiwwlQ+bU1apZOFtcJzhz5GfSTUO33mlRe0a06LvH1+osfJzU932J1xlBcg16S f+a1Cr5rGXPxSBYjrnsHrqvXQN1b8wL3PsSG7p/fIuP6lUnm3bM34gBkEmNJ/hC+x/Bk+W eurfkK68tPPdR+0HjM4u2MZABm7B3HON1o/B410xn8aD182zSicCK1tqduTWOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761789136; a=rsa-sha256; cv=none; b=KrsKnvWiF/L8q7y/74EKkyKVmLLOSJFKX6MegOvfZwT1+9wQV4aiB0vGXmgWa1DNOwVse8 sNHrRDWU7mTae73lS5GdXPp0Wtp/vFo/GwuLsydDCFs0ojw8llk+TDmYAoAwH16H5da427 6ckxzfTq4WyPJQAmy/9coFvmZ78FyBWY4XqLyNSyQEQ5P5ggwkIuAdSjZ/qpiFbILxoJEF 8bW4sOCfeaXhp8lIWm9nRAvYbpGituEgEKVinxqASkU9zdFnHRy4uHtLs4u2khFE5B4hjv fU6rDbXvMedmhJk0csLQsW4odO2m7LoXhPUZGSzqUHKTXXdVYZgCCZBdHT8p4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxnDJ3BYPz12Qy; Thu, 30 Oct 2025 01:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59U1qGk9097390; Thu, 30 Oct 2025 01:52:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U1qGKM097387; Thu, 30 Oct 2025 01:52:16 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:52:16 GMT Message-Id: <202510300152.59U1qGKM097387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: cd284c1e17ea - stable/15 - blocklist: blacklist: Chase recent upstream changes 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd284c1e17eab4884cf4bc9479e8272af527f6b7 Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=cd284c1e17eab4884cf4bc9479e8272af527f6b7 commit cd284c1e17eab4884cf4bc9479e8272af527f6b7 Author: Jose Luis Duran AuthorDate: 2025-10-25 21:24:13 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-30 01:44:43 +0000 blocklist: blacklist: Chase recent upstream changes Upstream introduced an extra column in blocklistctl(8) to display the name of the rule associated in the database entry. It is intended to avoid confusion when seemingly duplicate locations appear in the output of the blocklistctl dump command. Especially when users are transitioning from the old nomenclature to the new one. The latest patches will not be fully backported to blacklistctl(8), to avoid breaking current scripts that may be parsing its output. Also we are slowly preparing to feature-freeze everything related to blacklist. MFC: 2 days (cherry picked from commit eae98e28a0e17f625e29f9849a4dc655636d9164) --- contrib/blocklist/bin/blacklistctl.8 | 3 +-- contrib/blocklist/bin/blacklistd.c | 18 ++++++++---------- contrib/blocklist/bin/blocklistctl.8 | 6 +++++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/contrib/blocklist/bin/blacklistctl.8 b/contrib/blocklist/bin/blacklistctl.8 index 4d557c0c979d..08f1d1b9e5af 100644 --- a/contrib/blocklist/bin/blacklistctl.8 +++ b/contrib/blocklist/bin/blacklistctl.8 @@ -45,7 +45,6 @@ is a program used to display and change the state of the database. The following sub-commands are supported: .Ss dump -.Pp The following options are available for the .Cm dump sub-command: @@ -90,7 +89,7 @@ associated with the database entry. column will show the identifier for the packet filter rule associated with the database entry, though this may only be the word .Ql OK -for packet filters which do not creat a unique identifier for each rule. +for packet filters which do not create a unique identifier for each rule. .It Ql nfail The number of .Em failures diff --git a/contrib/blocklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c index ded3075ed707..b5f9358122ef 100644 --- a/contrib/blocklist/bin/blacklistd.c +++ b/contrib/blocklist/bin/blacklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.10 2025/03/26 17:09:35 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: blocklistd.c,v 1.10 2025/03/26 17:09:35 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $"); #include #include @@ -191,12 +191,12 @@ process(bl_t bl) } if (getremoteaddress(bi, &rss, &rsl) == -1) - goto out; + return; if (debug || bi->bi_msg[0]) { sockaddr_snprintf(rbuf, sizeof(rbuf), "%a:%p", (void *)&rss); (*lfun)(bi->bi_msg[0] ? LOG_INFO : LOG_DEBUG, - "processing type=%d fd=%d remote=%s msg=%s uid=%lu gid=%lu", + "processing type=%d fd=%d remote=%s msg=\"%s\" uid=%lu gid=%lu", bi->bi_type, bi->bi_fd, rbuf, bi->bi_msg, (unsigned long)bi->bi_uid, (unsigned long)bi->bi_gid); @@ -204,12 +204,12 @@ process(bl_t bl) if (conf_find(bi->bi_fd, bi->bi_uid, &rss, &c) == NULL) { (*lfun)(LOG_DEBUG, "no rule matched"); - goto out; + return; } if (state_get(state, &c, &dbi) == -1) - goto out; + return; if (debug) { char b1[128], b2[128]; @@ -226,7 +226,7 @@ process(bl_t bl) * set the number of fails to be one less than the * configured limit. Fallthrough to the normal BL_ADD * processing, which will increment the failure count - * to the threshhold, and block the abusive address. + * to the threshold, and block the abusive address. */ if (c.c_nfail != -1) dbi.count = c.c_nfail - 1; @@ -269,8 +269,6 @@ process(bl_t bl) state_put(state, &c, &dbi); out: - close(bi->bi_fd); - if (debug) { char b1[128], b2[128]; (*lfun)(LOG_DEBUG, "%s: final db state for %s: count=%d/%d " @@ -565,7 +563,7 @@ main(int argc, char *argv[]) conf_parse(configfile); } ret = poll(pfd, (nfds_t)nfd, tout); - if (debug) + if (debug && ret != 0) (*lfun)(LOG_DEBUG, "received %d from poll()", ret); switch (ret) { case -1: diff --git a/contrib/blocklist/bin/blocklistctl.8 b/contrib/blocklist/bin/blocklistctl.8 index 7943c54159c1..75228599a9de 100644 --- a/contrib/blocklist/bin/blocklistctl.8 +++ b/contrib/blocklist/bin/blocklistctl.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 27, 2025 +.Dd October 25, 2025 .Dt BLOCKLISTCTL 8 .Os .Sh NAME @@ -82,6 +82,10 @@ sub-command consists of a header (unless was given) and one line for each record in the database, where each line has the following columns: .Bl -tag -width indent +.It Ql rulename +The packet filter rule name associated with the database entry, +usually +.Dv blocklistd . .It Ql address/ma:port The remote address, mask, and local port number of the client connection associated with the database entry.