xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix clippy lints for sasl crate

Browse source
This commit is contained in:
Lucas Kent 2024-05-06 08:01:54 +10:00 • committed by pep
commit 1449d300dd
8 changed files with 37 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sasl/src/server/mechanisms/anonymous.rs
View file

@ -6,6 +6,7 @@ use getrandom::getrandom;
pub struct Anonymous;
impl Anonymous {
#[allow(clippy::new_without_default)]
pub fn new() -> Anonymous {
Anonymous
}

12
sasl/src/server/mechanisms/plain.rs
View file

@ -8,9 +8,7 @@ pub struct Plain<V: Validator<secret::Plain>> {
impl<V: Validator<secret::Plain>> Plain<V> {
pub fn new(validator: V) -> Plain<V> {
Plain {
validator: validator,
}
Plain { validator }
}
}
@ -22,14 +20,10 @@ impl<V: Validator<secret::Plain>> Mechanism for Plain<V> {
fn respond(&mut self, payload: &[u8]) -> Result<Response, MechanismError> {
let mut sp = payload.split(|&b| b == 0);
sp.next();
let username = sp
.next()
.ok_or_else(|| MechanismError::NoUsernameSpecified)?;
let username = sp.next().ok_or(MechanismError::NoUsernameSpecified)?;
let username = String::from_utf8(username.to_vec())
.map_err(|_| MechanismError::ErrorDecodingUsername)?;
let password = sp
.next()
.ok_or_else(|| MechanismError::NoPasswordSpecified)?;
let password = sp.next().ok_or(MechanismError::NoPasswordSpecified)?;
let password = String::from_utf8(password.to_vec())
.map_err(|_| MechanismError::ErrorDecodingPassword)?;
let ident = Identity::Username(username);

22
sasl/src/server/mechanisms/scram.rs
View file

@ -44,8 +44,8 @@ where
Scram {
name: format!("SCRAM-{}", S::name()),
state: ScramState::Init,
channel_binding: channel_binding,
provider: provider,
channel_binding,
provider,
_marker: PhantomData,
}
}
@ -108,9 +108,9 @@ where
}
let frame =
parse_frame(&rest).map_err(|_| MechanismError::CannotDecodeInitialMessage)?;
let username = frame.get("n").ok_or_else(|| MechanismError::NoUsername)?;
let username = frame.get("n").ok_or(MechanismError::NoUsername)?;
let identity = Identity::Username(username.to_owned());
let client_nonce = frame.get("r").ok_or_else(|| MechanismError::NoNonce)?;
let client_nonce = frame.get("r").ok_or(MechanismError::NoNonce)?;
let mut server_nonce = String::new();
server_nonce += client_nonce;
server_nonce +=
@ -125,12 +125,12 @@ where
buf.extend(pbkdf2.iterations().to_string().bytes());
ret = Response::Proceed(buf.clone());
next_state = ScramState::SentChallenge {
server_nonce: server_nonce,
identity: identity,
server_nonce,
identity,
salted_password: pbkdf2.digest().to_vec(),
initial_client_message: rest,
initial_server_message: buf,
gs2_header: gs2_header,
gs2_header,
};
}
ScramState::SentChallenge {
@ -151,8 +151,8 @@ where
client_final_message_bare.extend(Base64.encode(&cb_data).bytes());
client_final_message_bare.extend(b",r=");
client_final_message_bare.extend(server_nonce.bytes());
let client_key = S::hmac(b"Client Key", &salted_password)?;
let server_key = S::hmac(b"Server Key", &salted_password)?;
let client_key = S::hmac(b"Client Key", salted_password)?;
let server_key = S::hmac(b"Server Key", salted_password)?;
let mut auth_message = Vec::new();
auth_message.extend(initial_client_message);
auth_message.extend(b",");
@ -162,7 +162,7 @@ where
let stored_key = S::hash(&client_key);
let client_signature = S::hmac(&auth_message, &stored_key)?;
let client_proof = xor(&client_key, &client_signature);
let sent_proof = frame.get("p").ok_or_else(|| MechanismError::NoProof)?;
let sent_proof = frame.get("p").ok_or(MechanismError::NoProof)?;
let sent_proof = Base64
.decode(sent_proof)
.map_err(|_| MechanismError::CannotDecodeProof)?;
@ -172,7 +172,7 @@ where
let server_signature = S::hmac(&auth_message, &server_key)?;
let mut buf = Vec::new();
buf.extend(b"v=");
buf.extend(Base64.encode(&server_signature).bytes());
buf.extend(Base64.encode(server_signature).bytes());
ret = Response::Success(identity.clone(), buf);
next_state = ScramState::Done;
}