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

xmpp-parsers: Convert component to xso

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2024-07-24 17:35:56 +02:00 • committed by Maxime “pep” Buquet
commit 4be297de11
1 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

58
parsers/src/component.rs
View file

@ -4,24 +4,25 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
use crate::util::text_node_codecs::{Codec, OptionalCodec, Text}; use xso::{text::FixedHex, AsXml, FromXml};
use crate::ns;
use digest::Digest; use digest::Digest;
use sha1::Sha1; use sha1::Sha1;
generate_element!( /// The main authentication mechanism for components.
/// The main authentication mechanism for components. #[derive(FromXml, AsXml, PartialEq, Debug, Clone, Default)]
#[derive(Default)] #[xml(namespace = ns::COMPONENT, name = "handshake")]
Handshake, "handshake", COMPONENT, pub struct Handshake {
text: ( /// If Some, contains the hex-encoded SHA-1 of the concatenation of the
/// If Some, contains the hex-encoded SHA-1 of the concatenation of the /// stream id and the password, and is used to authenticate against the
/// stream id and the password, and is used to authenticate against the /// server.
/// server. ///
/// /// If None, it is the successful reply from the server, the stream is now
/// If None, it is the successful reply from the server, the stream is now /// fully established and both sides can now exchange stanzas.
/// fully established and both sides can now exchange stanzas. #[xml(text(codec = FixedHex<20>))]
data: OptionalCodec<Text> pub data: Option<[u8; 20]>,
) }
);
impl Handshake { impl Handshake {
/// Creates a successful reply from a server. /// Creates a successful reply from a server.
@ -33,9 +34,8 @@ impl Handshake {
pub fn from_password_and_stream_id(password: &str, stream_id: &str) -> Handshake { pub fn from_password_and_stream_id(password: &str, stream_id: &str) -> Handshake {
let input = String::from(stream_id) + password; let input = String::from(stream_id) + password;
let hash = Sha1::digest(input.as_bytes()); let hash = Sha1::digest(input.as_bytes());
let content = format!("{:x}", hash);
Handshake { Handshake {
data: Some(content), data: Some(hash.into()),
} }
} }
} }
@ -45,16 +45,9 @@ mod tests {
use super::*; use super::*;
use minidom::Element; use minidom::Element;
#[cfg(target_pointer_width = "32")]
#[test] #[test]
fn test_size() { fn test_size() {
assert_size!(Handshake, 12); assert_size!(Handshake, 21);
}
#[cfg(target_pointer_width = "64")]
#[test]
fn test_size() {
assert_size!(Handshake, 24);
} }
#[test] #[test]
@ -65,11 +58,17 @@ mod tests {
let handshake = Handshake::try_from(elem).unwrap(); let handshake = Handshake::try_from(elem).unwrap();
assert_eq!(handshake.data, None); assert_eq!(handshake.data, None);
let elem: Element = "<handshake xmlns='jabber:component:accept'>Coucou</handshake>" let elem: Element = "<handshake xmlns='jabber:component:accept'>9accec263ab84a43c6037ccf7cd48cb1d3f6df8e</handshake>"
.parse() .parse()
.unwrap(); .unwrap();
let handshake = Handshake::try_from(elem).unwrap(); let handshake = Handshake::try_from(elem).unwrap();
assert_eq!(handshake.data, Some(String::from("Coucou"))); assert_eq!(
handshake.data,
Some([
0x9a, 0xcc, 0xec, 0x26, 0x3a, 0xb8, 0x4a, 0x43, 0xc6, 0x03, 0x7c, 0xcf, 0x7c, 0xd4,
0x8c, 0xb1, 0xd3, 0xf6, 0xdf, 0x8e
])
);
} }
#[test] #[test]
@ -80,7 +79,10 @@ mod tests {
let handshake = Handshake::from_password_and_stream_id("123456", "sid"); let handshake = Handshake::from_password_and_stream_id("123456", "sid");
assert_eq!( assert_eq!(
handshake.data, handshake.data,
Some(String::from("9accec263ab84a43c6037ccf7cd48cb1d3f6df8e")) Some([
0x9a, 0xcc, 0xec, 0x26, 0x3a, 0xb8, 0x4a, 0x43, 0xc6, 0x03, 0x7c, 0xcf, 0x7c, 0xd4,
0x8c, 0xb1, 0xd3, 0xf6, 0xdf, 0x8e
])
); );
} }
} }