Commit 8fd720c3 authored by Matt Johnston's avatar Matt Johnston
Browse files

Improve exit message formatting

parent 4f5d0756
......@@ -98,29 +98,30 @@ int main(int argc, char ** argv) {
#endif /* DBMULTI stuff */
static void cli_dropbear_exit(int exitcode, const char* format, va_list param) {
char exitmsg[150];
char fullmsg[300];
char fmtbuf[300];
char exitmsg[500];
/* Note that exit message must be rendered before session cleanup */
/* Render the formatted exit message */
vsnprintf(exitmsg, sizeof(exitmsg), format, param);
/* Add the prefix depending on session/auth state */
if (!sessinitdone) {
snprintf(fmtbuf, sizeof(fmtbuf), "Exited: %s",
format);
snprintf(fullmsg, sizeof(fullmsg), "Exited: %s", exitmsg);
} else {
snprintf(fmtbuf, sizeof(fmtbuf),
snprintf(fullmsg, sizeof(fullmsg),
"Connection to %[email protected]%s:%s exited: %s",
cli_opts.username, cli_opts.remotehost,
cli_opts.remoteport, format);
cli_opts.remoteport, exitmsg);
}
/* Arguments to the exit printout may be unsafe to use after session_cleanup() */
vsnprintf(exitmsg, sizeof(exitmsg), fmtbuf, param);
/* Do the cleanup first, since then the terminal will be reset */
session_cleanup();
/* Avoid printing onwards from terminal cruft */
fprintf(stderr, "\n");
dropbear_log(LOG_INFO, "%s", exitmsg);;
dropbear_log(LOG_INFO, "%s", fullmsg);
exit(exitcode);
}
......
......@@ -144,31 +144,33 @@ void svr_session(int sock, int childpipe) {
/* failure exit - format must be <= 100 chars */
void svr_dropbear_exit(int exitcode, const char* format, va_list param) {
char fmtbuf[300];
char exitmsg[150];
char fullmsg[300];
int i;
/* Render the formatted exit message */
vsnprintf(exitmsg, sizeof(exitmsg), format, param);
/* Add the prefix depending on session/auth state */
if (!sessinitdone) {
/* before session init */
snprintf(fmtbuf, sizeof(fmtbuf),
"Early exit: %s", format);
snprintf(fullmsg, sizeof(fullmsg), "Early exit: %s", exitmsg);
} else if (ses.authstate.authdone) {
/* user has authenticated */
snprintf(fmtbuf, sizeof(fmtbuf),
snprintf(fullmsg, sizeof(fullmsg),
"Exit (%s): %s",
ses.authstate.pw_name, format);
ses.authstate.pw_name, exitmsg);
} else if (ses.authstate.pw_name) {
/* we have a potential user */
snprintf(fmtbuf, sizeof(fmtbuf),
snprintf(fullmsg, sizeof(fullmsg),
"Exit before auth (user '%s', %u fails): %s",
ses.authstate.pw_name, ses.authstate.failcount, format);
ses.authstate.pw_name, ses.authstate.failcount, exitmsg);
} else {
/* before userauth */
snprintf(fmtbuf, sizeof(fmtbuf),
"Exit before auth: %s", format);
snprintf(fullmsg, sizeof(fullmsg), "Exit before auth: %s", exitmsg);
}
_dropbear_log(LOG_INFO, fmtbuf, param);
dropbear_log(LOG_INFO, "%s", fullmsg);
#ifdef USE_VFORK
/* For uclinux only the main server process should cleanup - we don't want
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment