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

sasl: Improve frame parsing

Browse source 
All keys only have a single char, so avoid allocating a whole String for
them.  Also move to a BTreeMap as this is more efficient on such keys.
This commit is contained in:
Emmanuel Gil Peyrot 2024-09-25 21:53:50 +02:00
commit 0267383803
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sasl/src/client/mechanisms/scram.rs
View file

@ -153,9 +153,9 @@ impl<S: ScramProvider> Mechanism for Scram<S> {
} => {
let frame =
parse_frame(challenge).map_err(|_| MechanismError::CannotDecodeChallenge)?;
let server_nonce = frame.get("r");
let salt = frame.get("s").and_then(|v| Base64.decode(v).ok());
let iterations = frame.get("i").and_then(|v| v.parse().ok());
let server_nonce = frame.get(&'r');
let salt = frame.get(&'s').and_then(|v| Base64.decode(v).ok());
let iterations = frame.get(&'i').and_then(|v| v.parse().ok());
let server_nonce = server_nonce.ok_or(MechanismError::NoServerNonce)?;
let salt = salt.ok_or(MechanismError::NoServerSalt)?;
let iterations = iterations.ok_or(MechanismError::NoServerIterations)?;
@ -206,7 +206,7 @@ impl<S: ScramProvider> Mechanism for Scram<S> {
ScramState::GotServerData {
ref server_signature,
} => {
if let Some(sig) = frame.get("v").and_then(|v| Base64.decode(v).ok()) {
if let Some(sig) = frame.get(&'v').and_then(|v| Base64.decode(v).ok()) {
if sig == *server_signature {
Ok(())
} else {

10
sasl/src/common/mod.rs
View file

@ -1,4 +1,4 @@
use std::collections::HashMap;
use std::collections::BTreeMap;
use std::string::FromUtf8Error;
#[cfg(feature = "scram")]
@ -141,15 +141,17 @@ pub fn xor(a: &[u8], b: &[u8]) -> Vec<u8> {
}
#[doc(hidden)]
pub fn parse_frame(frame: &[u8]) -> Result<HashMap<String, String>, FromUtf8Error> {
pub fn parse_frame(frame: &[u8]) -> Result<BTreeMap<char, String>, FromUtf8Error> {
let inner = String::from_utf8(frame.to_owned())?;
let mut ret = HashMap::new();
let mut ret = BTreeMap::new();
for s in inner.split(',') {
let mut tmp = s.splitn(2, '=');
let key = tmp.next();
let val = tmp.next();
if let (Some(k), Some(v)) = (key, val) {
ret.insert(k.to_owned(), v.to_owned());
if let Some(k) = k.chars().next() {
ret.insert(k, v.to_owned());
}
}
}
Ok(ret)

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

@ -108,9 +108,9 @@ where
}
let frame =
parse_frame(&rest).map_err(|_| MechanismError::CannotDecodeInitialMessage)?;
let username = frame.get("n").ok_or(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(MechanismError::NoNonce)?;
let client_nonce = frame.get(&'r').ok_or(MechanismError::NoNonce)?;
let mut server_nonce = String::new();
server_nonce += client_nonce;
server_nonce +=
@ -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(MechanismError::NoProof)?;
let sent_proof = frame.get(&'p').ok_or(MechanismError::NoProof)?;
let sent_proof = Base64
.decode(sent_proof)
.map_err(|_| MechanismError::CannotDecodeProof)?;