chore: enabled subdomains

Author: jwndlng

src/http_server.rs

@@ -38,6 +38,12 @@ struct ChallengeRequestBody {
     config: Option<Value>,
 }
 
+impl ChallengeRequestBody {
+    pub fn get_hostname(&self) -> String {
+        self.resolved_fqdn.replace(self.resolved_zone.as_str(), "")
+    }
+}
+
 #[derive(Debug, Serialize)]
 struct ChallengeResponse {
     response: ChallengeResponseBody
@@ -134,7 +140,6 @@ impl HttpServer {
         let priv_key_pem = cert_key.key_pair.serialize_pem();
         let cert_pem = cert_key.cert.pem();
 
-
         // Clone the routes for both HTTP and HTTPS
         let routes_http = routes.clone();
         let routes_https = routes;
@@ -174,13 +179,14 @@ async fn handle_post(
     info!("Received POST request with the following payload: {:?}", &body);
 
     let request: ChallengeRequest = serde_json::from_value(body).unwrap();
-    let body = request.request;
+    let body: ChallengeRequestBody = request.request;
 
     let mut response_body = ChallengeResponseBody {
         uid: "".to_string(),
         success: false,
         status: None,
     };
+    let hostname = body.get_hostname();
     let challenge_id = body.key;
     let action = body.action;
     let mut cached_record = cache.lock().await;
@@ -192,7 +198,7 @@ async fn handle_post(
                 Ok(cached_record_id)
             } else {
                 info!("Adding DNS challenge");
-                let record_id = plesk_api.add_challenge(challenge_id).await.unwrap();
+                let record_id = plesk_api.add_challenge(hostname, challenge_id).await.unwrap();
                 let _ = cached_record.insert(record_id.clone());
                 Ok(record_id)
             }

src/plesk_api.rs

@@ -6,7 +6,6 @@ use tracing::info;
 use serde_xml_rs::from_str;
 
 const PLESK_API_PATH: &str = "/enterprise/control/agent.php";
-const ACME_CHALLENGE_PREFIX: &str = "_acme-challenge";
 
 #[derive(Clone)]
 pub struct PleskAPI {
@@ -82,7 +81,7 @@ impl PleskAPI {
             .header("HTTP_AUTH_PASSWD", self.password.clone())
     }
 
-    pub async fn add_challenge(&self, challenge_string: String) -> Result<String, Error> {
+    pub async fn add_challenge(&self, host: String, challenge_string: String) -> Result<String, Error> {
         let payload = format!(
             r#"
                 <packet>
@@ -97,7 +96,7 @@ impl PleskAPI {
                 </packet>
             "#,
             self.site_id,
-            ACME_CHALLENGE_PREFIX,
+            host,
             challenge_string
         );
         let response = self
@@ -120,7 +119,7 @@ impl PleskAPI {
                 let error_msg = dns_resp_record.result.errtext.unwrap();
                 if error_msg.contains("exists") {
                     info!("Record already exists, retrieving record ID");
-                    let record_id = self.get_challenge_record_id().await?;
+                    let record_id = self.get_challenge_record_id(host).await?;
                     return Ok(record_id);
                 } else {
                     let error = io::Error::new(
@@ -195,7 +194,7 @@ impl PleskAPI {
         Err(anyhow!(error))
     }
 
-    pub async fn get_challenge_record_id(&self) -> Result<String, Error> {
+    pub async fn get_challenge_record_id(&self, host: &String) -> Result<String, Error> {
         info!("Getting challenge record ID");
         let response = self
             .create_request()
@@ -232,7 +231,7 @@ impl PleskAPI {
                     continue;
                 }
                 let record_data = action.data.unwrap();
-                if record_data.host.contains(ACME_CHALLENGE_PREFIX) {
+                if record_data.host.contains(host) && record_data.record_type == "TXT" {
                     info!("Found record ID: {}", action.id.clone().unwrap());
                     return Ok(action.id.unwrap());
                 }