b8af0d8fa2
It was broken in multiple ways: - xso did not honour it: unknown children and attributes would cause a parse error even with `--features disable-validation` set on parsers. For this, we introduce a new feature flag on xso, `non-pedantic`, which defaults unknown children and attributes to discard instead of fail. Note that individual XSOs can still choose to be always pedantic or always lenient by explicitly declaring the intent via the `on_unknown_child` and `on_unknown_attribute` metas. - Many tests in `xmpp_parsers` were broken with `--features disable-validation`. They now all pass while *still* being rn with `disable-validation` set: In that case, they test that parsing in fact succeeds.
97 lines
2.9 KiB
Rust
97 lines
2.9 KiB
Rust
// Copyright (c) 2019 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
use xso::{AsXml, FromXml};
|
|
|
|
use crate::message::MessagePayload;
|
|
use crate::ns;
|
|
use crate::presence::PresencePayload;
|
|
|
|
/// Unique identifier given to a MUC participant.
|
|
///
|
|
/// It allows clients to identify a MUC participant across reconnects and
|
|
/// renames. It thus prevents impersonification of anonymous users.
|
|
#[derive(FromXml, AsXml, PartialEq, Debug, Clone)]
|
|
#[xml(namespace = ns::OID, name = "occupant-id")]
|
|
pub struct OccupantId {
|
|
/// The id associated to the sending user by the MUC service.
|
|
#[xml(attribute)]
|
|
pub id: String,
|
|
}
|
|
|
|
impl MessagePayload for OccupantId {}
|
|
impl PresencePayload for OccupantId {}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use minidom::Element;
|
|
use xso::error::{Error, FromElementError};
|
|
|
|
#[cfg(target_pointer_width = "32")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(OccupantId, 12);
|
|
}
|
|
|
|
#[cfg(target_pointer_width = "64")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(OccupantId, 24);
|
|
}
|
|
|
|
#[test]
|
|
fn test_simple() {
|
|
let elem: Element = "<occupant-id xmlns='urn:xmpp:occupant-id:0' id='coucou'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let origin_id = OccupantId::try_from(elem).unwrap();
|
|
assert_eq!(origin_id.id, "coucou");
|
|
}
|
|
|
|
#[test]
|
|
#[cfg_attr(feature = "disable-validation", should_panic = "Result::unwrap_err")]
|
|
fn test_invalid_child() {
|
|
let elem: Element =
|
|
"<occupant-id xmlns='urn:xmpp:occupant-id:0' id='foo'><coucou/></occupant-id>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = OccupantId::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::Other(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(message, "Unknown child in OccupantId element.");
|
|
}
|
|
|
|
#[test]
|
|
fn test_invalid_id() {
|
|
let elem: Element = "<occupant-id xmlns='urn:xmpp:occupant-id:0'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = OccupantId::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::Other(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(
|
|
message,
|
|
"Required attribute field 'id' on OccupantId element missing."
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_serialise() {
|
|
let elem: Element = "<occupant-id xmlns='urn:xmpp:occupant-id:0' id='coucou'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let occupant_id = OccupantId {
|
|
id: String::from("coucou"),
|
|
};
|
|
let elem2 = occupant_id.into();
|
|
assert_eq!(elem, elem2);
|
|
}
|
|
}
|