From nobody Tue Sep 30 23:22:03 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 4cbvGM3YSNz69Xg3; Tue, 30 Sep 2025 23:22:03 +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 4cbvGM1bhsz4C96; Tue, 30 Sep 2025 23:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759274523; 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=ZS0hl+T4zg23YAJ5p6lbL9ZUW991WlXnopcdp6g3I4s=; b=mHScspRffOvV9qnY0JaH5QIYqghRt/X50BjoRFzM3bvKliWbzCdKVVerhNGnnK8LBoxWxU NQCfBWZzFXwOi9XoY7voXJkyvP5FyRdbJK7G3p3ky7/xvA8rCG9vUBha8LFDp1I0VE8hig XlC7ot/o0I2cbO1fCgWKh1XQxv0M/STil89pFPGRGv7zNuQCjTUuK/lMt/PsIzgWMOkNHr eviOyiFpgUZL81YuxqYQcz0kKmFEblQlOx/algSV2XlUjF68BiYHI0YF0sf79u7oCCyk7v GIM3A0kPvFruQkT1FjAhDj05hDBHiOC7fNw+MyP5saet/VBXkw7duy5sogoRjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759274523; 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=ZS0hl+T4zg23YAJ5p6lbL9ZUW991WlXnopcdp6g3I4s=; b=pPffe5IR4nuNjqM3AmQ+o9NvLFfKIVoeuG8StWjGA/aikxdzTFeolK0AO/FrVICtnSO5F4 uUMHd5rjPc62cIzUl/MROdmTz8mLF/IuqT/pX6mizmEr2wooZf3k1ERfs2sgRCcmG+t+tR huSvqGnnHYhYYn4HBOfbjME3fT8DRza4kWL/6IiorI31b5CdFSVJhzxtUWsacpTppFCNbx RzQLGUtTltAS8/WwmLzFZGy7Jyoz78jqBbc06/BaZawcj/6id22UJGiNP9LOcDTGHf1yDe +KbeZLI+W0I9Ovj0aAKNJ8ksfOkxjKz3CwYWavo4yPurdDRSAfl3TpLP5S862A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759274523; a=rsa-sha256; cv=none; b=i3UmWkWPoEA5NLJJEYLFbuhg4wcAxy0fhSAAi8vg4rTQWAQD7EDaYM0orHD0KmvelAB06V Yt6JrtrLxBLB9weL/NpI+w3aLDEnzZ3GuDfTVnxeDPRYpBioUUTH2DlX50qh4C7l8HhHMY faH9ymZKXPY60OkmOtRO65MbzHCS6ox4A/Ysh2FWRuEv0YlNeMA8lpjwzCchzJOG5VlTAZ wwLVjXmxTKLfW+pdwTQ4opDGsoNRLKNIgepQCMBzCtYU/t4QHiUOU4AQq60JIiuOZfotG0 4+aa5niPP+ou7DQnh6l5YT7+tU26KAQk3/XgGtNrzgTt4eqTCiSmYv65icPIEQ== 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 4cbvGM1Bd6zx9g; Tue, 30 Sep 2025 23:22:03 +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 58UNM3vH050510; Tue, 30 Sep 2025 23:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UNM3Sp050506; Tue, 30 Sep 2025 23:22:03 GMT (envelope-from git) Date: Tue, 30 Sep 2025 23:22:03 GMT Message-Id: <202509302322.58UNM3Sp050506@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: 268e74d14913 - stable/15 - ftpd: blocklist: Add an extra probe 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: 268e74d14913ddd539ed6e4f0b19c9d04a1971cb Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=268e74d14913ddd539ed6e4f0b19c9d04a1971cb commit 268e74d14913ddd539ed6e4f0b19c9d04a1971cb Author: Jose Luis Duran AuthorDate: 2025-09-29 16:26:54 +0000 Commit: Jose Luis Duran CommitDate: 2025-09-30 23:16:45 +0000 ftpd: blocklist: Add an extra probe Add a blocklist probe when user access is denied. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52747 (cherry picked from commit 307929b211e07f91260105211b57678e906327af) --- libexec/ftpd/ftpd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 751d77b218b7..3861036a5a8a 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1043,6 +1043,7 @@ user(char *name) (checkuser(_PATH_FTPUSERS, name, 1, NULL, &ecode) || (ecode != 0 && ecode != ENOENT))) { reply(530, "User %s access denied.", name); + BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, STDIN_FILENO, "Access denied"); if (logging) syslog(LOG_NOTICE, "FTP LOGIN REFUSED FROM %s, %s",