From nobody Wed Dec 27 17:49:48 2023 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 4T0fKm4Gkxz562YB; Wed, 27 Dec 2023 17:49:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fKm27Vwz3dlt; Wed, 27 Dec 2023 17:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703699388; 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=NJbcFEhD97sl4p65hQDF3CvhitRns9pwxjM90goePNs=; b=iYK6aAQ1WvZbKnXpOI7QOlTJuOFNmpYRqH35kaqvyTzh5Xtf3qOHQFSHuvM3iaIZo296oz 8Qy0v66WXEdQGjwpjPZV5DoywuwLuEOfBmUozmrZnxTqGx33MHxZE5mWVXl04RIA4HvA0q GmtBgmZdI+xSXSBmxDjJDU1CugVgadMJmoWmrS7LVm4tgu4TlE+ZqMNTmazZduyGt38Hun ovWhhfkcpB/PJMIgkfuhhqjHFznkd/9qjCsXCwyPFq67DGM4vbDyjXX9xpAAu4NAWmvcHc OJm7VtRVVoomSi7OYQq2abyargG2cgqUn9BSt9SxyOePIfW/dSWOCbmmDRUhYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703699388; a=rsa-sha256; cv=none; b=bkbuGyfJT2Em4x7VJClHeI0Mqn8TWR02peF0g14cBCJxXQcRyyT3GqFoPMv2eOt3Au6EIb 2l/ul8zknVmfs+EXtjcagGNULNRoMYFYs3U4IoFCWb6ZjAqiTisLz5SFF3kJy1irEyOwZn SlqbV3QdPrgjy4TcF6/6Fa4IDVeh6/mUsN34yoXEzjDP9Wd5OpVkNXA4FC4YmLTtVLeQ3a LcfwYqesjIHt86iQbpnC+9/IodZepTB8l4OUTnKLSiUG9N0UCbFiTrFnxW8Fxq13btS80z y4sA3bKfeHXWN+0jcQoENtpjTQp6XDnsk31PbGP+2Jlqok5b0B7Iprbmr8baBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703699388; 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=NJbcFEhD97sl4p65hQDF3CvhitRns9pwxjM90goePNs=; b=o7hbQHs9rdERGNEfRd0kqTEDcUn4mkNpslOrL15Mw56xyc19A6Bqgyg8PSbuZn4tv3ar16 8VAmHH2Li5dkljEhf+gu4Y0W5fJQasj94JVbUAtRuOsctfPT0TDp7IlVmGk/kuM4YoUyei upDxaxwNTP5wHs21rbaENyE6SYvbWPym+A/aKZGMeU0aenGoMNFEdPJPNuc4TTY912n8+v y0X3L4AfWW6GULwG0nuiMf9EuQeQSVpGi+B8OtXzPh6imqBeb51qNDc2+4B82veXITZmSq mU4wcPX7tkeHLzwGe+xhFuGkpPBF/epfs6WSLIgDUTTTVltcBnkV6JKgf5FcYQ== 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 4T0fKm1CXdzpG0; Wed, 27 Dec 2023 17:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRHnmEm099974; Wed, 27 Dec 2023 17:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRHnmBP099971; Wed, 27 Dec 2023 17:49:48 GMT (envelope-from git) Date: Wed, 27 Dec 2023 17:49:48 GMT Message-Id: <202312271749.3BRHnmBP099971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 2391e536c01c - main - Fix multiple bugs with ctld's UCL parsing 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2391e536c01cb51d2a2c11a0f5820481314e9ec2 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2391e536c01cb51d2a2c11a0f5820481314e9ec2 commit 2391e536c01cb51d2a2c11a0f5820481314e9ec2 Author: Alan Somers AuthorDate: 2023-10-09 18:26:25 +0000 Commit: Alan Somers CommitDate: 2023-12-27 17:49:15 +0000 Fix multiple bugs with ctld's UCL parsing * Don't segfault when parsing a misformatted auth-group section * If the config file specifies a chap section within a target but no auth-group, create a new anonymous auth-group. That matches the behavior with non-UCL config files. * Protect some potential segfaults with assertions PR: 274380 MFC after: 1 week Sponsored by: Axcient Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D43198 --- usr.sbin/ctld/ctld.c | 1 + usr.sbin/ctld/uclparse.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index fd60c4f6a646..c31ac328c84e 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -532,6 +532,7 @@ auth_group_find(const struct conf *conf, const char *name) { struct auth_group *ag; + assert(name != NULL); TAILQ_FOREACH(ag, &conf->conf_auth_groups, ag_next) { if (ag->ag_name != NULL && strcmp(ag->ag_name, name) == 0) return (ag); diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index f3f8df81e492..8bd1ca88d166 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -60,6 +60,7 @@ uclparse_chap(struct auth_group *auth_group, const ucl_object_t *obj) const struct auth *ca; const ucl_object_t *user, *secret; + assert(auth_group != NULL); user = ucl_object_find_key(obj, "user"); if (!user || user->type != UCL_STRING) { log_warnx("chap section in auth-group \"%s\" is missing " @@ -90,6 +91,7 @@ uclparse_chap_mutual(struct auth_group *auth_group, const ucl_object_t *obj) const ucl_object_t *user, *secret, *mutual_user; const ucl_object_t *mutual_secret; + assert(auth_group != NULL); user = ucl_object_find_key(obj, "user"); if (!user || user->type != UCL_STRING) { log_warnx("chap-mutual section in auth-group \"%s\" is missing " @@ -714,6 +716,8 @@ uclparse_target(const char *name, const ucl_object_t *top) } if (!strcmp(key, "auth-group")) { + const char *ag; + if (target->t_auth_group != NULL) { if (target->t_auth_group->ag_name != NULL) log_warnx("auth-group for target \"%s\" " @@ -725,8 +729,12 @@ uclparse_target(const char *name, const ucl_object_t *top) "target \"%s\"", target->t_name); return (1); } - target->t_auth_group = auth_group_find(conf, - ucl_object_tostring(obj)); + ag = ucl_object_tostring(obj); + if (!ag) { + log_warnx("auth-group must be a string"); + return (1); + } + target->t_auth_group = auth_group_find(conf, ag); if (target->t_auth_group == NULL) { log_warnx("unknown auth-group \"%s\" for target " "\"%s\"", ucl_object_tostring(obj), @@ -759,6 +767,20 @@ uclparse_target(const char *name, const ucl_object_t *top) } if (!strcmp(key, "chap")) { + if (target->t_auth_group != NULL) { + if (target->t_auth_group->ag_name != NULL) { + log_warnx("cannot use both auth-group " + "and chap for target \"%s\"", + target->t_name); + return (1); + } + } else { + target->t_auth_group = auth_group_new(conf, NULL); + if (target->t_auth_group == NULL) { + return (1); + } + target->t_auth_group->ag_target = target; + } if (uclparse_chap(target->t_auth_group, obj) != 0) return (1); }