Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ clap-serde-derive = "0.2"
clap_complete = "4.5"
log = "0.4"
env_logger = "0.11"
systemd-journal-logger = "2.2.2"
sha2 = "0.11"
serde_cbor = "0.11.2"
serde = { version = "1.0.228", features = ["derive"] }
Expand All @@ -40,7 +41,7 @@ dirs = "6.0"
prs-lib = "0.5"
serde_json = "1.0"
libc = "0.2"
nix = { version = "0.31", features = ["resource", "fs", "signal", "process", "dir"] }
nix = { version = "0.31", features = ["resource", "fs", "signal", "process", "dir", "user"] }
notify-rust = "4.11"
aes-gcm = "0.11"
rand = "0.8"
Expand Down
1 change: 1 addition & 0 deletions cmd/passless/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ soft-fido2-transport.workspace = true
soft-fido2-ctap.workspace = true
log.workspace = true
env_logger.workspace = true
systemd-journal-logger.workspace = true
sha2.workspace = true
serde_cbor.workspace = true
serde.workspace = true
Expand Down
30 changes: 23 additions & 7 deletions cmd/passless/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -432,13 +432,29 @@ fn run() -> Result<()> {
log::LevelFilter::Info
};

let env = Env::default()
.filter("PASSLESS_LOG_LEVEL")
.write_style("PASSLESS_LOG_STYLE");
Builder::from_env(env)
.filter_level(log::LevelFilter::Debug)
.format_timestamp_millis()
.init();
// Use syslog when running as systemd service
if systemd_journal_logger::connected_to_journal()
&& let Ok(journal) = systemd_journal_logger::JournalLog::new()
{
// Assume only the agent is run as root
let syslog_identifier = if nix::unistd::Uid::effective().is_root() {
"passless-agent"
} else {
"passless"
};
journal
.with_syslog_identifier(syslog_identifier.to_string())
.install()
.expect("Logger was already installed.");
} else {
let env = Env::default()
.filter("PASSLESS_LOG_LEVEL")
.write_style("PASSLESS_LOG_STYLE");
Builder::from_env(env)
.filter_level(log::LevelFilter::Debug)
.format_timestamp_millis()
.init();
}
log::set_max_level(log_level);

// Load config: CLI args + config file + defaults (CLI takes precedence)
Expand Down