From nobody Wed Mar 05 18:16:47 2025 X-Original-To: dev-commits-src-main@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 4Z7LNb6SWLz5qYPw; Wed, 05 Mar 2025 18:16:47 +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 4Z7LNb6258z3YWM; Wed, 05 Mar 2025 18:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741198607; 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=bQEJB+UQLMDVZh3NBWhjGoU6Myanq2ln8Om9zOUFVEo=; b=NZ1bPE7hroFVTbmy86MmSU8YqdhimWVzbaPM4EsFk7C7Y9igZXoP3xD4P3XpBSoGApBtwR KA3LFwrsR1VleA+zobbaRZAk43DPjWs8z5pCDTGrSDd+yXtgNIzEWL8eGjIZ0zJ2gZuaIG XxIdMnZaX8ytaZ//eV+a1zNmLoVKufErk07QCUDFqboZFabEIgD95AxsrogGZT2tU9nMWc z3UC43yvBPHn0ZTbCq92PtEF/MFnrfe5Y9+4fHucPTzB6qqVC1jdTM3FalLZZ+Ua5O2hFD bmvl0jQfiYhrIsue5hH7Y3upfCcPQSVqAlKjsoKmn52p01hnVHPuyWykotMP/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741198607; a=rsa-sha256; cv=none; b=VOMMcGzlYaH0u81veGW/S3+PgcUr2Rmy9aMbMo68SqlHAmiBhwXMrbcUMkkS9YRnp1UpuD nR2MSGcUyzl/t5nFnSCMW0K2orL07DHieAzo1J6o29U621Nx7EUxF1Dd8QsqiSp1waOWue MiQn651P8ANRcKajIG+f1OhV+W+VENyCMethBtjnisl+4DPjGLeeRAC8m23cz8D78gdY03 F9fbZBDi6l4X8syJHeSVdD3+Kg1hnXerWutnyKxcdnXGMMnL+J77z997N20SxPnWq0KH9L vM2NEFCgqrSlnd343xN1/B5vkxsLRi5EznadkqCLPrwOF+f9flOYf3BXpEH2OQ== 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=1741198607; 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=bQEJB+UQLMDVZh3NBWhjGoU6Myanq2ln8Om9zOUFVEo=; b=aQXF+GAx72wDWd9zI1LBZ7KOOB9KC0yBdhSkFbeHs4pqo5yzF9R5T9HZiAlitobeV+qeO4 Ir+i7xP7hw2zxsk0+9RVadZjskzDOiNdoNcD1nLzDOhUcwj9sR1M0X33fIenaI6Gpw/2hS kIvW/LUngHpGmSdcAO5obwMgX7EyJK8Tpst1XaNrn/w1Gqz2a3/hprLsBs+6cbNjkMLRf6 xqLs+V6z5LqUmF6p775joWgtFKNReinUD5EfXidkT/lsDqL4h+Py1TDocCqw4gzhCK+HBr hil8m0czJd/bbUOYIuQkfu/bWygbmgn21ivYHA9Zf+cWd/Ja1ZSocpaioOBGZQ== 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 4Z7LNb5c9Bzmx; Wed, 05 Mar 2025 18:16:47 +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 525IGlsj029717; Wed, 5 Mar 2025 18:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 525IGlLY029714; Wed, 5 Mar 2025 18:16:47 GMT (envelope-from git) Date: Wed, 5 Mar 2025 18:16:47 GMT Message-Id: <202503051816.525IGlLY029714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: d56f3b051f61 - main - jail: add jexec -d, to specify a working directory PR: 283170 Submitted by: DtxdF at disroot.org List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d56f3b051f6135b4a675fd75ccfcef0310368781 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=d56f3b051f6135b4a675fd75ccfcef0310368781 commit d56f3b051f6135b4a675fd75ccfcef0310368781 Author: Jamie Gritton AuthorDate: 2025-03-05 10:14:47 +0000 Commit: Jamie Gritton CommitDate: 2025-03-05 10:14:47 +0000 jail: add jexec -d, to specify a working directory PR: 283170 Submitted by: DtxdF at disroot.org --- 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); }