mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 11:25:21 +01:00
Dag-Erling Smørgrav
05e8f2bf09
* Instead of an error string, return the usual 0 or -1 and let the caller figure out what, if anything, to tell the user. * Avoid string manipulations by opening /dev first and using openat() with O_RESOLVE_BENEATH. * Add a boolean argument which, if false, causes ttymsg() to return without sending the message if the tty's group-writable bit is not set. This saves programs that respect this setting (like syslogd(8)) from having to check before calling ttymsg(). * Update all callers. The observable effect of this change is minimal except for slightly different error messages when ttymsg() fails. However, syslogd(8) will no longer print spurious error messages on the console after trying and failing to write a log message to an X11 session. PR: 295171 MFC after: 1 week Reviewed by: jfree, markj Differential Revision: https://reviews.freebsd.org/D57018
94 lines
3.0 KiB
C
94 lines
3.0 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*
|
|
* Copyright (c) 2023 The FreeBSD Foundation
|
|
*
|
|
* This software was developed by Jake Freeland <[email protected]>
|
|
* under sponsorship from the FreeBSD Foundation.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _SYSLOGD_CAP_H_
|
|
#define _SYSLOGD_CAP_H_
|
|
|
|
#include <sys/nv.h>
|
|
|
|
#include <libcasper.h>
|
|
|
|
#include <casper/cap_net.h>
|
|
|
|
#ifdef WITH_CASPER
|
|
|
|
#include <sys/capsicum.h>
|
|
#include <sys/dnv.h>
|
|
|
|
#include <capsicum_helpers.h>
|
|
#include <libcasper_service.h>
|
|
|
|
#include <casper/cap_net.h>
|
|
|
|
#include "syslogd.h"
|
|
|
|
/*
|
|
* Information used to verify filed integrity when executing outside of the
|
|
* security sandbox.
|
|
*/
|
|
struct cap_filed {
|
|
size_t idx;
|
|
char pipe_cmd[MAXPATHLEN];
|
|
SLIST_ENTRY(cap_filed) next;
|
|
};
|
|
extern SLIST_HEAD(cfiled_list, cap_filed) cfiled_head;
|
|
|
|
int cap_p_open(cap_channel_t *, size_t, const char *, int *);
|
|
nvlist_t *cap_readconfigfile(cap_channel_t *, const char *);
|
|
int cap_ttymsg(cap_channel_t *, struct iovec *, int, const char *, int, bool);
|
|
void cap_wallmsg(cap_channel_t *, const struct filed *, struct iovec *,
|
|
const int);
|
|
|
|
int casper_p_open(nvlist_t *, nvlist_t *);
|
|
int casper_readconfigfile(nvlist_t *, nvlist_t *);
|
|
int casper_ttymsg(nvlist_t *);
|
|
int casper_wallmsg(nvlist_t *);
|
|
|
|
nvlist_t *filed_to_nvlist(const struct filed *);
|
|
nvlist_t *prop_filter_to_nvlist(const struct prop_filter *pfilter);
|
|
|
|
struct filed *nvlist_to_filed(const nvlist_t *);
|
|
struct prop_filter *nvlist_to_prop_filter(const nvlist_t *nvl_prop_filter);
|
|
|
|
#else /* !WITH_CASPER */
|
|
|
|
#define cap_p_open(chan, f_idx, prog, rpd) \
|
|
p_open(prog, rpd)
|
|
#define cap_readconfigfile(chan, cf) \
|
|
readconfigfile(cf)
|
|
#define cap_ttymsg(chan, iov, iovcnt, line, timeout) \
|
|
ttymsg(iov, iovcnt, line, timeout)
|
|
#define cap_wallmsg(chan, f, iov, iovcnt) \
|
|
wallmsg(f, iov, iovcnt)
|
|
|
|
#endif /* WITH_CASPER */
|
|
|
|
#endif /* !_SYSLOGD_CAP_H_ */
|