Cert expiry

crates/defguard_certs/src/lib.rs

@@ -247,7 +247,7 @@ impl Csr<'_> {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Clone, Copy)]
 pub enum PemLabel {
     Certificate,
     PrivateKey,

crates/defguard_common/src/db/models/certificates.rs

@@ -1,6 +1,6 @@
 use chrono::NaiveDateTime;
 use serde::{Deserialize, Serialize};
-use sqlx::{PgExecutor, query, query_as};
+use sqlx::{PgExecutor, Type, query, query_as};
 use utoipa::ToSchema;
 
 /// Certificate source for the proxy HTTP/HTTPS listener.
@@ -9,9 +9,7 @@ use utoipa::ToSchema;
 /// - `SelfSigned`: cert issued by the Core CA
 /// - `LetsEncrypt`: cert obtained via ACME/Let's Encrypt
 /// - `Custom`: admin-uploaded PEM cert + key
-#[derive(
-    Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize, ToSchema, sqlx::Type,
-)]
+#[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq, Serialize, ToSchema, Type)]
 #[sqlx(type_name = "text", rename_all = "snake_case")]
 pub enum ProxyCertSource {
     #[default]
@@ -26,9 +24,7 @@ pub enum ProxyCertSource {
 /// - `None`: no cert configured, core runs plain HTTP
 /// - `SelfSigned`: cert issued by the Core CA
 /// - `Custom`: admin-uploaded PEM cert + key
-#[derive(
-    Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize, ToSchema, sqlx::Type,
-)]
+#[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq, Serialize, ToSchema, Type)]
 #[sqlx(type_name = "text", rename_all = "snake_case")]
 pub enum CoreCertSource {
     #[default]
@@ -41,7 +37,7 @@ pub enum CoreCertSource {
 ///
 /// Holds the Core CA (used to sign gRPC TLS certs for gateways/proxies),
 /// the proxy HTTP/HTTPS cert, and the core web server HTTPS cert.
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Default)]
 pub struct Certificates {
     // Core CA
     pub ca_cert_der: Option<Vec<u8>>,
@@ -75,13 +71,13 @@ impl Certificates {
                 ca_cert_der, \
                 ca_key_der, \
                 ca_expiry, \
-                proxy_http_cert_source AS \"proxy_http_cert_source: ProxyCertSource\", \
+                proxy_http_cert_source \"proxy_http_cert_source: ProxyCertSource\", \
                 proxy_http_cert_pem, \
                 proxy_http_cert_key_pem, \
                 proxy_http_cert_expiry, \
                 acme_domain, \
                 acme_account_credentials, \
-                core_http_cert_source AS \"core_http_cert_source: CoreCertSource\", \
+                core_http_cert_source \"core_http_cert_source: CoreCertSource\", \
                 core_http_cert_pem, \
                 core_http_cert_key_pem, \
                 core_http_cert_expiry \

crates/defguard_core/src/db/models/enrollment.rs

@@ -246,14 +246,14 @@ impl Token {
     where
         E: PgExecutor<'e>,
     {
-        debug!("Fetch admin data.");
+        debug!("Fetch admin data");
         if self.admin_id.is_none() {
-            debug!("Admin don't have id. Stop fetching data...");
+            debug!("Admin doesn't have ID; stop fetching data");
             return Ok(None);
         }
 
         let admin_id = self.admin_id.unwrap();
-        debug!("Trying to find admin using id {admin_id}");
+        debug!("Trying to find admin using ID {admin_id}");
         let user = User::find_by_id(executor, admin_id).await?;
         debug!("Fetched admin {user:?}.");
 
@@ -267,7 +267,7 @@ impl Token {
     where
         E: PgExecutor<'e>,
     {
-        debug!("Deleting unused tokens for the user.");
+        debug!("Deleting unused tokens for the user");
         let result = query!(
             "DELETE FROM token \
             WHERE user_id = $1 \
@@ -277,7 +277,7 @@ impl Token {
         .execute(executor)
         .await?;
         info!(
-            "Deleted {} unused enrollment tokens for the user.",
+            "Deleted {} unused enrollment tokens for the user",
             result.rows_affected()
         );
 

crates/defguard_core/src/enterprise/db/models/acl.rs

@@ -309,7 +309,7 @@ impl Default for AclRule {
 impl<I> AclRule<I> {
     pub(crate) fn stamp_modified(&mut self, actor: &str) {
         self.modified_at = Utc::now().naive_utc();
-        self.modified_by = actor.to_owned();
+        actor.clone_into(&mut self.modified_by);
     }
 }
 
@@ -1538,7 +1538,7 @@ impl Default for AclAlias {
 impl<I> AclAlias<I> {
     pub(crate) fn stamp_modified(&mut self, actor: &str) {
         self.modified_at = Utc::now().naive_utc();
-        self.modified_by = actor.to_owned();
+        actor.clone_into(&mut self.modified_by);
     }
 }
 

crates/defguard_core/src/enterprise/ldap/mod.rs

@@ -576,7 +576,7 @@ impl LDAPConnection {
                 info!("Found LDAP user with DN: {dn}");
                 user_from_searchentry(&entry, &user.username, None)
             }
-            None => Err(LdapError::ObjectNotFound(format!("User {dn} not found",))),
+            None => Err(LdapError::ObjectNotFound(format!("User {dn} not found"))),
         }
     }
 

crates/defguard_core/src/lib.rs

@@ -697,13 +697,10 @@ pub async fn run_web_server(
         let app = webapp
             .clone()
             .into_make_service_with_connect_info::<SocketAddr>();
-        let current_tls_cert_pair = Certificates::get_or_default(&pool)
-            .await
-            .map(|c| {
-                c.core_http_cert_pair()
-                    .map(|(cert, key)| (cert.to_owned(), key.to_owned()))
-            })
-            .unwrap_or(None);
+        let current_tls_cert_pair = Certificates::get_or_default(&pool).await.map_or(None, |c| {
+            c.core_http_cert_pair()
+                .map(|(cert, key)| (cert.to_owned(), key.to_owned()))
+        });
 
         let mut server_task = tokio::spawn(async move {
             if let Some((cert_pem, key_pem)) = current_tls_cert_pair {