d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logger: capsicumize

Browse Source 
Submitted by:	Tiger Gao <tig@freebsdfoundation.org>
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D23744
This commit is contained in:
oshogbo 2020-03-12 19:55:51 +00:00
parent e44a620779
commit 0dc7ca0b79
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/logger/Makefile
View File

@ -9,4 +9,10 @@ PROG= logger
CFLAGS+= -DINET6 CFLAGS+= -DINET6
.endif .endif
.if ${MK_CASPER} != "no"
LIBADD+= casper
LIBADD+= cap_syslog
CFLAGS+=-DWITH_CASPER
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

31
usr.bin/logger/logger.c
View File

@ -44,10 +44,12 @@ static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93";
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/capsicum.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <capsicum_helpers.h>
#include <ctype.h> #include <ctype.h>
#include <err.h> #include <err.h>
#include <netdb.h> #include <netdb.h>
@ -57,6 +59,9 @@ __FBSDID("$FreeBSD$");
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <libcasper.h>
#include <casper/cap_syslog.h>
#define SYSLOG_NAMES #define SYSLOG_NAMES
#include <syslog.h> #include <syslog.h>
@ -76,6 +81,7 @@ static void logmessage(int, const char *, const char *, const char *,
struct socks *, ssize_t, const char *); struct socks *, ssize_t, const char *);
static void usage(void); static void usage(void);
static cap_channel_t *capsyslog;
#ifdef INET6 #ifdef INET6
static int family = PF_UNSPEC; /* protocol family (IPv4, IPv6 or both) */ static int family = PF_UNSPEC; /* protocol family (IPv4, IPv6 or both) */
#else #else
@ -92,12 +98,13 @@ static int send_to_all = 0; /* send message to all IPv4/IPv6 addresses */
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
cap_channel_t *capcas;
struct socks *socks; struct socks *socks;
ssize_t nsock; ssize_t nsock;
time_t now; time_t now;
int ch, logflags, pri; int ch, logflags, pri;
char *tag, *host, buf[1024], *timestamp, tbuf[26], char *tag, *host, buf[1024], *timestamp, tbuf[26],
*hostname, hbuf[MAXHOSTNAMELEN]; *hostname, hbuf[MAXHOSTNAMELEN], *pristr;
const char *svcname, *src; const char *svcname, *src;
tag = NULL; tag = NULL;
@ -107,6 +114,7 @@ main(int argc, char *argv[])
src = NULL; src = NULL;
socks = NULL; socks = NULL;
pri = LOG_USER | LOG_NOTICE; pri = LOG_USER | LOG_NOTICE;
pristr = NULL;
logflags = 0; logflags = 0;
unsetenv("TZ"); unsetenv("TZ");
while ((ch = getopt(argc, argv, "46Af:H:h:iP:p:S:st:")) != -1) while ((ch = getopt(argc, argv, "46Af:H:h:iP:p:S:st:")) != -1)
@ -140,7 +148,7 @@ main(int argc, char *argv[])
svcname = optarg; svcname = optarg;
break; break;
case 'p': /* priority */ case 'p': /* priority */
pri = pencode(optarg); pristr = optarg;
break; break;
case 's': /* log to standard error */ case 's': /* log to standard error */
logflags |= LOG_PERROR; logflags |= LOG_PERROR;
@ -168,12 +176,25 @@ main(int argc, char *argv[])
nsock = 0; nsock = 0;
} }
capcas = cap_init();
if (capcas == NULL)
err(1, "Unable to contact Casper");
caph_cache_catpages();
caph_cache_tzdata();
if (caph_enter() < 0)
err(1, "Unable to enter capability mode");
capsyslog = cap_service_open(capcas, "system.syslog");
if (capsyslog == NULL)
err(1, "Unable to open system.syslog service");
cap_close(capcas);
if (pristr != NULL)
pri = pencode(pristr);
if (tag == NULL) if (tag == NULL)
tag = getlogin(); tag = getlogin();
/* setup for logging */ /* setup for logging */
if (host == NULL) if (host == NULL)
openlog(tag, logflags, 0); cap_openlog(capsyslog, tag, logflags, 0);
(void) fclose(stdout);
(void )time(&now); (void )time(&now);
(void )ctime_r(&now, tbuf); (void )ctime_r(&now, tbuf);
@ -349,7 +370,7 @@ logmessage(int pri, const char *timestamp, const char *hostname,
int len, i, lsent; int len, i, lsent;
if (nsock == 0) { if (nsock == 0) {
syslog(pri, "%s", buf); cap_syslog(capsyslog, pri, "%s", buf);
return; return;
} }
if ((len = asprintf(&line, "<%d>%s %s %s: %s", pri, timestamp, if ((len = asprintf(&line, "<%d>%s %s %s: %s", pri, timestamp,