astelm/telemt
1
0
Fork 0
mirror of https://github.com/telemt/telemt.git synced 2026-11-02 13:52:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Runtime Paths Checks as opt-in #935

Browse Source 
Co-Authored-By: brekotis <93345790+brekotis@users.noreply.github.com>
This commit is contained in:
Alexey
2026-09-29 19:24:29 +03:00
parent e3f62db347
commit 53f131e34d
16 changed files with 635 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logging.rs
+7 -11
View File
@@ -77,6 +77,8 @@ pub struct LoggingOptions {
pub destination: LogDestination,
/// Disable ANSI colors.
pub disable_colors: bool,
/// Require trusted, symlink-free log parents on Unix. Disabled by default for compatibility.
pub strict_runtime_paths: bool,
}
/// Guard that must be held to keep file logging active.
@@ -125,7 +127,6 @@ pub fn init_logging(
#[cfg(unix)]
LogDestination::Syslog => {
// Use a custom fmt layer that writes to syslog
let fmt_layer = fmt::Layer::default()
.with_ansi(false)
.with_target(false)
@@ -143,7 +144,8 @@ pub fn init_logging(
LogDestination::File { options } => {
let file_appender =
file::BoundedFileAppender::new(options.clone()).expect("Failed to open log file");
file::BoundedFileAppender::new(options.clone(), opts.strict_runtime_paths)
.expect("Failed to open log file");
let (non_blocking, guard) = tracing_appender::non_blocking(file_appender);
let fmt_layer = fmt::Layer::default()
@@ -175,14 +177,10 @@ struct SyslogWriter {
#[cfg(unix)]
impl SyslogMakeWriter {
fn new() -> Self {
// Open syslog connection on first use
static INIT: std::sync::Once = std::sync::Once::new();
INIT.call_once(|| {
unsafe {
// Open syslog with ident "telemt", LOG_PID, LOG_DAEMON facility
let ident = b"telemt\0".as_ptr() as *const libc::c_char;
libc::openlog(ident, libc::LOG_PID | libc::LOG_NDELAY, libc::LOG_DAEMON);
}
INIT.call_once(|| unsafe {
let ident = b"telemt\0".as_ptr() as *const libc::c_char;
libc::openlog(ident, libc::LOG_PID | libc::LOG_NDELAY, libc::LOG_DAEMON);
});
Self
}
@@ -202,7 +200,6 @@ fn syslog_priority_for_level(level: &tracing::Level) -> libc::c_int {
#[cfg(unix)]
impl std::io::Write for SyslogWriter {
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
// Convert to C string, stripping newlines
let msg = String::from_utf8_lossy(buf);
let msg = msg.trim_end();
@@ -210,7 +207,6 @@ impl std::io::Write for SyslogWriter {
return Ok(buf.len());
}
// Write to syslog
let c_msg = std::ffi::CString::new(msg.as_bytes())
.unwrap_or_else(|_| std::ffi::CString::new("(invalid utf8)").unwrap());