From 159203bd5d1bf22a37f12800bbf869b281944b8a Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sat, 30 Mar 2024 17:40:20 +0800 Subject: [PATCH] feat: v0.2.0-rc --- README.md | 4 ++-- proxy_config.json | 4 ++-- src/app.rs | 2 +- src/config.rs | 4 ++-- src/service.rs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e3c03b6..5dc7aa4 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ "port": 443, "lookup_dns": true, "tls": { - "intermediate_cert": "intermediate_cert.pem", - "intermediate_key": "intermediate_cert.key" + "issuer_cert": "intermediate_cert.pem", + "issuer_key": "intermediate_cert.key" }, "proxy_map": { "hatter.ink": { diff --git a/proxy_config.json b/proxy_config.json index 65f5f11..a82fbeb 100644 --- a/proxy_config.json +++ b/proxy_config.json @@ -4,8 +4,8 @@ "port": 443, "lookup_dns": true, "tls": { - "intermediate_cert": "intermediate_cert.pem", - "intermediate_key": "intermediate_cert.key" + "issuer_cert": "intermediate_cert.pem", + "issuer_key": "intermediate_cert.key" }, "proxy_map": { "hatter.ink": { diff --git a/src/app.rs b/src/app.rs index 33e9aa5..07230d8 100644 --- a/src/app.rs +++ b/src/app.rs @@ -186,7 +186,7 @@ impl ProxyHttp for ProxyApp { end_of_stream: bool, _ctx: &mut Self::CTX, ) { - log::info!("Body {}: [[[{}]]] ",end_of_stream, + log::info!("Body {}: [[[\n{}\n]]] ",end_of_stream, body.as_ref().map(|bytes| String::from_utf8_lossy(bytes.iter().as_slice()) ).unwrap_or_else(|| "".into()) diff --git a/src/config.rs b/src/config.rs index 1f39ff7..2f3f929 100644 --- a/src/config.rs +++ b/src/config.rs @@ -39,6 +39,6 @@ pub struct ProxyItem { #[derive(Debug, Serialize, Deserialize)] pub struct ProxyTls { - pub intermediate_cert: String, - pub intermediate_key: String, + pub issuer_cert: String, + pub issuer_key: String, } diff --git a/src/service.rs b/src/service.rs index 66fb9b9..abeb973 100644 --- a/src/service.rs +++ b/src/service.rs @@ -24,7 +24,7 @@ struct Callback { impl Callback { fn new(proxy_tls: &ProxyTls) -> Result { - let (cert, cert_pem) = cert::load_certificate(&proxy_tls.intermediate_cert, &proxy_tls.intermediate_key)?; + let (cert, cert_pem) = cert::load_certificate(&proxy_tls.issuer_cert, &proxy_tls.issuer_key)?; Ok(Self { intermediate_certificate: cert, intermediate_certificate_pem: cert_pem,