encode_fingerprint

Author: epompeii

lib/bencher_context/Cargo.toml

@@ -7,8 +7,8 @@ license-file.workspace = true
 publish = false
 
 [features]
-client = ["dep:gix", "dep:uuid", "dep:windows"]
-server = ["dep:uuid", "bencher_valid/server", "uuid/v4"]
+client = ["dep:gix", "dep:uuid", "dep:windows", "bencher_valid/client"]
+server = ["bencher_valid/server"]
 schema = ["dep:schemars"]
 
 [dependencies]

lib/bencher_context/src/server/base36.rs renamed to lib/bencher_context/src/client/platform/base36.rs

@@ -2,11 +2,20 @@ use bencher_valid::BASE_36;
 use uuid::Uuid;
 
 pub fn encode_uuid(uuid: Uuid) -> String {
+    const ENCODED_LEN: usize = 26;
+
     let base = BASE_36.len() as u128;
     let chars = BASE_36.chars().collect::<Vec<_>>();
 
-    let mut num = uuid.as_u128();
+    // Treat the bytes as a single large number to preserve entropy
+    let bytes = uuid.as_bytes();
+    let mut num = 0u128;
+    for &byte in bytes {
+        num = (num << 8) | u128::from(byte);
+    }
+
     let mut result = String::new();
+    #[allow(clippy::cast_possible_truncation)]
     while num > 0 {
         let remainder = (num % base) as usize;
         if let Some(c) = chars.get(remainder) {
@@ -15,7 +24,11 @@ pub fn encode_uuid(uuid: Uuid) -> String {
         num /= base;
     }
 
-    result.chars().rev().collect()
+    result
+        .chars()
+        .chain(std::iter::repeat('0'))
+        .take(ENCODED_LEN)
+        .collect()
 }
 
 #[cfg(test)]
@@ -26,12 +39,12 @@ mod tests {
     #[test]
     fn test_encode_uuid() {
         let uuid = Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap();
-        assert_eq!(encode_uuid(uuid), "");
+        assert_eq!(encode_uuid(uuid), "00000000000000000000000000");
 
         let uuid = Uuid::parse_str("ffffffff-ffff-ffff-ffff-ffffffffffff").unwrap();
-        assert_eq!(encode_uuid(uuid), "f5lxx1zz5pnorynqglhzmsp33");
+        assert_eq!(encode_uuid(uuid), "33psmzhlgqnyronp5zz1xxl5f0");
 
         let uuid = Uuid::parse_str("12345678-1234-5678-1234-567812345678").unwrap();
-        assert_eq!(encode_uuid(uuid), "12srddy53kndus0lmbgjgy7i0");
+        assert_eq!(encode_uuid(uuid), "0i7ygjgbml0sudnk35yddrs210");
     }
 }

lib/bencher_context/src/client/platform/mod.rs

@@ -2,14 +2,15 @@ use std::fmt;
 
 use uuid::Uuid;
 
+mod base36;
 mod target_os;
 
 #[derive(Debug, Clone, Copy)]
 pub struct Fingerprint(Uuid);
 
 impl fmt::Display for Fingerprint {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
+        write!(f, "{}", base36::encode_uuid(self.0))
     }
 }
 

lib/bencher_context/src/client/platform/target_os/windows.rs

@@ -57,7 +57,7 @@ fn digital_product_id() -> Option<Uuid> {
     let digital_product_id = data
         .into_iter()
         .take(data_size as usize)
-        .fold(0u128, |acc, byte| acc.overflowing_add(byte.into()).0);
+        .fold(0u128, |acc, byte| (acc << 8) | u128::from(byte));
     Some(Uuid::from_u128(digital_product_id))
 }
 

lib/bencher_context/src/server/mod.rs

@@ -1,10 +1,7 @@
 use bencher_valid::{ResourceName, Slug};
-use uuid::Uuid;
 
 use crate::{ContextPath, RunContext};
 
-mod base36;
-
 #[allow(clippy::multiple_inherent_impl)]
 impl RunContext {
     fn get(&self, path: &str) -> Option<&String> {
@@ -36,8 +33,9 @@ impl RunContext {
         self.get(ContextPath::TESTBED_OS).map(String::as_str)
     }
 
-    pub fn testbed_fingerprint(&self) -> Option<Uuid> {
-        self.get(ContextPath::TESTBED_FINGERPRINT)?.parse().ok()
+    pub fn testbed_fingerprint(&self) -> Option<&str> {
+        self.get(ContextPath::TESTBED_FINGERPRINT)
+            .map(String::as_str)
     }
 
     pub fn name(&self) -> Option<ResourceName> {
@@ -52,8 +50,6 @@ impl RunContext {
         let hash = self.repo_hash().map(short_hash).unwrap_or_default();
         let fingerprint = self
             .testbed_fingerprint()
-            .map(base36::encode_uuid)
-            .as_deref()
             .map(short_fingerprint)
             .unwrap_or_default();
         // The spaces here are important,

lib/bencher_valid/src/lib.rs

@@ -27,9 +27,7 @@ mod url;
 mod user_name;
 
 pub use crate::git_hash::GitHash;
-pub use crate::slug::Slug;
-#[cfg(feature = "server")]
-pub use crate::slug::BASE_36;
+pub use crate::slug::{Slug, BASE_36};
 pub use crate::url::Url;
 pub use benchmark_name::BenchmarkName;
 pub use branch_name::BranchName;

lib/bencher_valid/src/slug.rs

@@ -12,7 +12,6 @@ use serde::{
 
 use crate::{is_valid_len, ValidError, MAX_LEN};
 
-#[cfg(feature = "server")]
 pub const BASE_36: &str = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 #[typeshare::typeshare]