tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: fix needless borrows

Browse Source 
found and fixed via clippy

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2021-12-30 12:57:37 +01:00
parent a0c69902c8
commit 9a37bd6c84
104 changed files with 238 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pbs-tools/src/cert.rs
View File

@ -46,7 +46,7 @@ impl CertInfo {
}
pub fn from_pem(cert_pem: &[u8]) -> Result<Self, Error> {
let x509 = openssl::x509::X509::from_pem(&cert_pem)?;
let x509 = openssl::x509::X509::from_pem(cert_pem)?;
Ok(Self{
x509
})
@ -87,11 +87,11 @@ impl CertInfo {
}
pub fn not_before_unix(&self) -> Result<i64, Error> {
asn1_time_to_unix(&self.not_before())
asn1_time_to_unix(self.not_before())
}
pub fn not_after_unix(&self) -> Result<i64, Error> {
asn1_time_to_unix(&self.not_after())
asn1_time_to_unix(self.not_after())
}
/// Check if the certificate is expired at or after a specific unix epoch.

8
pbs-tools/src/json.rs
View File

@ -64,7 +64,7 @@ pub fn json_object_to_query(data: Value) -> Result<String, Error> {
query.append_pair(key, &n.to_string());
}
Value::String(s) => {
query.append_pair(key, &s);
query.append_pair(key, s);
}
Value::Array(arr) => {
for element in arr {
@ -76,7 +76,7 @@ pub fn json_object_to_query(data: Value) -> Result<String, Error> {
query.append_pair(key, &n.to_string());
}
Value::String(s) => {
query.append_pair(key, &s);
query.append_pair(key, s);
}
_ => bail!(
"json_object_to_query: unable to handle complex array data types."
@ -121,14 +121,14 @@ pub fn required_integer_property(param: &Value, name: &str) -> Result<i64, Error
pub fn required_array_param<'a>(param: &'a Value, name: &str) -> Result<&'a [Value], Error> {
match param[name].as_array() {
Some(s) => Ok(&s),
Some(s) => Ok(s),
None => bail!("missing parameter '{}'", name),
}
}
pub fn required_array_property<'a>(param: &'a Value, name: &str) -> Result<&'a [Value], Error> {
match param[name].as_array() {
Some(s) => Ok(&s),
Some(s) => Ok(s),
None => bail!("missing property '{}'", name),
}
}

12
pbs-tools/src/ticket.rs
View File

@ -97,8 +97,8 @@ where
write!(
f,
"{}:{}:{:08X}",
percent_encode(self.prefix.as_bytes(), &TICKET_ASCIISET),
percent_encode(self.data.as_bytes(), &TICKET_ASCIISET),
percent_encode(self.prefix.as_bytes(), TICKET_ASCIISET),
percent_encode(self.data.as_bytes(), TICKET_ASCIISET),
self.time,
)
.map_err(Error::from)
@ -107,7 +107,7 @@ where
/// Write additional authentication data to the verifier.
fn write_aad(f: &mut dyn io::Write, aad: Option<&str>) -> Result<(), Error> {
if let Some(aad) = aad {
write!(f, ":{}", percent_encode(aad.as_bytes(), &TICKET_ASCIISET))?;
write!(f, ":{}", percent_encode(aad.as_bytes(), TICKET_ASCIISET))?;
}
Ok(())
}
@ -122,7 +122,7 @@ where
/// Sign the ticket.
pub fn sign(&mut self, keypair: &PKey<Private>, aad: Option<&str>) -> Result<String, Error> {
let mut output = Vec::<u8>::new();
let mut signer = Signer::new(MessageDigest::sha256(), &keypair)
let mut signer = Signer::new(MessageDigest::sha256(), keypair)
.map_err(|err| format_err!("openssl error creating signer for ticket: {}", err))?;
self.write_data(&mut output)
@ -179,14 +179,14 @@ where
bail!("invalid ticket - expired");
}
let mut verifier = Verifier::new(MessageDigest::sha256(), &keypair)?;
let mut verifier = Verifier::new(MessageDigest::sha256(), keypair)?;
self.write_data(&mut verifier)
.and_then(|()| Self::write_aad(&mut verifier, aad))
.map_err(|err| format_err!("error verifying ticket: {}", err))?;
let is_valid: bool = verifier
.verify(&signature)
.verify(signature)
.map_err(|err| format_err!("openssl error verifying ticket: {}", err))?;
if !is_valid {