From nobody Wed Feb 12 19:34:31 2025 X-Original-To: dev-commits-src-main@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 4YtT605Lf0z5nGcv; Wed, 12 Feb 2025 19:34:32 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtT6026BNz3T2x; Wed, 12 Feb 2025 19:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739388872; 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=pp0uEYwc+U44UO1qMF26P5977o8ayyJG/3Pel+EQCDc=; b=lLDEb3FuE/vhrP7hcg9n7Y2ea4LP3mBAwvtyVgZLy2LNbfKsu37bS3K9l5lSccmOlJsZjV cy50/60JEQdLJ+vtEM23yX/t7Lysfd3NspT1MJkneG10qsd4DDZ2TGDVoigciDaSM8HjcM ZRhqU15M3FZDf4rnLYKWL03lCfPQ+QJ+boFXNqwBE9MfFkuBQU79sZehsTjF/zsGEtrGVl BRvjWip7R23Y8bwt1/IhL5HhDgBv/yIls3Ec3VpFSf2c715wx1oH7teQKeU/7MBDnSPUL3 ElbBVoYvbLFQQR4P/Cu0mpeB3Rc8jqPtA0ypcm5h1JHrdoQVIso+O+GPLNfU/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739388872; 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=pp0uEYwc+U44UO1qMF26P5977o8ayyJG/3Pel+EQCDc=; b=QUEr5GF0FDH2mwarSSo1eyHWR+d22jWRLKZxpsa4d/I3+lcAcfZyWo53XmccP1MdpApq+6 GACx9Sc8IjEMwgalQ+WHf/VW9oh0mbW7ZS0j4QOJ1NOjvciJi+Prw0qdavKLyTNIn/o67q 0EcdOQPl6bz2fs1WJZahxat04pR/5QnBHhwyqKEyPq3OJBi6s+gcfoukHT/YJiXe5JioPz HE8rhNDNagh0ArNrcsTWt3SH9HquPQ/3gxMQfof0S4u9XH+9QOU16OXzf4xwLgSed1pZio vMnpHC4uYxvijbfSMPf+k1FRv+Z1+goV8Y12B0Gzd/PolOVBdAjGagoWJhgtgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739388872; a=rsa-sha256; cv=none; b=HOMPQYnnZIxDGoaxdt22M4yQC6IOdPIBsgMd6bKK8SUIPI7AxzJ3++lgZgQ0annurgtV3O 2dWa4AnB/cZquI6dpPiQGaO60SA7mL70J3e92NAh1ANoekxbUVlqReHQ52mBTYthrz5rw5 6mdDGm+w9de5lJP99D6I6vfxH8KfKHRiM7nrTlF3MDLj+PcfIWYYwVDsRuSSDvq23bP8iW QYiUI7l7PK+WhB3GWUmM+zXkoBhMp1//kVsHS9sVCmdAGZsBnnP1OBozU65v7WS5PAG1UB sl9ZVuUHEj0+vFjX/eRVJYWvC30xRVilxINBWmZF0PrYa+zOjL1iEQvo44H+zw== 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 4YtT600mx8z1BV1; Wed, 12 Feb 2025 19:34:32 +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 51CJYVKc059837; Wed, 12 Feb 2025 19:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJYV04059834; Wed, 12 Feb 2025 19:34:31 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:34:31 GMT Message-Id: <202502121934.51CJYV04059834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f42f7bedabb3 - main - ctld: Fail for missing or invalid CHAP secrets in UCL config List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f42f7bedabb329b68c7c9aa0d9a2dc49637d385f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f42f7bedabb329b68c7c9aa0d9a2dc49637d385f commit f42f7bedabb329b68c7c9aa0d9a2dc49637d385f Author: John Baldwin AuthorDate: 2025-02-12 19:27:06 +0000 Commit: John Baldwin CommitDate: 2025-02-12 19:27:06 +0000 ctld: Fail for missing or invalid CHAP secrets in UCL config Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48931 --- usr.sbin/ctld/uclparse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index bd3c90283f6d..8654004d009e 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -73,6 +73,7 @@ uclparse_chap(struct auth_group *auth_group, const ucl_object_t *obj) if (!secret || secret->type != UCL_STRING) { log_warnx("chap section in auth-group \"%s\" is missing " "\"secret\" string key", auth_group->ag_name); + return (false); } ca = auth_new_chap(auth_group,