From nobody Thu Nov 05 15:12:10 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 4jL5Q26gM4z709fd for ; Thu, 05 Nov 2026 15:12:10 +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 4jL5Q2267vz4Brw for ; Thu, 05 Nov 2026 15:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891530; 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=nbJwcgannYT1cuxXTc6gApHBXP3pSuYE531BgtGI7xQ=; b=hJU24NItCXuDZPPFN2KywIoH8vAk3OZRwm37Ee/77EW0M/DEuwa/zacw/Vd3nZNmgIZ/aB goEbdCF8OtzVvV8rL3iDQIjcZ7OiqbqtEKtZ3RRfqOkIKI6QHu1+8yuo4Z0zuCJeVTdLER eXgiT9JP4PmlmG3oAB7gnmprHqtcMiez+qfOxDbf/SnzJMtep/pejqJng0JXRXv1kfr4+Z lov8YJnCiuUcSWzS7Mim8O5vNNL7dhX2raPJvm+zoOQZQ7fEiNSUD7uZ6Fj+oQQXMw69Yz SOLaAyG3W+qvUflArCLD3Ft7F30PfCZHG46Trg0Ht6CiEM6VVTe/qZa/fyz8LQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891530; b=SaU2xgqYLxHSDhzyWETy4M0wpjedFvBsTgRUu6x58/rWPMttJVEKzsfo8Foe8MkmIUJg+N N6/IHWAh5eXh7laLFebbeJrIe4J0PCS0MAKYxoomMmpn2xS+2eQePsnywZb1tZJF5SXLHk A7zLedItA8bGmRyoH2/R35qz6NUah2t7k9bydRf+4tKfRMtjTwkHCl4Smd11BG3TryoDUw Bkz2KxlalHkwK4Qys6LobQJnA8PZKNi1SzDhMmcSshc3xKBRYpGT9fF6ZRoFK9jhj+sKOk NyhA0iAuQyBUiVNKQEzCvD54GrOj0teA9xzl2++b1rPFWGG2ICGcJYYttuYuzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891530; 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=nbJwcgannYT1cuxXTc6gApHBXP3pSuYE531BgtGI7xQ=; b=ayFU3u4LAn1lTxp6Sz87odaYFlm1dslxcBjmZzsN+3fVIyssN3KjwaSHunXbMPtYrn0IW+ Y+2Md3FbniXwLByWn3AxpQ5Na2xaeO1GhWI7dzBc8q5SFDZ/vXtkBOuIHiqXmNUUevv3tU jwVqYfai6Fj5G6O258TFzxQ+ad9jhgP79QAIla+5HmF/gLRAIT7nEiHBLsiC1omxV3WphW N93GPm+mlZMMf5QGRTxEwQOcjLK34dUMNOZ8EisfoMnlRFp5Zyhs4moi0QDOr6RpXJIUBE 5Gz1eqHS//7akqT9nnQaC47A/xWWDkXLUzYI3ilSFfceYpUvNo/XvvN5Lvg6Vw== 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 4jL5Q20Qx7zvth for ; Thu, 05 Nov 2026 15:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23876 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a63630dcb5eb - stable/15 - libfetch: Reject control characters in credentials List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a63630dcb5eb8ea9f1129b711d27d0d645956360 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:10 +0000 Message-Id: <6aec9cca.23876.482cc3d1@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a63630dcb5eb8ea9f1129b711d27d0d645956360 commit a63630dcb5eb8ea9f1129b711d27d0d645956360 Author: Dag-Erling Smørgrav AuthorDate: 2026-09-30 16:54:33 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:51 +0000 libfetch: Reject control characters in credentials If a URL contains credentials, check that neither the user name nor the password contain control characters which might confuse the server, especially in the FTP case. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60008 (cherry picked from commit b319c3d6ac7cf408b56fe745f718de6a324ec180) --- lib/libfetch/fetch.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c index 97fc04bb09a6..dd0603490674 100644 --- a/lib/libfetch/fetch.c +++ b/lib/libfetch/fetch.c @@ -347,7 +347,7 @@ struct url * fetchParseURL(const char *URL) { char *doc; - const char *p, *q; + const char *p, *q, *r; struct url *u; int i, n; @@ -385,12 +385,18 @@ fetchParseURL(const char *URL) q = fetch_pctdecode(u->user, URL, URL_USERLEN); if (q == NULL) goto ouch; + for (r = u->user; *r != '\0'; r++) + if (iscntrl((unsigned char)*r)) + goto ouch; /* password */ if (*q == ':') { q = fetch_pctdecode(u->pwd, q + 1, URL_PWDLEN); if (q == NULL) goto ouch; + for (r = u->pwd; *r != '\0'; r++) + if (iscntrl((unsigned char)*r)) + goto ouch; } p++; } else {