Panic when creating signer entry without principals

SRv6d · Jan 7, 2025 · fa2f0fa · fa2f0fa
1 parent bad7d77
commit fa2f0fa
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 35 deletions.
diff --git a/benches/write_allowed_signers.rs b/benches/write_allowed_signers.rs
@@ -9,31 +9,31 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             .into_temp_path()
             .to_path_buf(),
         vec![
-        Entry {
-            principals: vec!["[email protected]".to_string()],
-            valid_after: None,
-            valid_before: None,
-            key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGtQUDZWhs8k/cZcykMkaoX7ZE7DXld8TP79HyddMVTS"
-                .parse()
-                .unwrap(),
-        },
-        Entry {
-            principals: vec!["[email protected]".to_string()],
-            valid_after: Some(Local.with_ymd_and_hms(2024, 4, 11, 22, 00, 00).unwrap()),
-            valid_before: None,
-            key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWtK6WxXw7NVhbn6fTQ0dECF8y98fahSIsqKMh+sSo9"
-                .parse()
-                .unwrap(),
-        },
-        Entry {
-            principals: vec!["[email protected]".to_string()],
-            valid_after: None,
-            valid_before: Some(Local.with_ymd_and_hms(2030, 1, 1, 0, 0, 0).unwrap()),
-            key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHDGMF+tZQL3dcr1arPst+YP8v33Is0kAJVvyTKrxMw"
-                .parse()
-                .unwrap(),
-        },
-    ],
+            Entry::new(
+                vec!["[email protected]".to_string()],
+                None,
+                None,
+                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGtQUDZWhs8k/cZcykMkaoX7ZE7DXld8TP79HyddMVTS"
+                    .parse()
+                    .unwrap(),
+            ),
+            Entry::new(
+                vec!["[email protected]".to_string()],
+                Some(Local.with_ymd_and_hms(2024, 4, 11, 22, 00, 00).unwrap()),
+                None,
+                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWtK6WxXw7NVhbn6fTQ0dECF8y98fahSIsqKMh+sSo9"
+                    .parse()
+                    .unwrap(),
+            ),
+            Entry::new(
+                vec!["[email protected]".to_string()],
+                None,
+                Some(Local.with_ymd_and_hms(2030, 1, 1, 0, 0, 0).unwrap()),
+                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHDGMF+tZQL3dcr1arPst+YP8v33Is0kAJVvyTKrxMw"
+                    .parse()
+                    .unwrap(),
+            ),
+        ],
     );
 
     c.bench_function("write the signers file", |b| {

diff --git a/src/allowed_signers/file.rs b/src/allowed_signers/file.rs
@@ -59,10 +59,35 @@ impl File {
 /// An entry in the allowed signers file.
 #[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct Entry {
-    pub principals: Vec<String>,
-    pub valid_after: Option<DateTime<Local>>,
-    pub valid_before: Option<DateTime<Local>>,
-    pub key: PublicKey,
+    principals: Vec<String>,
+    valid_after: Option<DateTime<Local>>,
+    valid_before: Option<DateTime<Local>>,
+    key: PublicKey,
+}
+
+impl Entry {
+    #[must_use]
+    /// Create a new signer entry.
+    ///
+    /// # Panics
+    /// If the provided principals are empty.
+    pub fn new(
+        principals: Vec<String>,
+        valid_after: Option<DateTime<Local>>,
+        valid_before: Option<DateTime<Local>>,
+        key: PublicKey,
+    ) -> Self {
+        assert!(
+            !principals.is_empty(),
+            "signer entry requires at least one principal"
+        );
+        Entry {
+            principals,
+            valid_after,
+            valid_before,
+            key,
+        }
+    }
 }
 
 impl fmt::Display for Entry {
@@ -189,6 +214,12 @@ mod tests {
         )
     }
 
+    #[test]
+    #[should_panic(expected = "signer entry requires at least one principal")]
+    fn new_entry_without_principal_panics() {
+        let _ = Entry::new(vec![], None, None, entry_jsnow().key);
+    }
+
     #[rstest]
     #[case(
         entry_jsnow(),

diff --git a/src/allowed_signers/signer.rs b/src/allowed_signers/signer.rs
@@ -66,12 +66,7 @@ impl Signer {
 
         Ok(keys
             .into_iter()
-            .map(|key| Entry {
-                principals: self.principals.clone(),
-                valid_after: None,
-                valid_before: None,
-                key,
-            })
+            .map(|key| Entry::new(self.principals.clone(), None, None, key))
             .collect())
     }
 }