style: format

Signed-off-by: Alan Wandke <[email protected]>

Author: awandke

.gitlab-ci.yml

@@ -1,3 +1,4 @@
+---
 # You can override the included template(s) by including variable overrides
 # SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
 # Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings

.mega-linter.yml

@@ -1,3 +1,4 @@
+---
 # Configuration file for MegaLinter
 # See all available variables at https://oxsecurity.github.io/megalinter/configuration/
 # and in linters documentation

bpf/build.rs

@@ -127,7 +127,7 @@ fn generate_header_bindings(hdr_file: &Path, out_path: &Path) -> Result<PathBuf>
     let mut out_file = out_path.join(
         hdr_file
             .file_stem()
-            .context(format!("Header path has no stem: {:?}", hdr_file))?,
+            .context(format!("Header path has no stem: {hdr_file:?}"))?,
     );
     out_file.set_extension("rs");
     let hdr_file_str = hdr_file.to_string_lossy();

bpf/src/logging/mod.rs

@@ -212,7 +212,7 @@ pub fn log_header(data: &[u8]) -> Option<&log_hdr> {
     } else {
         log(
             LogLevel::LOG_LEVEL_ERROR,
-            format!("(unable to parse log header) {:?}", data),
+            format!("(unable to parse log header) {data:?}"),
         );
         None
     }
@@ -242,7 +242,7 @@ impl std::fmt::Display for generic_msg_log {
     /// Formats a log from the sb_umount BPF program
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let msg = char_array_to_str(&self.msg);
-        write!(f, "{}", msg)
+        write!(f, "{msg}")
     }
 }
 
@@ -306,6 +306,6 @@ impl std::fmt::Display for ptrace_access_check_log {
 impl std::fmt::Display for inode_access_log {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let name = char_array_to_str(&self.name);
-        write!(f, "access to {}", name)
+        write!(f, "access to {name}")
     }
 }

docs/mkdocs.yml

@@ -1,3 +1,4 @@
+---
 site_name: eBPF Security
 site_url: !ENV [SITE_URL]
 repo_name: !ENV [REPO_NAME]

docs/tools/seabee-autocast-demo.yaml

@@ -1,3 +1,4 @@
+---
 settings:
   width: 80
   height: 24

seabee/src/policy/runtime_update.rs

@@ -137,7 +137,7 @@ impl super::SeaBeePolicy {
             return Err(anyhow!("Policy update succeeded, but error occurred while updating files on disk.\nChanges will not persist after reboot. Issuing another successful policy update would resolve the issue.\n{e}"));
         }
 
-        Ok(format!("Success!\n{}", new_policy))
+        Ok(format!("Success!\n{new_policy}"))
     }
 
     /// add a new policy to SeaBee and to the kernel, but does not save to disk

seabee/src/seabeectl_lib.rs

@@ -140,15 +140,15 @@ impl std::fmt::Display for SocketCommand {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             SocketCommand::List => write!(f, "List"),
-            SocketCommand::Show(ident) => write!(f, "Show: {}", ident),
+            SocketCommand::Show(ident) => write!(f, "Show: {ident}"),
             SocketCommand::Update(update_info) => {
                 write!(f, "Update: {}", update_info.target_path.display())
             }
             SocketCommand::Remove(remove_info) => {
                 write!(f, "Remove: {}", remove_info.target_path.display())
             }
             SocketCommand::ListKeys => write!(f, "Keylist"),
-            SocketCommand::ShowKey(ident) => write!(f, "Show Key: {}", ident),
+            SocketCommand::ShowKey(ident) => write!(f, "Show Key: {ident}"),
             SocketCommand::AddKey(key_info) => {
                 write!(f, "Add Key: {}", key_info.target_path.display())
             }
@@ -171,7 +171,7 @@ pub enum KeyIdentifier {
 impl std::fmt::Display for KeyIdentifier {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            KeyIdentifier::Id { id } => write!(f, "Id: {}", id),
+            KeyIdentifier::Id { id } => write!(f, "Id: {id}"),
             KeyIdentifier::File { path } => write!(f, "File: {}", path.display()),
         }
     }
@@ -198,8 +198,8 @@ impl Default for ObjIdentifier {
 impl std::fmt::Display for ObjIdentifier {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ObjIdentifier::Id { id } => write!(f, "Id: {}", id),
-            ObjIdentifier::Name { name } => write!(f, "Name: {}", name),
+            ObjIdentifier::Id { id } => write!(f, "Id: {id}"),
+            ObjIdentifier::Name { name } => write!(f, "Name: {name}"),
             ObjIdentifier::File { path } => write!(f, "File: {}", path.display()),
         }
     }
@@ -230,7 +230,7 @@ pub fn execute_socket_command(command: SocketCommand) -> Result<()> {
     if response.contains("Error executing command:") {
         return Err(anyhow!("{}", response));
     }
-    println!("{}", response);
+    println!("{response}");
 
     Ok(())
 }
@@ -245,7 +245,7 @@ pub fn execute_local_command(cmd: LocalCommand) -> Result<()> {
         LocalCommand::Config(subcmd) => seabeectl_config(subcmd)?,
     };
 
-    println!("{}", output);
+    println!("{output}");
     Ok(())
 }
 

tests/configs/sample_config.yaml

@@ -1,3 +1,4 @@
+---
 # This is the default config file
 # This configuration is our secure configuration for production use.
 # This configuration file will include a default setting for every configuraiton option.

tests/configs/unverified_policy.yaml

@@ -1 +1,2 @@
+---
 verify_policy: false