ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 10:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only redirect stderr after the session login. That lets errors

Browse Source 
get recorded on the server parent side, rather than being sent
over a SSH connection.
This commit is contained in:
Matt Johnston 2021-10-18 23:20:08 +08:00
parent ae25761c7c
commit 3e640acd17
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
svr-chansession.c
View File

@ -841,20 +841,28 @@ static int ptycommand(struct Channel *channel, struct ChanSess *chansess) {
pty_make_controlling_tty(&chansess->slave, chansess->tty);
if ((dup2(chansess->slave, STDIN_FILENO) < 0) ||
(dup2(chansess->slave, STDERR_FILENO) < 0) ||
(dup2(chansess->slave, STDOUT_FILENO) < 0)) {
TRACE(("leave ptycommand: error redirecting filedesc"))
return DROPBEAR_FAILURE;
}
close(chansess->slave);
/* write the utmp/wtmp login record - must be after changing the
* terminal used for stdout with the dup2 above */
* terminal used for stdout with the dup2 above, otherwise
* the wtmp login will not be recorded */
li = chansess_login_alloc(chansess);
login_login(li);
dropbear_log(LOG_WARNING, "bad thing happened");
login_free_entry(li);
/* Can now dup2 stderr. Messages from login_login() have gone
to the parent stderr */
if (dup2(chansess->slave, STDERR_FILENO) < 0) {
TRACE(("leave ptycommand: error redirecting filedesc"))
return DROPBEAR_FAILURE;
}
close(chansess->slave);
#if DO_MOTD
if (svr_opts.domotd && !chansess->cmd) {
/* don't show the motd if ~/.hushlogin exists */