Mirrors/lofty-rs
2
0
Fork 0
mirror of https://github.com/Serial-ATA/lofty-rs synced 2024-11-10 06:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

lofty_attr: Make it even harder to bypass the internal write module check

Browse source
This commit is contained in:
Serial 2022-10-14 08:22:53 -04:00
parent afe78368c2
commit 78723a7dd0
No known key found for this signature in database
GPG key ID: DA95198DC17C4568
4 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lofty_attr/src/internal.rs
View file

@ -43,44 +43,44 @@ pub(crate) fn init_write_lookup(
}
insert!(map, APE, {
crate::ape::tag::ApeTagRef {
lofty::ape::tag::ApeTagRef {
read_only: false,
items: crate::ape::tag::tagitems_into_ape(tag.items()),
items: lofty::ape::tag::tagitems_into_ape(tag.items()),
}
.write_to(data)
});
insert!(map, ID3v1, {
Into::<crate::id3::v1::tag::Id3v1TagRef<'_>>::into(tag).write_to(data)
Into::<lofty::id3::v1::tag::Id3v1TagRef<'_>>::into(tag).write_to(data)
});
if id3v2_strippable {
insert!(map, ID3v2, {
crate::id3::v2::tag::Id3v2TagRef::empty().write_to(data)
lofty::id3::v2::tag::Id3v2TagRef::empty().write_to(data)
});
} else {
insert!(map, ID3v2, {
crate::id3::v2::tag::Id3v2TagRef {
flags: crate::id3::v2::ID3v2TagFlags::default(),
frames: crate::id3::v2::tag::tag_frames(tag),
lofty::id3::v2::tag::Id3v2TagRef {
flags: lofty::id3::v2::ID3v2TagFlags::default(),
frames: lofty::id3::v2::tag::tag_frames(tag),
}
.write_to(data)
});
}
insert!(map, RIFFInfo, {
crate::iff::wav::tag::RIFFInfoListRef::new(crate::iff::wav::tag::tagitems_into_riff(
lofty::iff::wav::tag::RIFFInfoListRef::new(lofty::iff::wav::tag::tagitems_into_riff(
tag.items(),
))
.write_to(data)
});
insert!(map, AIFFText, {
crate::iff::aiff::tag::AiffTextChunksRef {
name: tag.get_string(&crate::tag::item::ItemKey::TrackTitle),
author: tag.get_string(&crate::tag::item::ItemKey::TrackArtist),
copyright: tag.get_string(&crate::tag::item::ItemKey::CopyrightMessage),
annotations: Some(tag.get_strings(&crate::tag::item::ItemKey::Comment)),
lofty::iff::aiff::tag::AiffTextChunksRef {
name: tag.get_string(&lofty::tag::item::ItemKey::TrackTitle),
author: tag.get_string(&lofty::tag::item::ItemKey::TrackArtist),
copyright: tag.get_string(&lofty::tag::item::ItemKey::CopyrightMessage),
annotations: Some(tag.get_strings(&lofty::tag::item::ItemKey::Comment)),
comments: None,
}
.write_to(data)
@ -95,11 +95,11 @@ pub(crate) fn write_module(
) -> proc_macro2::TokenStream {
let applicable_formats = fields.iter().map(|f| {
let tag_ty =
syn::parse_str::<syn::Path>(&format!("crate::tag::TagType::{}", &f.tag_type)).unwrap();
syn::parse_str::<syn::Path>(&format!("lofty::TagType::{}", &f.tag_type)).unwrap();
let features = f.cfg_features.iter();
let block = lookup.get(&*tag_ty.segments[3].ident.to_string()).unwrap();
let block = lookup.get(&*tag_ty.segments[2].ident.to_string()).unwrap();
quote! {
#( #features )*
@ -110,7 +110,7 @@ pub(crate) fn write_module(
quote! {
pub(crate) mod write {
#[allow(unused_variables)]
pub(crate) fn write_to(data: &mut std::fs::File, tag: &crate::tag::Tag) -> crate::error::Result<()> {
pub(crate) fn write_to(data: &mut std::fs::File, tag: &lofty::Tag) -> lofty::error::Result<()> {
match tag.tag_type() {
#( #applicable_formats )*
_ => crate::macros::err!(UnsupportedTag),

2
lofty_attr/src/lofty_file.rs
View file

@ -190,6 +190,8 @@ pub(crate) fn parse(
ret = quote! {
#ret
use crate::_this_is_internal;
#write_mod
}
}

2
lofty_attr/src/lofty_tag.rs
View file

@ -99,6 +99,8 @@ pub(crate) fn parse(
});
quote! {
use crate::_this_is_internal;
#[doc = #desc]
#[doc = "\n"]
#[doc = "## Supported file types\n\n"]

1
src/lib.rs
View file

@ -164,6 +164,7 @@
// proc macro hacks
extern crate self as lofty;
pub(crate) mod _this_is_internal {}
pub mod ape;
pub mod error;