chore: version 0.2.3

vicanso · Apr 24, 2024 · d685f9f · d685f9f
1 parent 9aff51c
commit d685f9f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pingap"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Tree Xie <[email protected]>"]
 edition = "2021"
 categories = ["network-programming", "web-programming::http-server"]

diff --git a/src/proxy/server.rs b/src/proxy/server.rs
@@ -113,12 +113,20 @@ impl From<PingapConf> for Vec<ServerConf> {
             // load config validate base64
             // so ignore error
             if let Some(value) = &item.tls_cert {
-                let buf = STANDARD.decode(value).unwrap_or_default();
-                tls_cert = Some(buf);
+                if value.starts_with("-----") {
+                    tls_cert = Some(value.as_bytes().to_vec());
+                } else {
+                    let buf = STANDARD.decode(value).unwrap_or_default();
+                    tls_cert = Some(buf);
+                }
             }
             if let Some(value) = &item.tls_key {
-                let buf = STANDARD.decode(value).unwrap_or_default();
-                tls_key = Some(buf);
+                if value.starts_with("-----") {
+                    tls_key = Some(value.as_bytes().to_vec());
+                } else {
+                    let buf = STANDARD.decode(value).unwrap_or_default();
+                    tls_key = Some(buf);
+                }
             }
 
             let error_template = if conf.error_template.is_empty() {