Skip to content

Update rcgen #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatoo merged 8 commits into from
Jul 27, 2025
Merged

Update rcgen #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48311f3
cargo update
hatoo Jul 26, 2025
40fea56
wip
hatoo Jul 26, 2025
bbd5280
update examples
hatoo Jul 26, 2025
a3e7113
rename vars
hatoo Jul 26, 2025
37a25e6
rename
hatoo Jul 26, 2025
33c669c
clippy
hatoo Jul 26, 2025
674b24f
a
hatoo Jul 27, 2025
21b98f7
update
hatoo Jul 27, 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
148 changes: 86 additions & 62 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ hyper = { version = "1.0.1", features = ["http1", "http2", "server", "client"] }
futures = "0.3.29"
bytes = "1.7.1"
http-body-util = "0.1.0"
rcgen = "0.13.1"
rcgen = "0.14.3"
tokio-rustls = "0.26.1"
tracing = "0.1.40"
hyper-util = { version = "0.1.11", features = ["tokio"] }
Expand All @@ -51,7 +51,8 @@ webpki-roots = { version = "1.0.1", optional = true }
axum = { version = "0.8.3", features = ["http2"] }
clap = { version = "4.5.35", features = ["derive"] }
ctor = "0.4.1"
rcgen = { version = "0.13.1", features = ["x509-parser"] }
rcgen = { version = "0.14.3", features = ["x509-parser", "pem"] }
reqwest = { version = "0.12.15", features = ["native-tls-alpn"] }
rustls-pki-types = "1.12.0"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
winnow = "0.7.4"
75 changes: 36 additions & 39 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,50 @@ use tracing_subscriber::EnvFilter;
#[derive(Parser)]
struct Opt {
#[clap(flatten)]
external_cert: Option<ExternalCert>,
external_issuer: Option<ExternalIssuer>,
}

#[derive(Args, Debug)]
struct ExternalCert {
struct ExternalIssuer {
#[arg(required = false)]
cert: PathBuf,
#[arg(required = false)]
private_key: PathBuf,
}

fn make_root_cert() -> rcgen::CertifiedKey {
let mut param = rcgen::CertificateParams::default();
fn make_root_issuer() -> rcgen::Issuer<'static, rcgen::KeyPair> {
let mut params = rcgen::CertificateParams::default();

param.distinguished_name = rcgen::DistinguishedName::new();
param.distinguished_name.push(
params.distinguished_name = rcgen::DistinguishedName::new();
params.distinguished_name.push(
rcgen::DnType::CommonName,
rcgen::DnValue::Utf8String("<HTTP-MITM-PROXY CA>".to_string()),
);
param.key_usages = vec![
params.key_usages = vec![
rcgen::KeyUsagePurpose::KeyCertSign,
rcgen::KeyUsagePurpose::CrlSign,
];
param.is_ca = rcgen::IsCa::Ca(rcgen::BasicConstraints::Unconstrained);
params.is_ca = rcgen::IsCa::Ca(rcgen::BasicConstraints::Unconstrained);

let key_pair = rcgen::KeyPair::generate().unwrap();
let cert = param.self_signed(&key_pair).unwrap();
let signing_key = rcgen::KeyPair::generate().unwrap();

rcgen::CertifiedKey { cert, key_pair }
let cert = params.self_signed(&signing_key).unwrap();

println!();
println!("Trust this cert if you want to use HTTPS");
println!();
println!("{}", cert.pem());
println!();

/*
Save this cert to ca.crt and use it with curl like this:
curl https://www.google.com -x http://127.0.0.1:3003 --cacert ca.crt
*/

println!("Private key");
println!("{}", signing_key.serialize_pem());

rcgen::Issuer::new(params, signing_key)
}

#[tokio::main]
Expand All @@ -59,29 +74,25 @@ async fn main() {
.with_env_filter(EnvFilter::from_default_env())
.init();

let root_cert = if let Some(external_cert) = opt.external_cert {
let root_issuer = if let Some(external_issuer) = opt.external_issuer {
// Use existing key
let param = rcgen::CertificateParams::from_ca_cert_pem(
&std::fs::read_to_string(&external_cert.cert).unwrap(),
let signing_key = rcgen::KeyPair::from_pem(
&std::fs::read_to_string(&external_issuer.private_key).unwrap(),
)
.unwrap();
let key_pair =
rcgen::KeyPair::from_pem(&std::fs::read_to_string(&external_cert.private_key).unwrap())
.unwrap();

let cert = param.self_signed(&key_pair).unwrap();

rcgen::CertifiedKey { cert, key_pair }
rcgen::Issuer::from_ca_cert_pem(
&std::fs::read_to_string(&external_issuer.cert).unwrap(),
signing_key,
)
.unwrap()
} else {
make_root_cert()
make_root_issuer()
};

let root_cert_pem = root_cert.cert.pem();
let root_cert_key = root_cert.key_pair.serialize_pem();

let proxy = MitmProxy::new(
// This is the root cert that will be used to sign the fake certificates
Some(root_cert),
Some(root_issuer),
Some(Cache::new(128)),
);

Expand Down Expand Up @@ -112,20 +123,6 @@ async fn main() {

println!("HTTP Proxy is listening on http://127.0.0.1:3003");

println!();
println!("Trust this cert if you want to use HTTPS");
println!();
println!("{}", root_cert_pem);
println!();

/*
Save this cert to ca.crt and use it with curl like this:
curl https://www.google.com -x http://127.0.0.1:3003 --cacert ca.crt
*/

println!("Private key");
println!("{}", root_cert_key);

server.await;
}
```
81 changes: 38 additions & 43 deletions examples/dev_proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,50 @@ use http_mitm_proxy::{
#[derive(Parser)]
struct Opt {
#[clap(flatten)]
external_cert: Option<ExternalCert>,
external_issuer: Option<ExternalIssuer>,
}

#[derive(Args, Debug)]
struct ExternalCert {
struct ExternalIssuer {
#[arg(required = false)]
cert: PathBuf,
#[arg(required = false)]
private_key: PathBuf,
}

fn make_root_cert() -> rcgen::CertifiedKey {
let mut param = rcgen::CertificateParams::default();
fn make_root_issuer() -> rcgen::Issuer<'static, rcgen::KeyPair> {
let mut params = rcgen::CertificateParams::default();

param.distinguished_name = rcgen::DistinguishedName::new();
param.distinguished_name.push(
params.distinguished_name = rcgen::DistinguishedName::new();
params.distinguished_name.push(
rcgen::DnType::CommonName,
rcgen::DnValue::Utf8String("<HTTP-MITM-PROXY CA>".to_string()),
);
param.key_usages = vec![
params.key_usages = vec![
rcgen::KeyUsagePurpose::KeyCertSign,
rcgen::KeyUsagePurpose::CrlSign,
];
param.is_ca = rcgen::IsCa::Ca(rcgen::BasicConstraints::Unconstrained);
params.is_ca = rcgen::IsCa::Ca(rcgen::BasicConstraints::Unconstrained);

let key_pair = rcgen::KeyPair::generate().unwrap();
let cert = param.self_signed(&key_pair).unwrap();
let signing_key = rcgen::KeyPair::generate().unwrap();

rcgen::CertifiedKey { cert, key_pair }
let cert = params.self_signed(&signing_key).unwrap();

println!();
println!("Trust this cert if you want to use HTTPS");
println!();
println!("{}", cert.pem());
println!();

/*
Save this cert to ca.crt and use it with curl like this:
curl https://www.google.com -x http://127.0.0.1:3003 --cacert ca.crt
*/

println!("Private key");
println!("{}", signing_key.serialize_pem());

rcgen::Issuer::new(params, signing_key)
}

#[tokio::main]
Expand All @@ -56,29 +71,25 @@ async fn main() {
.unwrap();
tokio::spawn(async { axum::serve(listener, app).await });

let root_cert = if let Some(external_cert) = opt.external_cert {
let root_issuer = if let Some(external_issuer) = opt.external_issuer {
// Use existing key
let param = rcgen::CertificateParams::from_ca_cert_pem(
&std::fs::read_to_string(&external_cert.cert).unwrap(),
let signing_key = rcgen::KeyPair::from_pem(
&std::fs::read_to_string(&external_issuer.private_key).unwrap(),
)
.unwrap();
let key_pair =
rcgen::KeyPair::from_pem(&std::fs::read_to_string(&external_cert.private_key).unwrap())
.unwrap();

let cert = param.self_signed(&key_pair).unwrap();

rcgen::CertifiedKey { cert, key_pair }
rcgen::Issuer::from_ca_cert_pem(
&std::fs::read_to_string(&external_issuer.cert).unwrap(),
signing_key,
)
.unwrap()
} else {
make_root_cert()
make_root_issuer()
};

let root_cert_pem = root_cert.cert.pem();
let root_cert_key = root_cert.key_pair.serialize_pem();

let proxy = MitmProxy::new(
// This is the root cert that will be used to sign the fake certificates
Some(root_cert),
Some(root_issuer),
Some(Cache::new(128)),
);

Expand Down Expand Up @@ -107,8 +118,7 @@ async fn main() {
req.headers_mut().insert(
hyper::header::HOST,
hyper::header::HeaderValue::from_maybe_shared(format!(
"127.0.0.1:{}",
port
"127.0.0.1:{port}"
))
.unwrap(),
);
Expand All @@ -117,8 +127,7 @@ async fn main() {
parts.scheme = Some(hyper::http::uri::Scheme::HTTP);
parts.authority = Some(
hyper::http::uri::Authority::from_maybe_shared(format!(
"127.0.0.1:{}",
port
"127.0.0.1:{port}"
))
.unwrap(),
);
Expand All @@ -136,19 +145,5 @@ async fn main() {

println!("HTTP Proxy is listening on http://127.0.0.1:3003");

println!();
println!("Trust this cert if you want to use HTTPS");
println!();
println!("{}", root_cert_pem);
println!();

/*
Save this cert to ca.crt and use it with curl like this:
curl https://www.google.com -x http://127.0.0.1:3003 --cacert ca.crt
*/

println!("Private key");
println!("{}", root_cert_key);

proxy.await;
}
Loading