fix: ssl redirect

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easy-proxy"
-version = "0.1.7"
+version = "0.1.8"
 edition = "2021"
 
 [dependencies]

src/config/certs.rs

@@ -153,7 +153,7 @@ pub fn load_cert(
         let expiry = expiry - 432000;
         let now = chrono::Utc::now().timestamp() as i128;
         // 5 days before expiration
-        if expiry  < now {
+        if expiry < now {
             tracing::info!("Renewing cert for {}", host);
             let add = acme_requests.get_mut(&tls.name);
             if let Some(add) = add {

src/config/store.rs

@@ -586,10 +586,9 @@ pub async fn acme_request(tls_name: &str, acme: &Acme, domains: &[String]) -> Re
         .map_err(|_| Errors::AcmeClientError("Unable to parse cert".to_string()))?;
     let expiry = utils::asn1_time_to_unix_time(cert.not_after())
         .map_err(|e| Errors::AcmeClientError(format!("Unable to parse cert expiry: {}", e)))?;
-    acme_store.acme_expires.insert(
-        order_id.to_string(),
-        (tls_name.to_string(), expiry),
-    );
+    acme_store
+        .acme_expires
+        .insert(order_id.to_string(), (tls_name.to_string(), expiry));
     let chain = cert_pems[1..]
         .iter()
         .map(|c| {

src/proxy/mod.rs

@@ -370,7 +370,7 @@ impl ProxyHttp for EasyProxy {
                 None => false,
             };
             // println!("TLS: {}", is_tls);
-            if tls.redirect.unwrap_or(false) && is_tls {
+            if tls.redirect.unwrap_or(false) && !is_tls {
                 // println!("Redirecting to https");
                 if tls_port != "443" {
                     res.redirect_https(host, path, Some(tls_port.to_string()));

src/utils.rs

@@ -4,9 +4,7 @@ use openssl::{
 };
 use std::time::{Duration, SystemTime};
 
-pub fn asn1_time_to_unix_time(
-    time: &Asn1TimeRef,
-) -> Result<i128, ErrorStack> {
+pub fn asn1_time_to_unix_time(time: &Asn1TimeRef) -> Result<i128, ErrorStack> {
     let threshold = Asn1Time::days_from_now(0).unwrap();
     let time = threshold.diff(time)?;
     let days = time.days; // Difference in days