aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-05-11 09:33:03 +0000
committerAlex <alex@adnab.me>2023-05-11 09:33:03 +0000
commit375270afd19a8ce2aa3ff99bd0fc3ccab638c223 (patch)
tree362189dcfde317ef4dd0613ab621684469c17168 /src/util
parentb925f53dc3b0bae77aa3f73e581faace2eb3b21a (diff)
parentc783194e8b8c3263fad579a85ea07d62e63b16be (diff)
downloadgarage-375270afd19a8ce2aa3ff99bd0fc3ccab638c223.tar.gz
garage-375270afd19a8ce2aa3ff99bd0fc3ccab638c223.zip
Merge pull request '*: apply clippy recommendations.' (#570) from jpds/garage:clippy-fixes into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/570
Diffstat (limited to 'src/util')
-rw-r--r--src/util/config.rs2
-rw-r--r--src/util/forwarded_headers.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/util/config.rs b/src/util/config.rs
index 2176353e..95835bbb 100644
--- a/src/util/config.rs
+++ b/src/util/config.rs
@@ -223,7 +223,7 @@ fn secret_from_file(
#[cfg(unix)]
if std::env::var("GARAGE_ALLOW_WORLD_READABLE_SECRETS").as_deref() != Ok("true") {
use std::os::unix::fs::MetadataExt;
- let metadata = std::fs::metadata(&file_path)?;
+ let metadata = std::fs::metadata(file_path)?;
if metadata.mode() & 0o077 != 0 {
return Err(format!("File {} is world-readable! (mode: 0{:o}, expected 0600)\nRefusing to start until this is fixed, or environment variable GARAGE_ALLOW_WORLD_READABLE_SECRETS is set to true.", file_path, metadata.mode()).into());
}
diff --git a/src/util/forwarded_headers.rs b/src/util/forwarded_headers.rs
index 6ae275aa..12f76434 100644
--- a/src/util/forwarded_headers.rs
+++ b/src/util/forwarded_headers.rs
@@ -13,7 +13,7 @@ pub fn handle_forwarded_for_headers(headers: &HeaderMap<HeaderValue>) -> Result<
.to_str()
.ok_or_message("Error parsing X-Forwarded-For header")?;
- let client_ip = IpAddr::from_str(&forwarded_for_ip_str)
+ let client_ip = IpAddr::from_str(forwarded_for_ip_str)
.ok_or_message("Valid IP address not found in X-Forwarded-For header")?;
Ok(client_ip.to_string())