From nobody Sat Aug 19 06:37:55 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 4RSTZW5nVPz4qHmD; Sat, 19 Aug 2023 06:37:55 +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 4RSTZW5Bccz4QG4; Sat, 19 Aug 2023 06:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427075; 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=WNlmUoMwgv2uk/OaWj1um+YRgk6vn1hxqNjgAuhJVSg=; b=xH0bJJwys9xp8fchjmGWJhMbf665eiwoiTdT6us4hid51BMFgkj5noxf9A1TN0x741ZcC+ xqNUam8rPkONIduXTLlxUWfWuWu0Q1keI2ib+y0///VVsaGpQ/a6CXAj5TfzEIXg7QY/jU MOHfpzeGcs89ofY1vf+IPC5fCAE3gcWOmt2Gg3vuo7aA6vLbweVI8PTkjUUqnN6wDLsffQ kH+Z49xHHAOzq1devKsAiEPxtpDLVO+UxpbryAkZFYzvMP1SgXhc6BuRkbqQhLrKJFfOuf DVmB9bYe2kMqfMt+0QKNJoRpqb3tkUm6qx2nuIGEJE3Ytq01bkzJ4WJ3Uni7Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427075; 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=WNlmUoMwgv2uk/OaWj1um+YRgk6vn1hxqNjgAuhJVSg=; b=Rs8VsmUaKWu6JPov+0G6UqOSYELKZ7ZUkc/L0k+wHg6uPOjcqkEd53xQmxgbcrFhu93L6F aMCP0p38PJW13IQ2NvoD1Mm/xwRvaYWm91VvZVZOtQhgBSLgYZxWgjy/FSKx+EZYbEPmaq mlPvDjIJtQKDyCq80sSVeqBEDLoquavy/Jl10ebCqRNkSfCgX+XPrpCbA07VYh4jjucNqo TYGVJqv9X8OH+GftytXOx4QM2PFvojhimnvXqoDExyvmmuNr2ayWJ49JENWozmokV+m9yQ 1f/51QwTpTaqVHip4aP++qfaam+S+AF97Y+RnoCNfobQKlCikTtyhdzIwQaSmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692427075; a=rsa-sha256; cv=none; b=M3dRSJpS2ftdcN3EZjvR5V12PKBllBs+QYX61IbFqs3p9sp45Hi8DaOOfUoM2RvghxwaiI Oy/clnZAHBPcP9A8m43FHY0Z/uyg+gV/FZn9DayD0g5Q5PwyszTnGBc6FuPAEHP4PuRewP 0a2CXpEIGK19rEMNeJDmNm1BQqVvV0WVeTXbZa4Su/LoGYxM0bCbz91ug5K9PRzCoEK1aI BBxmNL5ES9kmxMTbR29X2srschUjszm81f5JT7BQz5EczH7FZI3Nt24fwj1O+Z9AVbqsz+ 3DjBlRRl8FqxbjIVR4YJI0Gi+bcAdMAdWG2eYaCuuuScsj9SYGfc9khTDVJp/w== 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 4RSTZW3wQ4znj2; Sat, 19 Aug 2023 06:37:55 +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 37J6btq5052137; Sat, 19 Aug 2023 06:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J6bt8P052134; Sat, 19 Aug 2023 06:37:55 GMT (envelope-from git) Date: Sat, 19 Aug 2023 06:37:55 GMT Message-Id: <202308190637.37J6bt8P052134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: b71dde1aeba2 - stable/13 - tftpd: introduce new option -S 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b71dde1aeba2972522a6742bbae77c2c6497eb01 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=b71dde1aeba2972522a6742bbae77c2c6497eb01 commit b71dde1aeba2972522a6742bbae77c2c6497eb01 Author: Eugene Grosbein AuthorDate: 2023-07-20 20:11:33 +0000 Commit: Eugene Grosbein CommitDate: 2023-08-19 06:35:58 +0000 tftpd: introduce new option -S Historically, tftpd disallowed write requests to existing files that are not publicly writable. Such requirement is questionable at least. Let us make it possible to run tftpd in chrooted environment keeping files non-world writable. New option -S enables write requests to existing files for chrooted run according to generic file permissions. It is ignored unless tftpd runs chrooted. Requested by: marck Differential: https://reviews.freebsd.org/D41090 (based on) (cherry picked from commit 273a307d0b80743fb08e23237b3f74dc94a8fa2a) (cherry picked from commit 03c2616dc530e5b23f06f9aa421012154590e578) --- libexec/tftpd/tftpd.8 | 22 ++++++++++++++++++---- libexec/tftpd/tftpd.c | 14 +++++++++++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index e4f5ab94a2fe..a984cdc32c94 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -28,7 +28,7 @@ .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd March 2, 2020 +.Dd July 20, 2023 .Dt TFTPD 8 .Os .Sh NAME @@ -72,7 +72,11 @@ Files containing the string or starting with .Dq Li "../" are not allowed. -Files may be written only if they already exist and are publicly writable. +Files may be written only if they already exist (unless the +.Fl w +option is used) and are publicly writable (unless chrooted and the +.Fl S +option is used). Note that this extends the concept of .Dq public to include @@ -191,6 +195,12 @@ to change its root directory to After doing that but before accepting commands, .Nm will switch credentials to an unprivileged user. +.It Fl S +If +.Nm +runs chrooted, the option allows write requests according to generic +file permissions, skipping requirement for files to be publicly writable. +The option is ignored for non-chrooted run. .It Fl u Ar user Switch credentials to .Ar user @@ -275,12 +285,16 @@ the .Fl c option was introduced in .Fx 4.3 , -and the +the .Fl F and .Fl W options were introduced in -.Fx 7.4 . +.Fx 7.4 , +and the +.Fl S +option was introduced in +.Fx 13.3 . .Pp Support for Timeout Interval and Transfer Size Options (RFC2349) was introduced in diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 02fbaaf0d371..3b08fab33dca 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -98,6 +98,7 @@ static struct dirlist { static int suppress_naks; static int logging; static int ipchroot; +static int check_woth = 1; static int create_new = 0; static const char *newfile_format = "%Y%m%d"; static int increase_name = 0; @@ -138,7 +139,7 @@ main(int argc, char *argv[]) acting_as_client = 0; tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP); - while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:u:U:wW")) != -1) { + while ((ch = getopt(argc, argv, "cCd::F:lnoOp:s:Su:U:wW")) != -1) { switch (ch) { case 'c': ipchroot = 1; @@ -176,6 +177,9 @@ main(int argc, char *argv[]) case 's': chroot_dir = optarg; break; + case 'S': + check_woth = -1; + break; case 'u': chuser = optarg; break; @@ -385,7 +389,11 @@ main(int argc, char *argv[]) tftp_log(LOG_ERR, "setuid failed"); exit(1); } + if (check_woth == -1) + check_woth = 0; } + if (check_woth == -1) + check_woth = 1; len = sizeof(me_sock); if (getsockname(0, (struct sockaddr *)&me_sock, &len) == 0) { @@ -727,7 +735,7 @@ validate_access(int peer, char **filep, int mode) if ((stbuf.st_mode & S_IROTH) == 0) return (EACCESS); } else { - if ((stbuf.st_mode & S_IWOTH) == 0) + if (check_woth && ((stbuf.st_mode & S_IWOTH) == 0)) return (EACCESS); } } else { @@ -757,7 +765,7 @@ validate_access(int peer, char **filep, int mode) if ((stbuf.st_mode & S_IROTH) != 0) break; } else { - if ((stbuf.st_mode & S_IWOTH) != 0) + if (!check_woth || ((stbuf.st_mode & S_IWOTH) != 0)) break; } err = EACCESS;