added log level

This commit is contained in:
2026-03-17 11:45:14 +11:00
parent 1d3eaff622
commit 2b3fe0630f
5 changed files with 93 additions and 6 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
/.vscode/settings.json
build/
rust-backend/target/
pam-module/*.so

View File

@@ -6,6 +6,16 @@
#pragma once
// Log level constants shared between C/C++ and Rust
typedef enum {
RUST_LOG_LEVEL_FATAL = 0,
RUST_LOG_LEVEL_ERROR = 1,
RUST_LOG_LEVEL_WARN = 2,
RUST_LOG_LEVEL_INFO = 3,
RUST_LOG_LEVEL_DEBUG = 4,
RUST_LOG_LEVEL_TRACE = 5,
} RustLogLevel;
#ifdef __cplusplus
extern "C" {
#endif
@@ -16,9 +26,21 @@ void rust_init_logging(const char* log_path);
// Authenticate user (stub)
int rust_auth_user(const char* user, const char* password);
// Log event (file sink)
// Legacy: Log event (file sink) — forwards to INFO level on Rust side
void rust_log_event(const char* event);
// New: Log event with explicit level
void rust_log_event_with_level(const char* event, RustLogLevel level);
#ifdef __cplusplus
}
#endif
// Convenience macros for C/C++ callers
#define RUST_LOG_FATAL(msg) rust_log_event_with_level((msg), RUST_LOG_LEVEL_FATAL)
#define RUST_LOG_ERROR(msg) rust_log_event_with_level((msg), RUST_LOG_LEVEL_ERROR)
#define RUST_LOG_WARN(msg) rust_log_event_with_level((msg), RUST_LOG_LEVEL_WARN)
#define RUST_LOG_INFO(msg) rust_log_event_with_level((msg), RUST_LOG_LEVEL_INFO)
#define RUST_LOG_DEBUG(msg) rust_log_event_with_level((msg), RUST_LOG_LEVEL_DEBUG)
#define RUST_LOG_TRACE(msg) rust_log_event_with_level((msg), RUST_LOG_LEVEL_TRACE)

View File

@@ -15,7 +15,7 @@ extern "C" {
int pam_sm_authenticate(pam_handle_t* pamh, int flags, int argc, const char** argv) {
try {
rust_init_logging(nullptr); // Ensure logger is initialized
rust_log_event("PAM authentication attempt");
RUST_LOG_INFO("PAM authentication attempt");
const char* user = nullptr;

View File

@@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
use std::ffi::{CStr, CString};
use std::ffi::CStr;
use std::os::raw::c_char;
use std::panic::{catch_unwind, AssertUnwindSafe};
@@ -35,7 +35,22 @@ pub extern "C" fn rust_log_event(event: *const c_char) {
}
CStr::from_ptr(event).to_str().unwrap_or("")
};
logging::log_event(msg);
// Legacy wrapper: default to INFO
logging::log_event_with_level(logging::LogLevel::Info, msg);
}));
}
#[no_mangle]
pub extern "C" fn rust_log_event_with_level(event: *const c_char, level: i32) {
let _ = catch_unwind(AssertUnwindSafe(|| {
let msg = unsafe {
if event.is_null() {
return;
}
CStr::from_ptr(event).to_str().unwrap_or("")
};
let lvl = logging::LogLevel::from(level);
logging::log_event_with_level(lvl, msg);
}));
}

View File

@@ -9,6 +9,50 @@ use std::io::Write;
use std::sync::Mutex;
use once_cell::sync::OnceCell;
#[repr(i32)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum LogLevel {
Fatal = 0,
Error = 1,
Warn = 2,
Info = 3,
Debug = 4,
Trace = 5,
}
impl LogLevel {
pub fn as_str(self) -> &'static str {
match self {
LogLevel::Fatal => "FATAL",
LogLevel::Error => "ERROR",
LogLevel::Warn => "WARN",
LogLevel::Info => "INFO",
LogLevel::Debug => "DEBUG",
LogLevel::Trace => "TRACE",
}
}
}
impl From<i32> for LogLevel {
fn from(v: i32) -> Self {
match v {
0 => LogLevel::Fatal,
1 => LogLevel::Error,
2 => LogLevel::Warn,
3 => LogLevel::Info,
4 => LogLevel::Debug,
5 => LogLevel::Trace,
_ => LogLevel::Info,
}
}
}
impl Default for LogLevel {
fn default() -> Self {
LogLevel::Info
}
}
static LOGGER: OnceCell<Mutex<File>> = OnceCell::new();
pub fn init_logger(path: &str) {
@@ -24,9 +68,14 @@ pub fn init_logger(path: &str) {
LOGGER.set(Mutex::new(file)).ok();
}
pub fn log_event(event: &str) {
pub fn log_event_with_level(level: LogLevel, event: &str) {
if let Some(logger) = LOGGER.get() {
let mut file = logger.lock().unwrap();
writeln!(file, "{}", event).ok();
writeln!(file, "[{}] {}", level.as_str(), event).ok();
}
}
// Backwards-compatible wrapper: default to INFO
pub fn log_event(event: &str) {
log_event_with_level(LogLevel::Info, event);
}