From nobody Sun Mar 09 03:44:27 2025 X-Original-To: dev-commits-src-branches@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 4Z9QrD2SY4z5qQsd; Sun, 09 Mar 2025 03:44:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z9QrD0BdFz3nwv; Sun, 09 Mar 2025 03:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741491868; 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=LLpvENffPUVEUbzD1Ocq2oHL9Lyl/KsWEkEehqOuT68=; b=SO+jT2mwnJnKQCEcSloV+63eQRRUpNwavmJtRIBk7k+TT6KeG8ubdgQsVnWSE6kF3day0u g0peObUEMOy00guFm1qzrfvOqYzxbrDWOezyHjsZbHZA2PJSlZeUoITuLdhTtxwsGhY9vH 8fLdYOQguqBIIRMqaoTmFLcO/oTPjGUzYEa88Xw3slx1wawCizXPhOKX6ggFzj8G3V8k0/ BKcNxrWGg5fzQ5HOMp2+AQgNtF9U5PeJNoM4UvAb2aLjrG7AUgkEAeVwObsHgtEaVRY/NY inFP54JjRLVjDJ6Trvq3eKHvS20lOngFgJ7te7t7FYR2IOuoPdVVhS7hoX8+NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741491868; a=rsa-sha256; cv=none; b=Io3RAmMYvfYwhC7vihIMox+dGGXZA77GTUzvhhHGsNutkX9BpLrb5+D1EJiQQZujbbOU+0 qXtSrrYsYPohCaVkUUZpimfgzhdo5vfTMKOOxHLvacvexdRSu6c1LZXR44ooJWKcToMycm fBO5Hv8h/qs2fAyNizdqw3waB7uI2RwkTNNE/i1P6o4W7mp4D8nTd/HesJGaSTj5zZZhe1 FQku3F7mhhiq21rmDchvew2Zv1NomPwOBsAmyZrYIf209d46yO7/v7tw8unLphnRsqW0mB T9QI6jyBxCWgSa+RLpkLR3D3RQfz+yhO3ZjtYvxNoVstjo9swxxuedD4pi+iTA== 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=1741491868; 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=LLpvENffPUVEUbzD1Ocq2oHL9Lyl/KsWEkEehqOuT68=; b=UvyunyEj2fuMrT5hmVJfnc5jMMe/MBzFiCCcUhMKyFnq6zt5x37Ry2amyTDb+8N1V38lvx J0Jv/DsCU7GES6dxOOkv+jhrrYdaY9Pg2KG1XkI0Pgm9LX+sE7oAdsodzWLLS3iAKRTeeB jOC42hOpaGT2KFdUplx2JC5b9bx8kL9q2hbPruK6i2FbRXf1H7D//6NDcI6otNHNDxBcJn 6THHDhsfRDhHZOwjm9+ZELIC0tvqR7hJLZX12UReTVubTjr/ifskt4ssUEK3WfuQLJT6Ro /CbNoLBWaDJf3Si0n9SCWHXQzUwT2PUc2oQO3T1tkr5SRzvVtIg5adV5v3pOkQ== 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 4Z9QrC6NYxzsZ8; Sun, 09 Mar 2025 03:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5293iRpb084793; Sun, 9 Mar 2025 03:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5293iR8E084790; Sun, 9 Mar 2025 03:44:27 GMT (envelope-from git) Date: Sun, 9 Mar 2025 03:44:27 GMT Message-Id: <202503090344.5293iR8E084790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 0d6ed98ef318 - stable/14 - MFC jail: add jexec -d, to specify a working directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0d6ed98ef318eb6b31857387a708f9da6e2fcb1d Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=0d6ed98ef318eb6b31857387a708f9da6e2fcb1d commit 0d6ed98ef318eb6b31857387a708f9da6e2fcb1d Author: Jamie Gritton AuthorDate: 2025-03-05 10:14:47 +0000 Commit: Jamie Gritton CommitDate: 2025-03-09 03:43:51 +0000 MFC jail: add jexec -d, to specify a working directory PR: 283170 Submitted by: DtxdF at disroot.org (cherry picked from commit d56f3b051f6135b4a675fd75ccfcef0310368781) --- usr.sbin/jexec/jexec.8 | 10 ++++++++-- usr.sbin/jexec/jexec.c | 21 ++++++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/usr.sbin/jexec/jexec.8 b/usr.sbin/jexec/jexec.8 index 431978c4d0ae..afcc1839ef75 100644 --- a/usr.sbin/jexec/jexec.8 +++ b/usr.sbin/jexec/jexec.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 12, 2024 +.Dd March 5, 2025 .Dt JEXEC 8 .Os .Sh NAME @@ -32,6 +32,7 @@ .Sh SYNOPSIS .Nm .Op Fl l +.Op Fl d Ar working-directory .Op Fl u Ar username | Fl U Ar username .Ar jail Op Ar command ... .Sh DESCRIPTION @@ -48,6 +49,9 @@ is not specified then the user's shell is used. .Pp The following options are available: .Bl -tag -width indent +.It Fl d Ar working-directory +The working directory for running commands inside the jail. +The default is the jail root directory. .It Fl l Execute in a clean environment. The environment is discarded except for @@ -59,7 +63,9 @@ If a user is specified (via .Fl u or .Fl U ) , -commands are run from that (possibly jailed) user's directory. +and absent the +.Fl d +option, commands are run from that (possibly jailed) user's directory. .It Fl u Ar username The user name from host environment as whom the .Ar command diff --git a/usr.sbin/jexec/jexec.c b/usr.sbin/jexec/jexec.c index 35fd9c8d20e4..a1e443c5ba04 100644 --- a/usr.sbin/jexec/jexec.c +++ b/usr.sbin/jexec/jexec.c @@ -58,16 +58,22 @@ main(int argc, char *argv[]) { int jid; login_cap_t *lcap = NULL; - int ch, clean, uflag, Uflag; + int ch, clean, dflag, uflag, Uflag; char *cleanenv; const struct passwd *pwd = NULL; const char *username, *shell, *term; + const char *workdir; - ch = clean = uflag = Uflag = 0; + ch = clean = dflag = uflag = Uflag = 0; username = NULL; + workdir = "/"; - while ((ch = getopt(argc, argv, "lnu:U:")) != -1) { + while ((ch = getopt(argc, argv, "d:lnu:U:")) != -1) { switch (ch) { + case 'd': + workdir = optarg; + dflag = 1; + break; case 'l': clean = 1; break; @@ -102,8 +108,8 @@ main(int argc, char *argv[]) errx(1, "%s", jail_errmsg); if (jail_attach(jid) == -1) err(1, "jail_attach(%d)", jid); - if (chdir("/") == -1) - err(1, "chdir(): /"); + if (chdir(workdir) == -1) + err(1, "chdir(): %s", workdir); /* Set up user environment */ if (clean || username != NULL) { @@ -129,7 +135,7 @@ main(int argc, char *argv[]) setenv("HOME", pwd->pw_dir, 1); setenv("SHELL", *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1); - if (clean && username && chdir(pwd->pw_dir) < 0) + if (clean && username && !dflag && chdir(pwd->pw_dir) < 0) err(1, "chdir: %s", pwd->pw_dir); endpwent(); } @@ -186,6 +192,7 @@ usage(void) { fprintf(stderr, "%s\n", - "usage: jexec [-l] [-u username | -U username] jail [command ...]"); + "usage: jexec [-l] [-d working-directory] [-u username | -U username] jail\n" + " [command ...]"); exit(1); }