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

disco: Remove errors for out-of-order elements, allowed in XEP-0030 2.5rc3.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-11-02 16:27:51 +01:00
commit e2c0068af9
1 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/disco.rs
View file

@ -126,26 +126,15 @@ impl TryFrom<Element> for DiscoInfoResult {
features: vec!(), features: vec!(),
extensions: vec!(), extensions: vec!(),
}; };
let mut parsing_identities_done = false;
let mut parsing_features_done = false;
for child in elem.children() { for child in elem.children() {
if child.is("identity", ns::DISCO_INFO) { if child.is("identity", ns::DISCO_INFO) {
if parsing_identities_done {
return Err(Error::ParseError("Identity found after features or data forms in disco#info."));
}
let identity = Identity::try_from(child.clone())?; let identity = Identity::try_from(child.clone())?;
result.identities.push(identity); result.identities.push(identity);
} else if child.is("feature", ns::DISCO_INFO) { } else if child.is("feature", ns::DISCO_INFO) {
parsing_identities_done = true;
if parsing_features_done {
return Err(Error::ParseError("Feature found after data forms in disco#info."));
}
let feature = Feature::try_from(child.clone())?; let feature = Feature::try_from(child.clone())?;
result.features.push(feature); result.features.push(feature);
} else if child.is("x", ns::DATA_FORMS) { } else if child.is("x", ns::DATA_FORMS) {
parsing_identities_done = true;
parsing_features_done = true;
let data_form = DataForm::try_from(child.clone())?; let data_form = DataForm::try_from(child.clone())?;
if data_form.type_ != DataFormType::Result_ { if data_form.type_ != DataFormType::Result_ {
return Err(Error::ParseError("Data form must have a 'result' type in disco#info.")); return Err(Error::ParseError("Data form must have a 'result' type in disco#info."));
@ -271,6 +260,24 @@ mod tests {
assert!(query.extensions.is_empty()); assert!(query.extensions.is_empty());
} }
#[test]
fn test_identity_after_feature() {
let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><feature var='http://jabber.org/protocol/disco#info'/><identity category='client' type='pc'/></query>".parse().unwrap();
let query = DiscoInfoResult::try_from(elem).unwrap();
assert_eq!(query.identities.len(), 1);
assert_eq!(query.features.len(), 1);
assert!(query.extensions.is_empty());
}
#[test]
fn test_feature_after_dataform() {
let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>coucou</value></field></x><feature var='http://jabber.org/protocol/disco#info'/></query>".parse().unwrap();
let query = DiscoInfoResult::try_from(elem).unwrap();
assert_eq!(query.identities.len(), 1);
assert_eq!(query.features.len(), 1);
assert_eq!(query.extensions.len(), 1);
}
#[test] #[test]
fn test_extension() { fn test_extension() {
let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc'/><feature var='http://jabber.org/protocol/disco#info'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>example</value></field></x></query>".parse().unwrap(); let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc'/><feature var='http://jabber.org/protocol/disco#info'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>example</value></field></x></query>".parse().unwrap();
@ -368,22 +375,6 @@ mod tests {
_ => panic!(), _ => panic!(),
}; };
assert_eq!(message, "disco#info feature not present in disco#info."); assert_eq!(message, "disco#info feature not present in disco#info.");
let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><feature var='http://jabber.org/protocol/disco#info'/><identity category='client' type='pc'/></query>".parse().unwrap();
let error = DiscoInfoResult::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
_ => panic!(),
};
assert_eq!(message, "Identity found after features or data forms in disco#info.");
let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>coucou</value></field></x><feature var='http://jabber.org/protocol/disco#info'/></query>".parse().unwrap();
let error = DiscoInfoResult::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
_ => panic!(),
};
assert_eq!(message, "Feature found after data forms in disco#info.");
} }
#[test] #[test]