Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1ecb7f7
Add initial UNIX socket server support
Koenvh1 Sep 24, 2025
5cd0770
Improve error message
Koenvh1 Sep 24, 2025
986f3eb
Attempt to fix tests
Koenvh1 Sep 24, 2025
1cd764d
Do not await unix socket as it might be None
Koenvh1 Sep 24, 2025
440e4fe
Fix tests
Koenvh1 Sep 25, 2025
17a661e
Fix copy-paste error
Koenvh1 Sep 25, 2025
443a103
Update setup-rust-action
Koenvh1 Sep 25, 2025
e66b704
Add UNIX sockets for CLI
Koenvh1 Sep 25, 2025
35c2fe2
Merge branch 'main' into unix-sockets
Koenvh1 Sep 25, 2025
9bd6fc2
Add dependencies
Koenvh1 Sep 25, 2025
35a72f4
Only define regex once
Koenvh1 Sep 25, 2025
ac3aadf
Only define regex once again
Koenvh1 Sep 25, 2025
68d73ff
Make token optional
Koenvh1 Sep 25, 2025
e72297b
Don't require a port number we don't use
Koenvh1 Sep 25, 2025
cc2738f
Dummy port number is not required
Koenvh1 Sep 25, 2025
bf916d5
Use triple slashes
Koenvh1 Sep 25, 2025
f5b8555
Only parse double slash unix URI
Koenvh1 Sep 25, 2025
0b4a757
Use user names rather than uid
Koenvh1 Sep 25, 2025
384c802
Simplify unix_user
Koenvh1 Sep 25, 2025
7b6371d
Use custom roles
Koenvh1 Sep 25, 2025
f772298
Make Clippy happy
Koenvh1 Sep 25, 2025
ecc6031
Add tests for macOS and Windows
Koenvh1 Sep 26, 2025
e69f277
Revert changes
Koenvh1 Sep 26, 2025
011234c
Revert regex definition
Koenvh1 Oct 2, 2025
74b6673
Fix comment
Koenvh1 Oct 2, 2025
1ac1abd
Really fix comment
Koenvh1 Oct 2, 2025
f1de46a
Really really fix comment
Koenvh1 Oct 2, 2025
0ecd9e7
Split httpclient into httpclient and httpcli
Koenvh1 Oct 3, 2025
a518d3b
Do what cargo clippy says
Koenvh1 Oct 3, 2025
d974313
Make tests happy
Koenvh1 Oct 3, 2025
fdcba92
Make cargo clippy stop complaining
Koenvh1 Oct 3, 2025
153dfb5
Revert httpclient to its original state
Koenvh1 Oct 3, 2025
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
19 changes: 19 additions & 0 deletions Cargo.lock

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

7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ openssl = { version = "0.10", features = ["v110"] }
percent-encoding = "2.3.1"
pin-project-lite = "0.2.16"
rand = "0.9"
reqwest = { version = "0.12.15", features = ["json"] }
regex = { version = "1.11.1", default-features = false, features = [ "std" ] }
reqwest = { version = "0.12.23", features = ["json"] }
rpki = { version = "0.18.6", features = ["ca", "compat", "rrdp"] }
rustls-pemfile = "2.2.0"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand All @@ -61,7 +62,6 @@ secrecy = { version = "0.8", features = ["serde"], optional = true }
# Dependencies used by the "multi-user" feature
basic-cookies = { version = "0.1", optional = true }
openidconnect = { version = "3.5.0", optional = true, default-features = false }
regex = { version = "1.11.1", optional = true, default-features = false, features = [ "std" ] }
rpassword = { version = "7.4.0", optional = true }
scrypt = { version = "0.11", optional = true, default-features = false }
unicode-normalization = { version = "0.1", optional = true }
Expand All @@ -76,13 +76,13 @@ urlparse = { version = "0.7", optional = true }

[target.'cfg(unix)'.dependencies]
syslog = "7.0.0"
nix = { version = "0.30.1", features = ["user"] }

[features]
default = ["multi-user", "hsm"]
hsm = ["backoff", "kmip", "cryptoki", "r2d2", "secrecy"]
multi-user = [
"basic-cookies",
"regex",
"openidconnect",
"rpassword",
"scrypt",
Expand All @@ -99,7 +99,6 @@ hsm-tests-pkcs11 = ["hsm"]

[dev-dependencies]
tar = "0.4"
regex = "1.11.1"
stderrlog = "0.6"
tempfile = "3.19.1"
urlparse = "0.7"
Expand Down
9 changes: 9 additions & 0 deletions src/bin/krillc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use std::{env, process};
use krill::cli::client::KrillClient;
use krill::cli::options::Options;
use krill::cli::report::Report;
use krill::constants;


Expand All @@ -15,6 +16,14 @@ async fn main() {
options.general.server, options.general.token
);

let client = match client {
Ok(client) => client,
Err(err) => {
let status = Report::from_err(err).report(options.general.format);
process::exit(status);
}
};

if options.general.api {
// Safety: There shouldn’t be anything else going on at this point.
// XXX That said, we need to replace this mechanism.
Expand Down
Loading