mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-17 08:05:21 +00:00
M8: the form and hidden-text callers are tested without a Type 3 font too
Review of the allowance change. Only Apply's page caller had a row with no Type 3 font listed. `the_cleanups_of_a_rewritten_form_spend_the_pages_allowance` and `removing_hidden_text_spends_what_the_content_walk_left_of_the_pages_allowance` now have one too: at 100 MiB the redaction and the removal go on. Doc comments that said every cleanup of a page spends the page's allowance (`prune_type3_from_resources`, `resource_ops`, `prune`) now say the font cleanup has one of its own when no Type 3 font is listed. The doc of `text_beside_bytes_the_parser_cannot_read_refuses_the_redaction` says the cleanups run only when the walk rewrites some of the page, and read what it rewrote as rewritten. The comment in `prune_type3_from_resources` no longer calls its read the only check for text: `prune_form_resources` (for a rewritten form), `prune` (when an image or form is replaced) and `prune_properties` make the same read when they run, and `unlink_type3` reads every page when the document still lists a Type 3 font. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AmsdeUCdTaD72jkDw2pJKY
This commit is contained in:
1 parent
506502386e
commit
ac1eba1092
3 files changed
+40
-23
No files matched your search
@@ -9,8 +9,9 @@ use super::{
|
||||
/// by a form without /Resources of its own, which draws through `xo` too. Such forms are read
|
||||
/// within `budget`, what is left of the page's allowance ([`resource_ops`]). Fails, as the cleanup
|
||||
/// of the fonts and properties these forms draw with does, when that can't be told: such a form
|
||||
/// doesn't decode (an image codec or a /Filter it can't run, say) or runs past `budget`, the walk
|
||||
/// passes 2,000,000 operators, or the parser can't read all of such a form or of `content`.
|
||||
/// doesn't decode (an image codec or a /Filter it can't run, say) or runs past `budget` (for the
|
||||
/// fonts' cleanup, an allowance of its own when no Type 3 font is listed), the walk passes
|
||||
/// 2,000,000 operators, or the parser can't read all of such a form or of `content`.
|
||||
/// Corrupt data in such a form is read, tolerantly, up to the damage, which may be nothing.
|
||||
pub(crate) fn prune(doc: &Document, budget: &mut DecodeBudget, xo: &mut Dict, replaced: &[Vec<u8>], content: &[Vec<u8>]) -> Result<(), CosError> {
|
||||
if replaced.is_empty() {
|
||||
@@ -473,7 +474,8 @@ pub(super) fn clip_out(rects: &[[f64; 4]], ctm: &Matrix, around: [f64; 4]) -> Op
|
||||
/// The operators of `content`, and of every form without /Resources of its own that it draws
|
||||
/// through `res`, nested ones too: what draws with these resources. Each such form is read once,
|
||||
/// with its `/DecodeParms` given by reference, its decoded bytes charged to `budget`, so the
|
||||
/// cleanups of one page that walk the same forms spend one allowance between them. An error
|
||||
/// cleanups of one page that walk the same forms spend one allowance between them (all but the
|
||||
/// fonts' cleanup when no Type 3 font is listed, which has one of its own). An error
|
||||
/// when that can't all be read: the parser can't read all of `content` or of such a form, the walk
|
||||
/// passes 2,000,000 operators, or such a form doesn't decode or runs past `budget`. Operators are
|
||||
/// read one at a time, so the walk stops at one past the limit rather than holding them all.
|
||||
|
||||
+28
-16
@@ -3625,11 +3625,16 @@ fn the_cleanups_after_the_content_walk_spend_what_it_left_of_the_pages_allowance
|
||||
}
|
||||
}
|
||||
|
||||
/// Text under the mark in a content stream that also holds bytes the parser can't read, inside a
|
||||
/// `TJ` array, is read past by the walk and would stay. The font cleanup's read of what the content
|
||||
/// draws refuses such bytes, and makes that read with any font listed, a Type 3 font or not (with
|
||||
/// none, on an allowance of its own): Apply Redactions refuses the page, whether the stream is the
|
||||
/// page's or a form's without resources of its own, and so does Remove Hidden Information.
|
||||
/// Text under the mark in a content stream that holds bytes the parser can't read, inside a `TJ`
|
||||
/// array, is read past by the walk and would stay. The font cleanup's read of what the content
|
||||
/// draws refuses such bytes in the streams and forms the walk leaves as they were, and makes that
|
||||
/// read with any font listed, a Type 3 font or not (with none, on an allowance of its own). Here
|
||||
/// the walk rewrites the text in the page's first stream and leaves the broken `TJ` as it was:
|
||||
/// Apply Redactions refuses the page, whether that `TJ` is in the page's second stream or in a
|
||||
/// form without resources of its own, and so does Remove Hidden Information. The cleanups run only
|
||||
/// when the walk rewrites some of the page, and read what it rewrote as rewritten, so such bytes in
|
||||
/// a stream it rewrites still go by, and so do those on a page it rewrites nothing of, unless the
|
||||
/// document still lists a Type 3 font (`unlink_type3` then reads every page).
|
||||
#[test]
|
||||
fn text_beside_bytes_the_parser_cannot_read_refuses_the_redaction() {
|
||||
use crate::sanitize::{Hidden, remove_hidden};
|
||||
@@ -3669,12 +3674,13 @@ fn text_beside_bytes_the_parser_cannot_read_refuses_the_redaction() {
|
||||
/// The cleanups of a form the redaction rewrites spend the page's allowance too. The rewritten
|
||||
/// form has resources of its own, so the page's cleanups don't follow it, and draws through them a
|
||||
/// form without any that crosses the mark: the walk reads that form, then the check of what the
|
||||
/// rewritten form still draws and its font cleanup (it lists a Type 3 font) read it again. At
|
||||
/// rewritten form still draws and its font cleanup (when it lists a Type 3 font) read it again. At
|
||||
/// 100 MiB, three reads are more than the page's 256 MiB, and the redaction is refused; at 50 MiB
|
||||
/// it goes on.
|
||||
/// it goes on. With no Type 3 font the font cleanup's read has an allowance of its own, so the
|
||||
/// page's pays for two reads of 100 MiB, and the redaction goes on.
|
||||
#[test]
|
||||
fn the_cleanups_of_a_rewritten_form_spend_the_pages_allowance() {
|
||||
for (mib, refused) in [(100, true), (50, false)] {
|
||||
for (mib, type3, refused) in [(100, true, true), (50, true, false), (100, false, false)] {
|
||||
let blank = pdfcraft_filters::encode_flate(&vec![b' '; mib << 20]);
|
||||
let mut doc = one_page(
|
||||
b"/FmText Do",
|
||||
@@ -3687,21 +3693,25 @@ fn the_cleanups_of_a_rewritten_form_spend_the_pages_allowance() {
|
||||
stream("/Type /XObject /Subtype /Form /BBox [0 0 300 300] /Filter /FlateDecode", &blank),
|
||||
],
|
||||
);
|
||||
list_type3(&mut doc, ObjRef::new(7, 0));
|
||||
if type3 {
|
||||
list_type3(&mut doc, ObjRef::new(7, 0));
|
||||
}
|
||||
mark(&mut doc, 0, &[[0.0, 200.0, 300.0, 300.0]], "");
|
||||
assert_eq!(apply(&mut doc, None).is_err(), refused, "{mib} MiB");
|
||||
assert_eq!(apply(&mut doc, None).is_err(), refused, "{mib} MiB, Type 3: {type3}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Removing hidden text spends what its content walk left of the page's allowance too. The page
|
||||
/// draws a form holding hidden text, which is rewritten, and a form without resources of its own:
|
||||
/// the walk reads the second, then the check of what the page still draws and the font cleanup (the
|
||||
/// page lists a Type 3 font) read it again. At 100 MiB, three reads are more than the page's
|
||||
/// 256 MiB, and the removal is refused; at 50 MiB it goes on.
|
||||
/// the walk reads the second, then the check of what the page still draws and the font cleanup
|
||||
/// (when the page lists a Type 3 font) read it again. At 100 MiB, three reads are more than the
|
||||
/// page's 256 MiB, and the removal is refused; at 50 MiB it goes on. With no Type 3 font the font
|
||||
/// cleanup's read has an allowance of its own, so the page's pays for two reads of 100 MiB, and the
|
||||
/// removal goes on.
|
||||
#[test]
|
||||
fn removing_hidden_text_spends_what_the_content_walk_left_of_the_pages_allowance() {
|
||||
use crate::sanitize::{Hidden, remove_hidden};
|
||||
for (mib, refused) in [(100, true), (50, false)] {
|
||||
for (mib, type3, refused) in [(100, true, true), (50, true, false), (100, false, false)] {
|
||||
let blank = pdfcraft_filters::encode_flate(&vec![b' '; mib << 20]);
|
||||
let mut doc = one_page(
|
||||
b"/FmHidden Do /FmBare Do",
|
||||
@@ -3711,8 +3721,10 @@ fn removing_hidden_text_spends_what_the_content_walk_left_of_the_pages_allowance
|
||||
stream("/Type /XObject /Subtype /Form /BBox [0 0 300 300] /Filter /FlateDecode", &blank),
|
||||
],
|
||||
);
|
||||
list_type3(&mut doc, ObjRef::new(3, 0));
|
||||
assert_eq!(remove_hidden(&mut doc, &[Hidden::HiddenText]).is_err(), refused, "{mib} MiB");
|
||||
if type3 {
|
||||
list_type3(&mut doc, ObjRef::new(3, 0));
|
||||
}
|
||||
assert_eq!(remove_hidden(&mut doc, &[Hidden::HiddenText]).is_err(), refused, "{mib} MiB, Type 3: {type3}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -550,7 +550,8 @@ fn is_type3(doc: &Document, f: &Object) -> bool {
|
||||
/// Prune Type 3 fonts from a rewritten page or form's `/Resources` dictionary if the rewritten
|
||||
/// content no longer draws any text using that font name. `page` is the page's dictionary when
|
||||
/// `res` are a page's resources. What it reads is charged to `budget`, what is left of the page's
|
||||
/// allowance.
|
||||
/// allowance, when the resources list a Type 3 font, and otherwise to an allowance of a page of its
|
||||
/// own (below).
|
||||
pub(crate) fn prune_type3_from_resources(
|
||||
doc: &Document,
|
||||
budget: &mut pdfcraft_cos::DecodeBudget,
|
||||
@@ -566,9 +567,11 @@ pub(crate) fn prune_type3_from_resources(
|
||||
// The operators of forms that draw through these resources count too: dropping a font a child
|
||||
// form still shows would leave its text without one. Without a Type 3 font nothing is pruned,
|
||||
// but the read is still made: it refuses bytes the parser can't read in what the content draws,
|
||||
// which for a text redaction is the only check that does (the walk reads past them, so text
|
||||
// they hide would stay under the mark). It is then charged to an allowance of a page of its own,
|
||||
// not to what the walk left of the page's, since it decides nothing about the fonts.
|
||||
// and on a page with nothing replaced and no properties listed no other check does, unless the
|
||||
// document still lists a Type 3 font (`unlink_type3` then reads every page). The walk reads
|
||||
// past them, so text they hide would stay under the mark. The read is then charged to an
|
||||
// allowance of a page of its own, not to what the walk left of the page's, since it decides
|
||||
// nothing about the fonts.
|
||||
let type3 = fonts.iter().any(|(_, f)| is_type3(doc, f));
|
||||
let mut own = pdfcraft_cos::DecodeBudget::page();
|
||||
let mut ops = crate::interp::resource_ops(doc, if type3 { &mut *budget } else { &mut own }, res, content)?;
|
||||
|
||||
Reference in new issue
Block a user