mirror of
https://gitlab.com/xmpp-rs/xmpp-rs.git
synced 2024-07-12 22:21:53 +00:00
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.
142 lines
4.7 KiB
Rust
142 lines
4.7 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::jingle::SessionId;
|
||
use crate::ns;
|
||
use crate::Element;
|
||
use xso::error::{Error, FromElementError};
|
||
|
||
/// Defines a protocol for broadcasting Jingle requests to all of the clients
|
||
/// of a user.
|
||
#[derive(Debug, Clone)]
|
||
pub enum JingleMI {
|
||
/// Indicates we want to start a Jingle session.
|
||
Propose {
|
||
/// The generated session identifier, must be unique between two users.
|
||
sid: SessionId,
|
||
|
||
/// The application description of the proposed session.
|
||
// TODO: Use a more specialised type here.
|
||
description: Element,
|
||
},
|
||
|
||
/// Cancels a previously proposed session.
|
||
Retract(SessionId),
|
||
|
||
/// Accepts a session proposed by the other party.
|
||
Accept(SessionId),
|
||
|
||
/// Proceed with a previously proposed session.
|
||
Proceed(SessionId),
|
||
|
||
/// Rejects a session proposed by the other party.
|
||
Reject(SessionId),
|
||
}
|
||
|
||
fn get_sid(elem: Element) -> Result<SessionId, Error> {
|
||
check_no_unknown_attributes!(elem, "Jingle message", ["id"]);
|
||
Ok(SessionId(get_attr!(elem, "id", Required)))
|
||
}
|
||
|
||
fn check_empty_and_get_sid(elem: Element) -> Result<SessionId, Error> {
|
||
check_no_children!(elem, "Jingle message");
|
||
get_sid(elem)
|
||
}
|
||
|
||
impl TryFrom<Element> for JingleMI {
|
||
type Error = FromElementError;
|
||
|
||
fn try_from(elem: Element) -> Result<JingleMI, FromElementError> {
|
||
if !elem.has_ns(ns::JINGLE_MESSAGE) {
|
||
return Err(Error::Other("This is not a Jingle message element.").into());
|
||
}
|
||
Ok(match elem.name() {
|
||
"propose" => {
|
||
let mut description = None;
|
||
for child in elem.children() {
|
||
if child.name() != "description" {
|
||
return Err(Error::Other("Unknown child in propose element.").into());
|
||
}
|
||
if description.is_some() {
|
||
return Err(Error::Other("Too many children in propose element.").into());
|
||
}
|
||
description = Some(child.clone());
|
||
}
|
||
JingleMI::Propose {
|
||
sid: get_sid(elem)?,
|
||
description: description.ok_or(Error::Other(
|
||
"Propose element doesn’t contain a description.",
|
||
))?,
|
||
}
|
||
}
|
||
"retract" => JingleMI::Retract(check_empty_and_get_sid(elem)?),
|
||
"accept" => JingleMI::Accept(check_empty_and_get_sid(elem)?),
|
||
"proceed" => JingleMI::Proceed(check_empty_and_get_sid(elem)?),
|
||
"reject" => JingleMI::Reject(check_empty_and_get_sid(elem)?),
|
||
_ => return Err(Error::Other("This is not a Jingle message element.").into()),
|
||
})
|
||
}
|
||
}
|
||
|
||
impl From<JingleMI> for Element {
|
||
fn from(jingle_mi: JingleMI) -> Element {
|
||
match jingle_mi {
|
||
JingleMI::Propose { sid, description } => {
|
||
Element::builder("propose", ns::JINGLE_MESSAGE)
|
||
.attr("id", sid)
|
||
.append(description)
|
||
}
|
||
JingleMI::Retract(sid) => {
|
||
Element::builder("retract", ns::JINGLE_MESSAGE).attr("id", sid)
|
||
}
|
||
JingleMI::Accept(sid) => Element::builder("accept", ns::JINGLE_MESSAGE).attr("id", sid),
|
||
JingleMI::Proceed(sid) => {
|
||
Element::builder("proceed", ns::JINGLE_MESSAGE).attr("id", sid)
|
||
}
|
||
JingleMI::Reject(sid) => Element::builder("reject", ns::JINGLE_MESSAGE).attr("id", sid),
|
||
}
|
||
.build()
|
||
}
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
|
||
#[cfg(target_pointer_width = "32")]
|
||
#[test]
|
||
fn test_size() {
|
||
assert_size!(JingleMI, 72);
|
||
}
|
||
|
||
#[cfg(target_pointer_width = "64")]
|
||
#[test]
|
||
fn test_size() {
|
||
assert_size!(JingleMI, 144);
|
||
}
|
||
|
||
#[test]
|
||
fn test_simple() {
|
||
let elem: Element = "<accept xmlns='urn:xmpp:jingle-message:0' id='coucou'/>"
|
||
.parse()
|
||
.unwrap();
|
||
JingleMI::try_from(elem).unwrap();
|
||
}
|
||
|
||
#[test]
|
||
fn test_invalid_child() {
|
||
let elem: Element =
|
||
"<propose xmlns='urn:xmpp:jingle-message:0' id='coucou'><coucou/></propose>"
|
||
.parse()
|
||
.unwrap();
|
||
let error = JingleMI::try_from(elem).unwrap_err();
|
||
let message = match error {
|
||
FromElementError::Invalid(Error::Other(string)) => string,
|
||
_ => panic!(),
|
||
};
|
||
assert_eq!(message, "Unknown child in propose element.");
|
||
}
|
||
}
|