Skip to content

Add tinysshd -k flag to log using Linux kernel format #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add tinysshd -k flag to log using Linux kernel format #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion man/tinysshd.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,14 @@ symmetric \- chacha20\-poly1305@openssh.com
.B \-P
disable post\-quantum crypto
.TP
.B \-k
use Linux kernel format on standard error output (useful for redirecting to /dev/kmsg)
.TP
.B \-l
use syslog instead of standard error output (useful for running from inetd)
.TP
.B \-L
don't use syslog, use standard error output (default)
don't use syslog nor Linux kernel format, use standard error output (default)
.TP
.B \-x \fIname=command
add subsystem command (e.g.: sftp=/usr/libexec/openssh/sftp\-server)
Expand Down
58 changes: 45 additions & 13 deletions tinyssh/log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ The 'log' library also supports syslog.
*/

#include <syslog.h>
#include <stdio.h>
#include "writeall.h"
#include "randommod.h"
#include "purge.h"
Expand All @@ -24,10 +25,18 @@ int loglevel = 1;

static int logflagfnln = 1;
static int logflagsyslog = 0;
static int logflagkernelfmt = 0;

static char chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZ0123456789";

void log_init(int level, const char *text, int line, int flagsyslog) {
static char kfmtfatal[5] = "____";
static char kfmtbug[5] = "____";
static char kfmtwarning[5] = "____";
static char kfmtnotice[5] = "____";
static char kfmtinfo[5] = "____";
static char kfmtdebug[5] = "____";

void log_init(int level, const char *text, int line, int flaglogger) {

long long i;

Expand All @@ -40,9 +49,20 @@ void log_init(int level, const char *text, int line, int flagsyslog) {
}
logstring[sizeof logstring - 1] = 0;

if (flagsyslog) {
openlog(text, 0, LOG_DAEMON);
logflagsyslog = 1;
switch (flaglogger) {
case 1:
openlog(text, 0, LOG_DAEMON);
logflagsyslog = 1;
break;
case 2:
logflagkernelfmt = 1;
snprintf(kfmtfatal, sizeof kfmtfatal, "<%d>", LOG_DAEMON|LOG_EMERG);
snprintf(kfmtbug, sizeof kfmtbug, "<%d>", LOG_DAEMON|LOG_ALERT);
snprintf(kfmtwarning, sizeof kfmtwarning, "<%d>", LOG_DAEMON|LOG_WARNING);
snprintf(kfmtnotice, sizeof kfmtnotice, "<%d>", LOG_DAEMON|LOG_NOTIC snprintf(kfmtinfo, sizeof kfmtinfo, "<%d>", LOG_DAEMON|LOG_INFO);
snprintf(kfmtdebug, sizeof kfmtdebug, "<%d>", LOG_DAEMON|LOG_DEBUG);
E);
break;
}

errno = 0;
Expand Down Expand Up @@ -115,31 +135,42 @@ void log_9_(

switch (level) {
case -1:
m = "BUG";
m = logflagkernelfmt ? kfmtbug : "BUG";
break;
case 0:
m = "usage";
break;
case 1:
m = "fatal";
m = logflagkernelfmt ? kfmtfatal : "fatal";
break;
case 2:
if (!ignoreerrno) m = "warning";
else m = "info";
case 2:
if (!ignoreerrno) m = logflagkernelfmt ? kfmtwarning : "warning";
else m = logflagkernelfmt ? kfmtinfo : "info";
break;
case 3:
m = "debug";
m = logflagkernelfmt ? kfmtdebug : "debug";
break;
case 4:
m = "tracing";
m = logflagkernelfmt ? kfmtdebug : "tracing";
break;
default:
m = "unknown";
m = logflagkernelfmt ? kfmtnotice : "unknown";
break;
}


/* name: session: level: message (error){file:line} */
/*
Default format:
name: session: level: message (error){file:line}
Linux kernel format:
<kern_level>name: session: message (error){file:line}
*/

do {
if (level == 0) break; /* don't print in usage level */
if (!logflagkernelfmt) break; /* print only in kernelfmt mode */
outs(m);
} while (0);

/* 'name:' */
do {
Expand All @@ -158,6 +189,7 @@ void log_9_(
/* 'level:' */
do {
if (level == 0) break; /* don't print in usage level */
if (logflagkernelfmt) break; /* don't print in kernelfmt mode */
outs(m); outs(": ");
} while (0);

Expand Down
1 change: 1 addition & 0 deletions tinyssh/main_tinysshd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ int main_tinysshd(int argc, char **argv, const char *binaryname) {
if (*x == 'S') { cryptotypeselected &= ~sshcrypto_TYPENEWCRYPTO; continue; }
if (*x == 'p') { cryptotypeselected |= sshcrypto_TYPEPQCRYPTO; continue; }
if (*x == 'P') { cryptotypeselected &= ~sshcrypto_TYPEPQCRYPTO; continue; }
if (*x == 'k') { flaglogger = 2; continue; }
if (*x == 'l') { flaglogger = 1; continue; }
if (*x == 'L') { flaglogger = 0; continue; }
if (*x == 'x') {
Expand Down