implement custom time zone getter

Author: br0kenpixel

Cargo.lock

@@ -56,4 +56,3 @@ arrayref = "0.3.9"
 libc = { version = "0.2.171", default-features = false }
 semaphore = "0.4.0"
 circular-queue = "0.2.7"
-localzone = "0.3.1"

Cargo.toml

@@ -46,9 +46,8 @@ impl DatabaseClient {
         Ok(Self(pool))
     }
 
-    pub async fn setup_timezone(&self, tz: String) -> Result<(), Error> {
-        let supported_tz = self.get_supported_time_zones().await?;
-        if !supported_tz.contains(&tz) {
+    pub async fn setup_timezone(&self, tz: &str) -> Result<(), Error> {
+        if !self.validate_timezone(tz).await? {
             error!("Timezone \"{tz}\" is not supported by database, leaving defaults");
             return Ok(());
         }
@@ -269,4 +268,10 @@ impl DatabaseClient {
 
         Ok(names)
     }
+
+    async fn validate_timezone<S: PartialEq<String>>(&self, tz: S) -> Result<bool, Error> {
+        let supported = self.get_supported_time_zones().await?;
+
+        Ok(supported.iter().any(|candidate| tz.eq(candidate)))
+    }
 }

src/server/db.rs

@@ -14,6 +14,7 @@ pub mod config;
 pub mod db;
 pub mod handle;
 pub mod rate_limit;
+pub mod tz;
 
 pub async fn main(config: Config) {
     let config = Arc::new(config);
@@ -32,10 +33,10 @@ pub async fn main(config: Config) {
         .database
         .timezone
         .clone()
-        .or(localzone::get_local_zone())
+        .or(tz::get_system_timezone())
     {
-        Some(tz) => match db.setup_timezone(tz).await {
-            Ok(()) => info!("Timezone updated successfully"),
+        Some(tz) => match db.setup_timezone(&tz).await {
+            Ok(()) => info!("Timezone updated to \"{tz}\" successfully"),
             Err(why) => {
                 error!("Failed to set time zone: {why}");
             }

src/server/mod.rs

@@ -0,0 +1,44 @@
+use log::debug;
+use std::{fs, process::Command};
+
+pub fn get_system_timezone() -> Option<String> {
+    get_timezone_with_timedatectl().or(get_timezone_with_etc_localtime())
+}
+
+fn get_timezone_with_timedatectl() -> Option<String> {
+    debug!("Attempting to get timezone with 'timedatectl'");
+    get_command_output(Command::new("timedatectl").args(["show", "-P", "Timezone"]))
+}
+
+fn get_timezone_with_etc_localtime() -> Option<String> {
+    debug!("Attempting to get timezone from '/etc/localtime'");
+
+    let target = fs::read_link("/etc/localtime").ok()?;
+    let second = target.file_name()?;
+    let first = target.parent()?.file_name()?;
+
+    Some(format!("{}/{}", first.to_str()?, second.to_str()?))
+}
+
+fn get_command_output(cmd: &mut Command) -> Option<String> {
+    let mut out = String::from_utf8(cmd.output().ok()?.stdout).ok()?;
+    out.pop();
+
+    Some(out)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::get_timezone_with_timedatectl;
+    use crate::server::tz::get_timezone_with_etc_localtime;
+
+    #[test]
+    fn check_timedatectl_method() {
+        assert!(get_timezone_with_timedatectl().is_some());
+    }
+
+    #[test]
+    fn check_etc_localtime() {
+        assert!(get_timezone_with_etc_localtime().is_some())
+    }
+}