From c4e957ccf43356779ef7f21e950fa3a9a89220f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= <adam@defguard.net>
Date: Tue, 17 Feb 2026 11:58:44 +0100
Subject: [PATCH] Use binary licence key

---
 Cargo.lock                                    |  16 +-
 .../defguard_core/src/enterprise/license.rs   | 178 ++----------------
 .../src/enterprise/public_key.asc             | Bin 0 -> 4122 bytes
 .../defguard_core/src/enterprise/test_key.asc | Bin 0 -> 385 bytes
 crates/defguard_mail/src/mail_handler.rs      | 129 -------------
 5 files changed, 21 insertions(+), 302 deletions(-)
 create mode 100644 crates/defguard_core/src/enterprise/public_key.asc
 create mode 100644 crates/defguard_core/src/enterprise/test_key.asc
 delete mode 100644 crates/defguard_mail/src/mail_handler.rs

diff --git a/Cargo.lock b/Cargo.lock
index 536531e9fc..c1571554c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -833,9 +833,9 @@ checksum = "bba18ee93d577a8428902687bcc2b6b45a56b1981a1f6d779731c86cc4c5db18"
 
 [[package]]
 name = "clap"
-version = "4.5.58"
+version = "4.5.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806"
+checksum = "c5caf74d17c3aec5495110c34cc3f78644bfa89af6c8993ed4de2790e49b6499"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -843,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.58"
+version = "4.5.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2"
+checksum = "370daa45065b80218950227371916a1633217ae42b2715b2287b606dcd618e24"
 dependencies = [
  "anstream",
  "anstyle",
@@ -972,9 +972,9 @@ dependencies = [
 
 [[package]]
 name = "cookie_store"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fc4bff745c9b4c7fb1e97b25d13153da2bc7796260141df62378998d070207f"
+checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206"
 dependencies = [
  "cookie",
  "document-features",
@@ -6401,9 +6401,9 @@ dependencies = [
 
 [[package]]
 name = "toml_parser"
-version = "1.0.8+spec-1.1.0"
+version = "1.0.9+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0742ff5ff03ea7e67c8ae6c93cac239e0d9784833362da3f9a9c1da8dfefcbdc"
+checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
 dependencies = [
  "winnow",
 ]
diff --git a/crates/defguard_core/src/enterprise/license.rs b/crates/defguard_core/src/enterprise/license.rs
index dd20f61256..f0895c3a0d 100644
--- a/crates/defguard_core/src/enterprise/license.rs
+++ b/crates/defguard_core/src/enterprise/license.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Display, time::Duration};
+use std::{fmt, time::Duration};
 
 use anyhow::Result;
 use base64::prelude::*;
@@ -35,143 +35,7 @@ global_value!(
 );
 
 #[cfg(not(test))]
-pub(crate) const PUBLIC_KEY: &str = "-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=Xet7
------END PGP PUBLIC KEY BLOCK-----
-";
+pub(crate) const PUBLIC_KEY: &[u8] = include_bytes!("public_key.asc");
 
 #[derive(Debug, Error)]
 pub enum LicenseError {
@@ -209,22 +73,19 @@ struct RefreshRequestResponse {
 /// Represents license tiers
 ///
 /// Variant order must be maintained to go from lowest (first) to highest (last) tier
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, PartialOrd)]
+#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, PartialOrd)]
 pub enum LicenseTier {
     Business, // this corresponds to both Team & Business level in our current pricing structure
     Enterprise,
 }
 
-impl Display for LicenseTier {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Business => {
-                write!(f, "Business")
-            }
-            Self::Enterprise => {
-                write!(f, "Enterprise")
-            }
-        }
+impl fmt::Display for LicenseTier {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(match self {
+            Self::Business => "Business",
+
+            Self::Enterprise => "Enterprise",
+        })
     }
 }
 
@@ -271,8 +132,8 @@ impl License {
     fn verify_signature(data: &[u8], signature: &[u8]) -> Result<(), LicenseError> {
         let sig =
             DetachedSignature::from_bytes(signature).map_err(|_| LicenseError::InvalidSignature)?;
-        let (public_key, _headers_public) =
-            SignedPublicKey::from_string(PUBLIC_KEY).expect("Failed to parse the public key");
+        let public_key =
+            SignedPublicKey::from_bytes(PUBLIC_KEY).expect("Failed to parse the public key");
 
         // If the public key has subkeys, extract the signing key from them
         // Otherwise, use the primary key
@@ -715,20 +576,7 @@ pub async fn run_periodic_license_check(pool: &PgPool) -> Result<(), LicenseErro
 
 // Mock public key
 #[cfg(test)]
-pub(crate) const PUBLIC_KEY: &str = "-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mI0EZ3ZfKQEEAKp7t6rldfVtMZ3x42cC+P7ZzF4OxuGlt/eDxoCzFpirCIwu1WY/
-cpi+3zop0dovEBbIoYIHJVLwMxx/y/UzQ9H/3Vc0MZ3ZNwK+LRGugaOi6Y/Z6C3i
-JjBJRMLi1rIU8TbYHE4QG6QUssDH74cE0s/WQjsEqkthkKwf5qv4/TgLABEBAAG0
-HWRlZmd1YXJkLXRlc3QgPGRlZmd1YXJkQHRlc3Q+iNEEEwEIADsWIQSaLjwX4m6j
-CO3NypmohGwBApqEhAUCZ3ZfKQIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIX
-gAAKCRCohGwBApqEhONUA/9vnmAL8Roouk0GPeTKt9C/srXcmPtIadzoyEqGjsNI
-Y1dpL7jhaKjY8sJtuNaCwTJ529w97fLM+SIeAMbwrK5naSdAIRqknn1h8a8VWkdX
-isbqg9N/kMP891HyJZHM35VbHn1zFuJUh2gVzfIVaaAmC7YIMtmiAP5lYbrId/Ps
-hw==
-=6frq
------END PGP PUBLIC KEY BLOCK-----
-";
+pub(crate) const PUBLIC_KEY: &[u8] = include_bytes!("test_key.asc");
 
 #[cfg(test)]
 mod test {
diff --git a/crates/defguard_core/src/enterprise/public_key.asc b/crates/defguard_core/src/enterprise/public_key.asc
new file mode 100644
index 0000000000000000000000000000000000000000..55f1e78b9b09943845927de634a30b83b0df1893
GIT binary patch
literal 4122
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

literal 0
HcmV?d00001

diff --git a/crates/defguard_core/src/enterprise/test_key.asc b/crates/defguard_core/src/enterprise/test_key.asc
new file mode 100644
index 0000000000000000000000000000000000000000..6b0b697b3945701a253b50868e5a003e80d1c1bb
GIT binary patch
literal 385
zcmbQy%aUFeugS>5u&R3ds;8x2a}DQye4Nho<KN9QaeT)fF5UjU`B=kdu^Fp5di1WQ
z*%!^&ci&3$;w^mvu@eiM*j0l*7|Yb3{%Y)e@&Da$6T`VT&6)P;3a)Ehyy#{B%@?|l
z)C@db4n4ZIN#vv14H-WH=_MkY4jg~q&T{GeH79G9Ro;mc*2q6w{o}6%H-jJ}1LGFi
zl+?8J(!`<^-ICPe5(OI=*8#+}>$u1w%*erDEvCpaOV399QQl&Xw`WhyT+x!l$TX{^
zg_Q~97ba<DR&GuXb|xkzCN@znP7ZD+7BMDfMkYCSCh-OaE=~cM`o|&6|MTZ1aDSB2
z*yYP+`{dO23;Q>1y))ytN9LUuC%oGF4tperXX@{Gn6cu<r$f0rt~DJrs=R&2_U)%L
zKb7Pdj(u3OE<ID-K~ZYSyxPQ%>qVp7!@G{XYQ9`Q;qagDfuB?-p1D6YTCTQO>`_R2
dhUnQ(qL~ZSxVLc_-CV@*FEw%3iSo~H+5sUUtAhXl

literal 0
HcmV?d00001

diff --git a/crates/defguard_mail/src/mail_handler.rs b/crates/defguard_mail/src/mail_handler.rs
deleted file mode 100644
index f81702e185..0000000000
--- a/crates/defguard_mail/src/mail_handler.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::time::Duration;
-
-use defguard_common::db::models::{Settings, settings::SmtpEncryption};
-use lettre::{
-    AsyncSmtpTransport, AsyncTransport, Message, Tokio1Executor,
-    transport::smtp::authentication::Credentials,
-};
-use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel};
-use tracing::{debug, error, info, warn};
-
-use crate::{Confirmation, Mail, SmtpSettings, mail::MailError};
-
-const SMTP_TIMEOUT: Duration = Duration::from_secs(15);
-
-pub struct MailHandler {
-    tx: UnboundedSender<Mail>,
-    rx: UnboundedReceiver<Mail>,
-}
-
-impl Default for MailHandler {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl MailHandler {
-    /// Create new [`MailHandler`].
-    #[must_use]
-    pub fn new() -> Self {
-        let (tx, rx) = unbounded_channel();
-        Self { tx, rx }
-    }
-
-    /// Return sender's clone.
-    #[must_use]
-    pub fn tx(&self) -> UnboundedSender<Mail> {
-        self.tx.clone()
-    }
-
-    fn send_result(tx: Option<UnboundedSender<Confirmation>>, result: Confirmation) {
-        if let Some(tx) = tx {
-            if tx.send(result).is_ok() {
-                debug!("SMTP result sent back to caller");
-            } else {
-                error!("Error sending SMTP result back to caller");
-            }
-        }
-    }
-
-    /// Listens on the receiver for messages and sends them via SMTP.
-    pub async fn run(mut self) {
-        while let Some(mail) = self.rx.recv().await {
-            let (to, subject) = (mail.to.clone(), mail.subject.clone());
-            debug!("Sending mail to: {to}, subject: {subject}");
-
-            // fetch SMTP settings
-            let settings = Settings::get_current_settings();
-            let settings = match SmtpSettings::from_settings(settings) {
-                Ok(settings) => settings,
-                Err(MailError::SmtpNotConfigured) => {
-                    warn!("SMTP not configured, email sending skipped");
-                    continue;
-                }
-                Err(err) => {
-                    error!("Error retrieving SMTP settings: {err}");
-                    continue;
-                }
-            };
-
-            // Construct lettre Message
-            let result_tx = mail.result_tx.clone();
-            let message = match mail.into_message(&settings.sender) {
-                Ok(message) => message,
-                Err(err) => {
-                    error!("Failed to build message to: {to}, subject: {subject}, error: {err}");
-                    continue;
-                }
-            };
-            // Build mailer and send the message
-            match Self::mailer(settings) {
-                Ok(mailer) => match mailer.send(message).await {
-                    Ok(response) => {
-                        Self::send_result(result_tx, Ok(response.clone()));
-                        info!("Mail sent to: {to}, subject: {subject}, response: {response:?}");
-                    }
-                    Err(err) => {
-                        error!("Failed to send mail to: {to}, subject: {subject}, error: {err}");
-                        Self::send_result(result_tx, Err(MailError::SmtpError(err)));
-                    }
-                },
-                Err(MailError::SmtpNotConfigured) => {
-                    warn!("Unable to send mail to {to}; SMTP not configured");
-                    Self::send_result(result_tx, Err(MailError::SmtpNotConfigured));
-                }
-                Err(err) => {
-                    error!("Error building mailer: {err}");
-                    Self::send_result(result_tx, Err(err));
-                }
-            }
-        }
-    }
-
-    /// Builds mailer object with specified configuration
-    fn mailer(settings: SmtpSettings) -> Result<AsyncSmtpTransport<Tokio1Executor>, MailError> {
-        let builder = match settings.encryption {
-            SmtpEncryption::None => {
-                AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(settings.server)
-            }
-            SmtpEncryption::StartTls => {
-                AsyncSmtpTransport::<Tokio1Executor>::starttls_relay(&settings.server)?
-            }
-            SmtpEncryption::ImplicitTls => {
-                AsyncSmtpTransport::<Tokio1Executor>::relay(&settings.server)?
-            }
-        }
-        .port(settings.port)
-        .timeout(Some(SMTP_TIMEOUT));
-
-        // Skip credentials if any of them is empty
-        let builder = if settings.user.is_empty() || settings.password.is_empty() {
-            debug!("SMTP credentials were not provided, skipping username/password authentication");
-            builder
-        } else {
-            builder.credentials(Credentials::new(settings.user, settings.password))
-        };
-
-        Ok(builder.build())
-    }
-}