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.
104 lines
3.4 KiB
Rust
104 lines
3.4 KiB
Rust
// Copyright (c) 2017 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;
|
|
|
|
/// Structure representing an `<encryption xmlns='urn:xmpp:eme:0'/>` element.
|
|
#[derive(FromXml, AsXml, Debug, Clone, PartialEq)]
|
|
#[xml(namespace = ns::EME, name = "encryption")]
|
|
pub struct ExplicitMessageEncryption {
|
|
/// Namespace of the encryption scheme used.
|
|
#[xml(attribute)]
|
|
pub namespace: String,
|
|
|
|
/// User-friendly name for the encryption scheme, should be `None` for OTR,
|
|
/// legacy OpenPGP and OX.
|
|
#[xml(attribute(default))]
|
|
pub name: Option<String>,
|
|
}
|
|
|
|
impl MessagePayload for ExplicitMessageEncryption {}
|
|
|
|
#[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!(ExplicitMessageEncryption, 24);
|
|
}
|
|
|
|
#[cfg(target_pointer_width = "64")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(ExplicitMessageEncryption, 48);
|
|
}
|
|
|
|
#[test]
|
|
fn test_simple() {
|
|
let elem: Element = "<encryption xmlns='urn:xmpp:eme:0' namespace='urn:xmpp:otr:0'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let encryption = ExplicitMessageEncryption::try_from(elem).unwrap();
|
|
assert_eq!(encryption.namespace, "urn:xmpp:otr:0");
|
|
assert_eq!(encryption.name, None);
|
|
|
|
let elem: Element = "<encryption xmlns='urn:xmpp:eme:0' namespace='some.unknown.mechanism' name='SuperMechanism'/>".parse().unwrap();
|
|
let encryption = ExplicitMessageEncryption::try_from(elem).unwrap();
|
|
assert_eq!(encryption.namespace, "some.unknown.mechanism");
|
|
assert_eq!(encryption.name, Some(String::from("SuperMechanism")));
|
|
}
|
|
|
|
#[test]
|
|
fn test_unknown() {
|
|
let elem: Element = "<replace xmlns='urn:xmpp:message-correct:0'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = ExplicitMessageEncryption::try_from(elem.clone()).unwrap_err();
|
|
let returned_elem = match error {
|
|
FromElementError::Mismatch(elem) => elem,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(elem, returned_elem);
|
|
}
|
|
|
|
#[test]
|
|
#[cfg_attr(feature = "disable-validation", should_panic = "Result::unwrap_err")]
|
|
fn test_invalid_child() {
|
|
let elem: Element =
|
|
"<encryption xmlns='urn:xmpp:eme:0' namespace='urn:xmpp:otr:0'><coucou/></encryption>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = ExplicitMessageEncryption::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::Other(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(
|
|
message,
|
|
"Unknown child in ExplicitMessageEncryption element."
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_serialise() {
|
|
let elem: Element = "<encryption xmlns='urn:xmpp:eme:0' namespace='coucou'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let eme = ExplicitMessageEncryption {
|
|
namespace: String::from("coucou"),
|
|
name: None,
|
|
};
|
|
let elem2 = eme.into();
|
|
assert_eq!(elem, elem2);
|
|
}
|
|
}
|