KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ctld: Properly validate mutual user/secret for CHAP-MUTUAL in the UCL parser

Browse Source 
The code was checking the non-mutual UCL objects twice instead.

Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D49645
This commit is contained in:
John Baldwin
2025-04-11 10:01:06 -04:00
parent 251439f1a0
commit bf41156712
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr.sbin/ctld/uclparse.cc
+4 -4
View File
@@ -100,14 +100,14 @@ uclparse_chap_mutual(const char *ag_name, const ucl_object_t *obj)
}
mutual_user = ucl_object_find_key(obj, "mutual-user");
if (!user || user->type != UCL_STRING) {
if (!mutual_user || mutual_user->type != UCL_STRING) {
log_warnx("chap-mutual section in auth-group \"%s\" is missing "
"\"mutual-user\" string key", ag_name);
return (false);
}
mutual_secret = ucl_object_find_key(obj, "mutual-secret");
if (!secret || secret->type != UCL_STRING) {
if (!mutual_secret || mutual_secret->type != UCL_STRING) {
log_warnx("chap-mutual section in auth-group \"%s\" is missing "
"\"mutual-secret\" string key", ag_name);
return (false);
@@ -165,14 +165,14 @@ uclparse_target_chap_mutual(const char *t_name, const ucl_object_t *obj)
}
mutual_user = ucl_object_find_key(obj, "mutual-user");
if (!user || user->type != UCL_STRING) {
if (!mutual_user || mutual_user->type != UCL_STRING) {
log_warnx("chap-mutual section in target \"%s\" is missing "
"\"mutual-user\" string key", t_name);
return (false);
}
mutual_secret = ucl_object_find_key(obj, "mutual-secret");
if (!secret || secret->type != UCL_STRING) {
if (!mutual_secret || mutual_secret->type != UCL_STRING) {
log_warnx("chap-mutual section in target \"%s\" is missing "
"\"mutual-secret\" string key", t_name);
return (false);