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

stanza_error: Add missing attribute checks.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2019-02-28 02:48:50 +01:00
parent 4f64754bdc
commit fb4a3dcba8
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/stanza_error.rs
View file

@ -240,6 +240,7 @@ impl TryFrom<Element> for StanzaError {
fn try_from(elem: Element) -> Result<StanzaError, Error> { fn try_from(elem: Element) -> Result<StanzaError, Error> {
check_self!(elem, "error", DEFAULT_NS); check_self!(elem, "error", DEFAULT_NS);
check_no_unknown_attributes!(elem, "error", ["type", "by"]);
let type_ = get_attr!(elem, "type", Required); let type_ = get_attr!(elem, "type", Required);
let by = get_attr!(elem, "by", Option); let by = get_attr!(elem, "by", Option);
@ -250,6 +251,7 @@ impl TryFrom<Element> for StanzaError {
for child in elem.children() { for child in elem.children() {
if child.is("text", ns::XMPP_STANZAS) { if child.is("text", ns::XMPP_STANZAS) {
check_no_children!(child, "text"); check_no_children!(child, "text");
check_no_unknown_attributes!(child, "text", ["xml:lang"]);
let lang = get_attr!(elem, "xml:lang", Default); let lang = get_attr!(elem, "xml:lang", Default);
if texts.insert(lang, child.text()).is_some() { if texts.insert(lang, child.text()).is_some() {
return Err(Error::ParseError( return Err(Error::ParseError(
@ -263,6 +265,7 @@ impl TryFrom<Element> for StanzaError {
)); ));
} }
check_no_children!(child, "defined-condition"); check_no_children!(child, "defined-condition");
check_no_attributes!(child, "defined-condition");
let condition = DefinedCondition::try_from(child.clone())?; let condition = DefinedCondition::try_from(child.clone())?;
defined_condition = Some(condition); defined_condition = Some(condition);
} else { } else {