From nobody Tue Nov 10 14:39:15 2026 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 4jP8Rm0G4Fz6yXNt for ; Tue, 10 Nov 2026 14:39: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jP8Rl5dMJz4KSL for ; Tue, 10 Nov 2026 14:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794321555; 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=zxftysV8q8SApWYQKxHA0wvO+McgNjAx9MUDH4RSiLQ=; b=J5qPUZ8249gm3HxS6P414SKyRvHJzUnGpwu2tLLMcTQAC2NnfL2/MNnyutf9sdvQDjraNU pAbJROP0zuV0mQZeSV7VoKzAOpdE7/GpsinsOZ416gVLalpKhDDFQHgAqv2ProHgWTmvqz R81lTDpNMMPz4UZy/XL8vtDw07+sN7vPjgVV3kMNF/8lkTuK6DIV0rJLduvDjNzGstwIOy 7Ktt/v56jtWbtBsNGj0MXSpybrjIOp1NCJy1N7ZIwV0O2L727RBjYwjWoCfrG6IBenU5Mm XstLsxux6XKkcN5uiS8536WckWMN5LoWiJdN9gq7Ddhtic0SfpILe7yJrRR7kA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794321555; b=E/93ljAlpKxEzNrBdqcJqouWjk3Y/wOa88qqIZJwuaD0ACd/90E4R8ngG1rpGseley/V4d hegfVPoBuPHLfL+9L/lsON2nBNY5or22WPS1q+zCDmxFCY6x/3CuChkN8O1+7IlFy7amkW 4DtSHP7sCmtrfJJmIr/D15wFwgiD8M/R0/Z6PS5Lbt8e1qMJe3w6un/ShU09NR7No5ZrcK N6qwoS1Y6S0HYLEjtevqHtv93f8DI6GEkIfomJ7bDagtH0IDxsYY2Nqex2XzHt//K0QGDR 8r4Sh64lEt/Qr+y1l9sAp9kJQvEMxwPWm7q6WQH6EVqdlFH3S6HsjWLKeXJBYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794321555; 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=zxftysV8q8SApWYQKxHA0wvO+McgNjAx9MUDH4RSiLQ=; b=vJvSjTArAeBfuZDT80BtGKyqfJpowVk1GdLzIr1m0kojX3zl1Kh7qmAv3c+tD8z/ntUsk1 i+PuWLJyK/M3cNZwELbesYQ5MrEIBL8E3fgdH3ciPKdVnlSzNRqttPMWiRP/6Aq/zmIeO2 j7Aba/LJUmSAvBBE0TBCM7N+RVL5QDSiPMCBXnjGQcX8QylS8rJ+U5T1yE5LXMmZU8ha+N LusXvmHgWMVQ+ocO5uycfpBJPKpsYT4i0mk1xbwQR8V5/Vq8tuonGxRuzKMOmYicZxJCa2 om7mu5YMf+deaiHnpE4ECYoTAZ3k0KF3qTyGgvd436/Bdik8B5Q1l0QWgWatcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jP8Rl5JZXzXWK for ; Tue, 10 Nov 2026 14:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 349 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 14:39:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 1de93128e75a - main - pw: reject ' and ` in user/group names List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1de93128e75a8571f0fcefc3394d2f875adf970f Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 14:39:15 +0000 Message-Id: <6af32c93.349.22a25a7b@gitrepo.freebsd.org> The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=1de93128e75a8571f0fcefc3394d2f875adf970f commit 1de93128e75a8571f0fcefc3394d2f875adf970f Author: Muhammad Moinur Rahman AuthorDate: 2026-11-10 14:15:10 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2026-11-10 14:38:18 +0000 pw: reject ' and ` in user/group names pw_checkname() already refuses $ ( ) and freinds, but backtick and single quote slipped thru, so `pw useradd 'foo`id`'` went in just fine. Thats command substitution in any unquoted context. Add both to badchars, plus a test. Reported by: Harry Sintonen (Reversec) Sponsored by: Entersekt MFC after: 2 weeks Approved by: bapt Differential Revision: https://reviews.freebsd.org/D61392 --- usr.sbin/pw/pw_user.c | 2 +- usr.sbin/pw/tests/pw_useradd_test.sh | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index 492c44731178..4faa06612fd5 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -629,7 +629,7 @@ pw_checkname(char *name, int gecos) showtype = "gecos field"; } else { /* See if the name is valid as a userid or group. */ - badchars = " ,\t:+&#%$^()!@~*?<>=|\\/\";"; + badchars = " ,\t:+&#%$^()!@~*?<>=|\\/\";'`"; showtype = "userid/group name"; /* Userids and groups can not have a leading '-'. */ if (*ch == '-') diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh b/usr.sbin/pw/tests/pw_useradd_test.sh index 82c8d8b8524f..1f98691611b7 100755 --- a/usr.sbin/pw/tests/pw_useradd_test.sh +++ b/usr.sbin/pw/tests/pw_useradd_test.sh @@ -186,6 +186,21 @@ user_add_name_with_spaces_body() { atf_check -s exit:1 -o empty grep "^test user:.*" $HOME/master.passwd } +atf_test_case user_add_name_with_quotes +user_add_name_with_quotes_body() { + populate_etc_skel + for user_name in 'test`id`' "test'user"; do + atf_check -s exit:65 -e match:"invalid character" \ + ${PW} useradd "${user_name}" + atf_check -s exit:65 -e match:"invalid character" \ + ${PW} useradd -n "${user_name}" + atf_check -s exit:65 -e match:"invalid character" \ + ${PW} groupadd "${user_name}" + done + atf_check -s exit:1 -o empty grep "^test" $HOME/master.passwd + atf_check -s exit:1 -o empty grep "^test" $HOME/group +} + atf_test_case user_add_name_with_spaces_and_gid_specified user_add_name_with_spaces_and_gid_specified_body() { populate_etc_skel @@ -578,6 +593,7 @@ atf_init_test_cases() { atf_add_test_case user_add_password_expiration_date_relative atf_add_test_case user_add_name_too_long atf_add_test_case user_add_name_with_spaces + atf_add_test_case user_add_name_with_quotes atf_add_test_case user_add_name_with_spaces_and_gid_specified atf_add_test_case user_add_expiration atf_add_test_case user_add_invalid_user_entry