picoHz · picoHz · Sep 2, 2023 · Sep 1, 2023
diff --git a/taxy-webui/src/components/letsencrypt.rs → taxy-webui/src/components/acme_provider.rs b/taxy-webui/src/components/letsencrypt.rs → taxy-webui/src/components/acme_provider.rs
@@ -1,6 +1,7 @@
+use base64::{engine::general_purpose, Engine};
 use std::collections::HashMap;
 use taxy_api::{
-    acme::{Acme, AcmeRequest},
+    acme::{Acme, AcmeRequest, ExternalAccountBinding},
     subject_name::SubjectName,
 };
 use wasm_bindgen::{JsCast, UnwrapThrowExt};
@@ -9,12 +10,33 @@ use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct Props {
-    pub staging: bool,
+    pub name: String,
+    pub url: String,
+    #[prop_or_default]
+    pub eab: bool,
     pub onchanged: Callback<Result<AcmeRequest, HashMap<String, String>>>,
 }
 
-#[function_component(LetsEncrypt)]
+#[function_component(AcmeProvider)]
 pub fn letsencrypt(props: &Props) -> Html {
+    let eab_kid = use_state(String::new);
+    let eab_kid_onchange = Callback::from({
+        let eab_kid: UseStateHandle<String> = eab_kid.clone();
+        move |event: Event| {
+            let target: HtmlInputElement = event.target().unwrap_throw().dyn_into().unwrap_throw();
+            eab_kid.set(target.value());
+        }
+    });
+
+    let eab_hmac_key = use_state(String::new);
+    let eab_hmac_key_onchange = Callback::from({
+        let eab_hmac_key: UseStateHandle<String> = eab_hmac_key.clone();
+        move |event: Event| {
+            let target: HtmlInputElement = event.target().unwrap_throw().dyn_into().unwrap_throw();
+            eab_hmac_key.set(target.value());
+        }
+    });
+
     let email = use_state(String::new);
     let email_onchange = Callback::from({
         let email = email.clone();
@@ -35,14 +57,30 @@ pub fn letsencrypt(props: &Props) -> Html {
 
     let prev_entry =
         use_state::<Result<AcmeRequest, HashMap<String, String>>, _>(|| Err(Default::default()));
-    let entry = get_request(&email, &domain_name, props.staging);
+    let entry = get_request(
+        &props.name,
+        props.eab,
+        &eab_kid,
+        &eab_hmac_key,
+        &email,
+        &domain_name,
+        &props.url,
+    );
     if entry != *prev_entry {
         prev_entry.set(entry.clone());
         props.onchanged.emit(entry);
     }
 
     html! {
         <>
+            if props.eab {
+                <label class="block mt-4 mb-2 text-sm font-medium text-neutral-900">{"EAB Key ID"}</label>
+                <input type="text" onchange={eab_kid_onchange} class="bg-neutral-50 border border-neutral-300 text-neutral-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" />
+
+                <label class="block mt-4 mb-2 text-sm font-medium text-neutral-900">{"EAB HMAC Key"}</label>
+                <input type="text" onchange={eab_hmac_key_onchange} class="bg-neutral-50 border border-neutral-300 text-neutral-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" />
+            }
+
             <label class="block mt-4 mb-2 text-sm font-medium text-neutral-900">{"Email Address"}</label>
             <input type="email" placeholder="admin@example.com" onchange={email_onchange} class="bg-neutral-50 border border-neutral-300 text-neutral-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" />
 
@@ -58,11 +96,35 @@ pub fn letsencrypt(props: &Props) -> Html {
 }
 
 fn get_request(
+    name: &str,
+    eab: bool,
+    eab_kid: &str,
+    eab_hmac_key: &str,
     email: &str,
     domain_name: &str,
-    staging: bool,
+    server_url: &str,
 ) -> Result<AcmeRequest, HashMap<String, String>> {
     let mut errors = HashMap::new();
+    let eab_kid = eab_kid.trim();
+    let eab_hmac_key = eab_hmac_key.trim();
+    let eab = if eab && (!eab_kid.is_empty() || !eab_hmac_key.is_empty()) {
+        if eab_kid.is_empty() {
+            errors.insert("eab_kid".to_string(), "Key ID is required".to_string());
+        }
+        let eab_hmac_key = match general_purpose::URL_SAFE_NO_PAD.decode(eab_hmac_key.as_bytes()) {
+            Ok(key) => key,
+            Err(_) => {
+                errors.insert("eab_hmac_key".to_string(), "Invalid HMAC Key".to_string());
+                Default::default()
+            }
+        };
+        Some(ExternalAccountBinding {
+            key_id: eab_kid.to_string(),
+            hmac_key: eab_hmac_key,
+        })
+    } else {
+        None
+    };
     if email.is_empty() {
         errors.insert("email".to_string(), "Email is required".to_string());
     }
@@ -83,19 +145,11 @@ fn get_request(
         return Err(errors);
     }
     Ok(AcmeRequest {
-        server_url: if staging {
-            "https://acme-staging-v02.api.letsencrypt.org/directory".to_string()
-        } else {
-            "https://acme-v02.api.letsencrypt.org/directory".to_string()
-        },
+        server_url: server_url.to_string(),
         contacts: vec![format!("mailto:{}", email)],
-        eab: None,
+        eab,
         acme: Acme {
-            provider: if staging {
-                "Let's Encrypt (Staging)".to_string()
-            } else {
-                "Let's Encrypt".to_string()
-            },
+            provider: name.to_string(),
             identifiers: vec![domain_name],
             challenge_type: "http-01".to_string(),
             renewal_days: 60,

diff --git a/taxy-webui/src/components/mod.rs b/taxy-webui/src/components/mod.rs
@@ -1,6 +1,6 @@
+pub mod acme_provider;
 pub mod custom_acme;
 pub mod http_proxy_config;
-pub mod letsencrypt;
 pub mod navbar;
 pub mod port_config;
 pub mod proxy_config;

diff --git a/taxy-webui/src/pages/new_acme.rs b/taxy-webui/src/pages/new_acme.rs
@@ -1,5 +1,5 @@
+use crate::components::acme_provider::AcmeProvider;
 use crate::components::custom_acme::CustomAcme;
-use crate::components::letsencrypt::LetsEncrypt;
 use crate::pages::cert_list::{CertsQuery, CertsTab};
 use crate::{auth::use_ensure_auth, pages::Route, API_ENDPOINT};
 use gloo_net::http::Request;
@@ -13,15 +13,23 @@ use yew_router::prelude::*;
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum Provider {
     LetsEncrypt,
-    LetsEncryptStaging,
+    GoogleTrustServices,
+    ZeroSSL,
     Custom,
 }
 
 impl Provider {
     fn html(&self, onchanged: Callback<Result<AcmeRequest, HashMap<String, String>>>) -> Html {
         match self {
-            Provider::LetsEncrypt => html! { <LetsEncrypt staging={false} {onchanged} /> },
-            Provider::LetsEncryptStaging => html! { <LetsEncrypt staging={true} {onchanged} /> },
+            Provider::LetsEncrypt => {
+                html! { <AcmeProvider name={self.to_string()} url={"https://acme-v02.api.letsencrypt.org/directory"} {onchanged} /> }
+            }
+            Provider::GoogleTrustServices => {
+                html! { <AcmeProvider name={self.to_string()} eab={true} url={"https://dv.acme-v02.api.pki.goog/directory"} {onchanged} /> }
+            }
+            Provider::ZeroSSL => {
+                html! { <AcmeProvider name={self.to_string()} eab={true} url={"https://acme.zerossl.com/v2/DV90"} {onchanged} /> }
+            }
             Provider::Custom => html! { <CustomAcme {onchanged} /> },
         }
     }
@@ -31,15 +39,17 @@ impl ToString for Provider {
     fn to_string(&self) -> String {
         match self {
             Provider::LetsEncrypt => "Let's Encrypt".to_string(),
-            Provider::LetsEncryptStaging => "Let's Encrypt (Staging)".to_string(),
+            Provider::GoogleTrustServices => "Google Trust Services".to_string(),
+            Provider::ZeroSSL => "ZeroSSL".to_string(),
             Provider::Custom => "Custom".to_string(),
         }
     }
 }
 
 const PROVIDERS: &[Provider] = &[
     Provider::LetsEncrypt,
-    Provider::LetsEncryptStaging,
+    Provider::GoogleTrustServices,
+    Provider::ZeroSSL,
     Provider::Custom,
 ];