diff --git a/parsers/ChangeLog b/parsers/ChangeLog index 6c375d05811a2d54fa78f648fdad88ba285e4a5a..2b3ff55a3675f78033e56537d3409c58ec5dc1f5 100644 --- a/parsers/ChangeLog +++ b/parsers/ChangeLog @@ -109,6 +109,8 @@ XXXX-YY-ZZ RELEASER - JSON Containers (XEP-0335) (!546) - Verifying HTTP Requests via XMPP (XEP-0070) * Improvements: + - Add support for undocumented ` in XEP-0198 feature + advertisment, for compatibility with servers in the wild. - Add support application-specific error conditions in XEP-0198 - Keep unsupported vCard elements as `minidom::Element`, so that they get serialized back instead of being dropped. We now also test for diff --git a/parsers/src/sasl2.rs b/parsers/src/sasl2.rs index aded5f69abaeb5f5a3152de930e144c11269e61d..2312ca5fa7ece488b833d84b1c9d020e0599d28f 100644 --- a/parsers/src/sasl2.rs +++ b/parsers/src/sasl2.rs @@ -269,7 +269,7 @@ mod tests { let inline = auth.inline.unwrap(); assert_eq!(inline.bind2.unwrap().inline_features.len(), 0); - assert_eq!(inline.sm.unwrap(), StreamManagement); + assert_eq!(inline.sm.unwrap(), StreamManagement { optional: false }); assert_eq!(inline.payloads.len(), 0); } diff --git a/parsers/src/sm.rs b/parsers/src/sm.rs index c15ad01413f050a276261b2815cd1b4e14bd0e56..955ff5eb1dbe51e7782e7df2b96bfd83593e453a 100644 --- a/parsers/src/sm.rs +++ b/parsers/src/sm.rs @@ -136,7 +136,13 @@ pub struct Resumed { /// Represents availability of Stream Management in ``. #[derive(FromXml, AsXml, PartialEq, Debug, Clone)] #[xml(namespace = ns::SM, name = "sm")] -pub struct StreamManagement; +pub struct StreamManagement { + /// Undocumented `` flag. + // TODO: Remove this flag once servers in the wild have been updated to not send it, as it is + // completely undocumented in XEP-0198, only appearing in the XML Schema before 1.6.3. + #[xml(flag)] + pub optional: bool, +} /// Application-specific error condition to use when the peer acknowledges /// more stanzas than the local side has sent. @@ -215,7 +221,7 @@ mod tests { assert_size!(R, 0); assert_size!(Resume, 16); assert_size!(Resumed, 16); - assert_size!(StreamManagement, 0); + assert_size!(StreamManagement, 1); assert_size!(HandledCountTooHigh, 8); } @@ -230,7 +236,7 @@ mod tests { assert_size!(R, 0); assert_size!(Resume, 32); assert_size!(Resumed, 32); - assert_size!(StreamManagement, 0); + assert_size!(StreamManagement, 1); assert_size!(HandledCountTooHigh, 8); }