SessionChannel: set HOME and CHDIR only if not set by translation server

Give the translation server some control for overriding these.
CM4all · Sep 25, 2024 · 0845dcb · 0845dcb
1 parent b8e4212
commit 0845dcb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -2,6 +2,7 @@ cm4all-lukko (0.29) unstable; urgency=low
 
   * obey the NO_PASSWORD=sftp translation packet
   * verify that the translation response has UID, GID and HOME
+  * set HOME and CHDIR only if not set by translation server
   * translation: add packet CHROOT
 
  --   

diff --git a/libcommon b/libcommon
diff --git a/src/DelegateOpen.cxx b/src/DelegateOpen.cxx
@@ -64,8 +64,8 @@ SpawnOpen(const Connection &ssh_connection)
 	   rootfs; minimalism! */
 	ssh_connection.PrepareChildProcess(p, close_fds, true);
 
-	if (const char *home = p.GetJailedHome())
-		p.chdir = home;
+	if (p.chdir == nullptr)
+		p.chdir = p.GetJailedHome();
 
 	p.control_fd = control_socket_for_child.ToFileDescriptor();
 

diff --git a/src/SessionChannel.cxx b/src/SessionChannel.cxx
@@ -213,10 +213,12 @@ SessionChannel::PrepareChildProcess(PreparedChildProcess &p,
 		stderr_pipe.Open(stderr_r.Release());
 	}
 
-	if (const char *home = p.GetJailedHome()) {
-		p.SetEnv("HOME", home);
-		p.chdir = home;
-	}
+	if (!p.HasEnv("HOME"sv))
+		if (const char *home = p.GetJailedHome())
+			p.SetEnv("HOME"sv, home);
+
+	if (p.chdir == nullptr)
+		p.chdir = p.GetJailedHome();
 }
 
 void
+1 −1		src/io/Logger.cxx
+1 −1		src/lib/fmt/ExceptionFormatter.cxx
+1 −1		src/lua/Error.cxx
+1 −1		src/net/EasyMessage.cxx
+6 −0		src/spawn/Prepared.hxx