mirrors/arti.git/crates/tor-consdiff/src, branch arti-v2.2.0mirror of https://gitlab.torproject.org/tpo/core/arti
http://git.dilluti0n.com/mirrors/arti.git/atom?h=arti-v2.2.02026-03-25T15:17:30Ztor-consdiff: Apply comment suggestion2026-03-25T15:17:30ZClara Englercve@cve.cx2026-03-25T15:06:01Zurn:sha1:55bae2dbd87a741144a78e8c6445ac7e20ab6921
Co-authored-by: Ian Jacksontor-consdiff: Prevent dotlines with WS tail2026-03-25T15:17:30ZClara Englercve@cve.cx2026-03-25T08:41:20Zurn:sha1:fe0fb0252b42185de5f4d69a84c7a82493f1de67
This commit modifies the dotline check to prevent generating lines that
consist of a single dot followed by an arbitrary amount of whitespace,
such as `.`, `. `, `. \t `, but not `. \t foo`.
It also adjusts the tests appropriately.
tor-consdiff: Rename `.lno` to `.lno_for_error`2026-03-25T15:17:30ZClara Englercve@cve.cx2026-03-23T14:24:10Zurn:sha1:36033a42a8120a6bd12e4e819e0d29fa90d4d3bator-consdiff: Prevent dotlines properly2026-03-25T15:17:30ZClara Englercve@cve.cx2026-03-23T14:10:31Zurn:sha1:f516884cf05c8881122f70bf58c8bf19b66610f8
As pointed out by Diziet, our implementation does not reject dotlines
properly, due to our use of `trim_end()`. This commit fixes this, by
just checking for `line == ".\n"`. This is fine because we ensure Unix
line endings now anyways.
tor-consdiff: Enforce Unix line endings2026-03-25T15:17:30ZClara Englercve@cve.cx2026-03-23T14:09:24Zurn:sha1:05bbdf523c1d72b10a4e2f4adb47279b9884634e
This commit changes the consdiff generation to enforce Unix line endings
and reject all other ones, including Windows line endings as well as no
line endings. In other words, it checks for `\n` while forbidding
`\r\n`.
It also renames the relevant error variant to reflect this change
better.
tor-consdiff: Justify our use of peek'ing2026-03-25T15:17:29ZClara Englercve@cve.cx2026-03-18T10:39:00Zurn:sha1:2244d3c286b4b8e095d394f2b8cd500334f0ce2b
This is done to only get the first directory-signature.
tor-consdiff: Refactor result composition2026-03-25T15:17:29ZClara Englercve@cve.cx2026-03-18T10:34:03Zurn:sha1:de7663cd50e98fbe33fc9c47b493633ef1509963
This commit refactors the result composition by simply looping over
every line and checking whether it ends with a newline AND does not
consist of a single dot.
tor-consdiff: Use named variants for lno errors2026-03-25T15:17:29ZClara Englercve@cve.cx2026-03-18T10:28:42Zurn:sha1:d3dacd11794581fc752b7ea53cb82fd14fc41a87
This commit changes the error variants that contain a line number to a
named variant with a field `lno: usize` to make it semantically clear,
that it is a line number.
tor-consdiff: Use derive_more for HunkType's Display2026-03-25T15:17:29ZClara Englercve@cve.cx2026-03-18T10:25:35Zurn:sha1:c883642cdd87f41d4c3a0b5a8e2e6764591a811dtor-consdiff: Use usize::try_from2026-03-25T15:17:29ZClara Englercve@cve.cx2026-03-12T16:27:25Zurn:sha1:dd0f466f2ef738299861308bd639556f94835cce