xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xmpp-parsers: Fix jingle thumbnails wrt the XEP changes

Browse source 
Version 0.4.2 added a restriction on width and height to be in the
0..65535 range.  The media-type attribute has always been optional as
well.
This commit is contained in:
Emmanuel Gil Peyrot 2024-07-24 22:41:13 +02:00
commit 7fca02958b
3 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
parsers/src/jingle_thumbnails.rs
View file

@ -1,14 +1,15 @@
//! Jingle thumbnails (XEP-0264)
// Copyright (c) 2023 XMPP-RS contributors.=
// Copyright (c) 2023 XMPP-RS contributors.
//
// 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/.
//! Jingle thumbnails (XEP-0264)
use xso::{AsXml, FromXml};
use crate::ns;
use core::num::NonZeroU16;
/// A Jingle thumbnail.
#[derive(FromXml, AsXml, PartialEq, Debug, Clone)]
@ -19,23 +20,36 @@ pub struct Thumbnail {
pub uri: String,
/// The media type of the thumbnail.
#[xml(attribute = "media-type")]
pub media_type: String,
#[xml(attribute(default, name = "media-type"))]
pub media_type: Option<String>,
/// The width of the thumbnail.
#[xml(attribute)]
pub width: u32,
#[xml(attribute(default))]
pub width: Option<NonZeroU16>,
/// The height of the thumbnail.
#[xml(attribute)]
pub height: u32,
#[xml(attribute(default))]
pub height: Option<NonZeroU16>,
}
#[cfg(test)]
mod tests {
use crate::jingle_thumbnails::Thumbnail;
use core::num::NonZeroU16;
use minidom::Element;
#[cfg(target_pointer_width = "32")]
#[test]
fn test_size() {
assert_size!(Thumbnail, 28);
}
#[cfg(target_pointer_width = "64")]
#[test]
fn test_size() {
assert_size!(Thumbnail, 56);
}
#[test]
fn test_simple_parse() {
// Extracted from https://xmpp.org/extensions/xep-0264.html#example-1
@ -53,8 +67,8 @@ mod tests {
thumbnail.uri,
"cid:sha1+ffd7c8d28e9c5e82afea41f97108c6b4@bob.xmpp.org"
);
assert_eq!(thumbnail.media_type, "image/png");
assert_eq!(thumbnail.width, 128);
assert_eq!(thumbnail.height, 96);
assert_eq!(thumbnail.media_type.unwrap(), "image/png");
assert_eq!(thumbnail.width, NonZeroU16::new(128));
assert_eq!(thumbnail.height, NonZeroU16::new(96));
}
}