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

Support legacy integer <error> code. Don't expose it.

Browse source
This commit is contained in:
xmppftw 2023-12-21 20:48:57 +01:00
parent 95f3c06cf3
commit 0a6ee5b32e
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
parsers/src/stanza_error.rs
View file

@ -245,7 +245,9 @@ 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"]); // The code attribute has been deprecated in [XEP-0086](https://xmpp.org/extensions/xep-0086.html)
// which was deprecated in 2007. We don't error when it's here, but don't include it in the final struct.
check_no_unknown_attributes!(elem, "error", ["type", "by", "code"]);
let mut stanza_error = StanzaError { let mut stanza_error = StanzaError {
type_: get_attr!(elem, "type", Required), type_: get_attr!(elem, "type", Required),
@ -388,4 +390,16 @@ mod tests {
}; };
assert_eq!(message, "Error must have a defined-condition."); assert_eq!(message, "Error must have a defined-condition.");
} }
#[test]
fn test_error_code() {
let elem: Element = r#"<error code="501" type="cancel" xmlns='jabber:client'>
<feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
<text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>The feature requested is not implemented by the recipient or server and therefore cannot be processed.</text>
</error>"#
.parse()
.unwrap();
let stanza_error = StanzaError::try_from(elem).unwrap();
assert_eq!(stanza_error.type_, ErrorType::Cancel);
}
} }