pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iq: Wire up stanza_error.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-01 01:23:56 +01:00
parent 42abbe2927
commit f3b55350ad
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/iq.rs
View file

@ -14,6 +14,7 @@ use error::Error;
use ns; use ns;
use stanza_error;
use disco; use disco;
use ibb; use ibb;
use jingle; use jingle;
@ -39,7 +40,7 @@ pub enum IqType {
Get(IqPayloadType), Get(IqPayloadType),
Set(IqPayloadType), Set(IqPayloadType),
Result(Option<IqPayloadType>), Result(Option<IqPayloadType>),
Error(IqPayloadType), Error(stanza_error::StanzaError),
} }
impl IntoAttributeValue for IqType { impl IntoAttributeValue for IqType {
@ -77,13 +78,17 @@ pub fn parse_iq(root: &Element) -> Result<Iq, Error> {
}; };
let mut payload = None; let mut payload = None;
let mut error_payload = None;
for elem in root.children() { for elem in root.children() {
if payload.is_some() { if payload.is_some() {
return Err(Error::ParseError("Wrong number of children in iq element.")); return Err(Error::ParseError("Wrong number of children in iq element."));
} }
if type_ == "error" { if type_ == "error" {
if elem.is("error", ns::JABBER_CLIENT) { if elem.is("error", ns::JABBER_CLIENT) {
payload = Some(IqPayloadType::XML(elem.clone())); if error_payload.is_some() {
return Err(Error::ParseError("Wrong number of children in iq element."));
}
error_payload = Some(stanza_error::parse_stanza_error(elem)?);
} else if root.children().collect::<Vec<_>>().len() != 2 { } else if root.children().collect::<Vec<_>>().len() != 2 {
return Err(Error::ParseError("Wrong number of children in iq element.")); return Err(Error::ParseError("Wrong number of children in iq element."));
} }
@ -126,7 +131,7 @@ pub fn parse_iq(root: &Element) -> Result<Iq, Error> {
IqType::Result(None) IqType::Result(None)
} }
} else if type_ == "error" { } else if type_ == "error" {
if let Some(payload) = payload.clone() { if let Some(payload) = error_payload.clone() {
IqType::Error(payload.clone()) IqType::Error(payload.clone())
} else { } else {
return Err(Error::ParseError("Wrong number of children in iq element.")); return Err(Error::ParseError("Wrong number of children in iq element."));
@ -163,13 +168,12 @@ pub fn serialise(iq: &Iq) -> Element {
let elem = match iq.payload.clone() { let elem = match iq.payload.clone() {
IqType::Get(IqPayloadType::XML(elem)) IqType::Get(IqPayloadType::XML(elem))
| IqType::Set(IqPayloadType::XML(elem)) | IqType::Set(IqPayloadType::XML(elem))
| IqType::Result(Some(IqPayloadType::XML(elem))) | IqType::Result(Some(IqPayloadType::XML(elem))) => elem,
| IqType::Error(IqPayloadType::XML(elem)) => elem, IqType::Error(error) => stanza_error::serialise(&error),
IqType::Get(IqPayloadType::Parsed(payload)) IqType::Get(IqPayloadType::Parsed(payload))
| IqType::Set(IqPayloadType::Parsed(payload)) | IqType::Set(IqPayloadType::Parsed(payload))
| IqType::Result(Some(IqPayloadType::Parsed(payload))) => serialise_payload(&payload), | IqType::Result(Some(IqPayloadType::Parsed(payload))) => serialise_payload(&payload),
IqType::Result(None) => return stanza, IqType::Result(None) => return stanza,
_ => panic!(),
}; };
stanza.append_child(elem); stanza.append_child(elem);
stanza stanza
@ -180,6 +184,7 @@ mod tests {
use minidom::Element; use minidom::Element;
use error::Error; use error::Error;
use iq; use iq;
use stanza_error;
use disco; use disco;
#[test] #[test]
@ -269,10 +274,16 @@ mod tests {
assert_eq!(iq.from, None); assert_eq!(iq.from, None);
assert_eq!(iq.to, None); assert_eq!(iq.to, None);
assert_eq!(iq.id, None); assert_eq!(iq.id, None);
assert!(match iq.payload { match iq.payload {
iq::IqType::Error(iq::IqPayloadType::XML(element)) => element == error, iq::IqType::Error(element) => {
_ => false, assert_eq!(element.type_, stanza_error::ErrorType::Cancel);
}); assert_eq!(element.by, None);
assert_eq!(element.defined_condition, stanza_error::DefinedCondition::ServiceUnavailable);
assert_eq!(element.texts.len(), 0);
assert_eq!(element.other, None);
},
_ => panic!(),
}
} }
#[test] #[test]