6ef8dbefa3
This is a large change and as such, it needs good motivation. Let me remind you of the ultimate goal: we want a derive macro which allows us to FromXml/IntoXml, and that derive macro should be usable from `xmpp_parsers` and other crates. For that, any code generated by the derive macro mustn't depend on any code in the `xmpp_parsers` crate, because you cannot name the crate you are in portably (`xmpp_parsers::..` wouldn't resolve within `xmpp_parsers`, and `crate::..` would point at other crates if the macro was used in other crates). We also want to interoperate with code already implementing `TryFrom<Element>` and `Into<Element>` on structs. This ultimately requires that we have an error type which is shared by the two implementations and that error type must be declared in the `xso` crate to be usable by the macros. Thus, we port the error type over to use the type declared in `xso`. This changes the structure of the error type greatly; I do not think that `xso` should have to know about all the different types we are parsing there and they don't deserve special treatment. Wrapping them in a `Box<dyn ..>` seems more appropriate.
95 lines
3.1 KiB
Rust
95 lines
3.1 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 crate::message::MessagePayload;
|
|
|
|
generate_element!(
|
|
/// Structure representing an `<encryption xmlns='urn:xmpp:eme:0'/>` element.
|
|
ExplicitMessageEncryption, "encryption", EME,
|
|
attributes: [
|
|
/// Namespace of the encryption scheme used.
|
|
namespace: Required<String> = "namespace",
|
|
|
|
/// User-friendly name for the encryption scheme, should be `None` for OTR,
|
|
/// legacy OpenPGP and OX.
|
|
name: Option<String> = "name",
|
|
]
|
|
);
|
|
|
|
impl MessagePayload for ExplicitMessageEncryption {}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::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]
|
|
fn test_invalid_child() {
|
|
let elem: Element = "<encryption xmlns='urn:xmpp:eme: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 encryption 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);
|
|
}
|
|
}
|