Merge pull request #1 from kazk/test-on-mac-windows

Author: kazk

.github/workflows/ci.yml

@@ -8,7 +8,10 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1

src/machine_id.rs

@@ -1,6 +1,3 @@
-use std::fs;
-use std::io;
-
 use hostname;
 use md5;
 use rand::RngCore;
@@ -26,14 +23,15 @@ pub fn get() -> [u8; 3] {
     bytes
 }
 
-// OS dependent machine ids. Only linux was confirmed.
-
 // https://github.com/rs/xid/blob/efa678f304ab65d6d57eedcb086798381ae22206/hostid_linux.go
 // Not checking "/sys/class/dmi/id/product_uuid" because normal users can't read it.
 #[cfg(target_os = "linux")]
-fn machine_id() -> io::Result<String> {
+fn machine_id() -> std::io::Result<String> {
+    use std::fs;
+    // Get machine-id and remove the trailing new line.
     fs::read_to_string("/var/lib/dbus/machine-id")
         .or_else(|_| fs::read_to_string("/etc/machine-id"))
+        .map(|s| s.trim_end().to_string())
 }
 
 // https://github.com/rs/xid/blob/efa678f304ab65d6d57eedcb086798381ae22206/hostid_darwin.go
@@ -46,14 +44,43 @@ fn machine_id() -> Result<String, SysctlError> {
 
 // https://github.com/rs/xid/blob/efa678f304ab65d6d57eedcb086798381ae22206/hostid_windows.go
 #[cfg(target_os = "windows")]
-fn machine_id() -> io::Result<String> {
-    winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE)
+fn machine_id() -> std::io::Result<String> {
+    let hklm = winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE);
+    let guid: String = hklm
         .open_subkey("SOFTWARE\\Microsoft\\Cryptography")?
-        .get_value("MachineGuid")?
+        .get_value("MachineGuid")?;
+    Ok(guid)
 }
 
 #[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))]
-fn machine_id() -> io::Result<String> {
+fn machine_id() -> std::io::Result<String> {
     // Fallback to hostname or a random value
     Ok("".to_string())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn test_linux() {
+        // machine-id has length 32
+        assert_eq!(machine_id().unwrap().len(), 32);
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn test_macos() {
+        // Ensure non empty string
+        assert!(machine_id().unwrap().len() > 0);
+    }
+
+    #[cfg(target_os = "windows")]
+    #[test]
+    fn test_windows() {
+        // MachineGuid has length 36
+        // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+        assert_eq!(machine_id().unwrap().len(), 36);
+    }
+}