Add filtering for ansible managed line

svsticky · Sep 10, 2024 · 8f49446 · 8f49446
1 parent 85fa1f0
commit 8f49446
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/server/src/file/mod.rs b/server/src/file/mod.rs
@@ -37,10 +37,16 @@ pub trait DataFile: Default + Serialize + DeserializeOwned {
         }
 
         let mut f = fs::File::open(from).await?;
-        let mut buf = Vec::new();
-        f.read_to_end(&mut buf).await?;
+        let mut buf = String::new();
+        f.read_to_string(&mut buf).await?;
 
-        Ok(serde_json::from_slice(&buf)?)
+        // Remove comments, e.g. 'Ansible Managed'
+        let buf = buf
+            .lines()
+            .filter(|v| !v.starts_with("#"))
+            .collect::<String>();
+
+        Ok(serde_json::from_str(&buf)?)
     }
 
     async fn try_write_new<P: AsRef<Path>>(to: P) -> Result<(), DataFileError> {

diff --git a/server/src/server/types/authorization.rs b/server/src/server/types/authorization.rs
@@ -41,11 +41,9 @@ impl<const ADMIN: bool> FromRequest for Authorization<ADMIN> {
                     return if Self::ADMIN {
                         Err(AuthorizationError::NoToken)
                     } else {
-                        Ok(Self {
-                            is_admin: false,
-                        })
+                        Ok(Self { is_admin: false })
                     }
-                },
+                }
             };
 
             let config: &WConfig = req.app_data().unwrap();
@@ -65,20 +63,16 @@ impl<const ADMIN: bool> FromRequest for Authorization<ADMIN> {
                             if Self::ADMIN {
                                 Err(AuthorizationError::NoToken)
                             } else {
-                                Ok(Self {
-                                    is_admin: false,
-                                })
+                                Ok(Self { is_admin: false })
                             }
-                        },
+                        }
                         _ => {
                             if Self::ADMIN {
                                 Err(AuthorizationError::Koala)
                             } else {
-                                Ok(Self {
-                                    is_admin: false,
-                                })
+                                Ok(Self { is_admin: false })
                             }
-                        },
+                        }
                     }
                 }
             };