Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Keep CSV cells from adding their own iCalendar lines

SeoJCalive1c064631c41f
diff --git a/src/Filee.Engines/Data/ICalendar.cs b/src/Filee.Engines/Data/ICalendar.cs
index 9bdebe85..55b98485 100644
--- a/src/Filee.Engines/Data/ICalendar.cs
+++ b/src/Filee.Engines/Data/ICalendar.cs
@@ -418,6 +418,7 @@ internal static partial class ICalendar
private static string PersonLine(string name, string cell)
{
+ cell = cell.Replace("\r", "").Replace("\n", "");
var marker = cell.LastIndexOf(" <", StringComparison.Ordinal);
var display = marker >= 0 && cell.EndsWith('>') ? cell[..marker] : "";
var address = display.Length > 0 ? cell[(marker + 2)..^1] : cell;
@@ -425,6 +426,7 @@ internal static partial class ICalendar
address = "mailto:" + address;
if (display.Length == 0)
return name + ":" + address;
+ display = display.Replace("\"", "");
if (display.IndexOfAny([';', ':', ',']) >= 0)
display = "\"" + display + "\"";
return $"{name};CN={display}:{address}";
@@ -440,18 +442,19 @@ internal static partial class ICalendar
foreach (var component in components)
{
var cells = component.Cells!;
- if (cells[5].Length == 0)
+ var zoneId = cells[5].IndexOfAny(['\r', '\n', ':', ';', '"']) < 0 ? cells[5] : "";
+ if (zoneId.Length == 0)
continue;
try
{
- var zone = TimeZoneInfo.FindSystemTimeZoneById(cells[5]);
+ var zone = TimeZoneInfo.FindSystemTimeZoneById(zoneId);
var parsedStart = TryCsvDate(cells[2], out var start, out var startDate);
var hasStart = cells[2].Length > 0 && parsedStart && !startDate;
var candidate = hasStart
? start : TryCsvDate(cells[3], out var end, out var endDate) && !endDate ? end : (DateTimeOffset?)null;
- if (candidate is { } instant && (!zones.TryGetValue(cells[5], out var previous)
+ if (candidate is { } instant && (!zones.TryGetValue(zoneId, out var previous)
|| hasStart && !previous.HasStart || hasStart == previous.HasStart && instant < previous.Instant))
- zones[cells[5]] = (zone, instant, hasStart);
+ zones[zoneId] = (zone, instant, hasStart);
}
catch (TimeZoneNotFoundException) { }
catch (InvalidTimeZoneException) { }
@@ -463,21 +466,22 @@ internal static partial class ICalendar
foreach (var component in components)
{
var cells = component.Cells!;
+ var zoneId = cells[5].IndexOfAny(['\r', '\n', ':', ';', '"']) < 0 ? cells[5] : "";
TimeZoneInfo? zone = null;
- if (zones.TryGetValue(cells[5], out var definition))
+ if (zones.TryGetValue(zoneId, out var definition))
zone = definition.Zone;
Line(output, "BEGIN:" + component.Type);
- var uid = cells[13].Length == 0
+ var uid = cells[13].IndexOfAny(['\r', '\n']) >= 0 || cells[13].Length == 0
? Convert.ToHexStringLower(SHA256.HashData(Encoding.UTF8.GetBytes(string.Join('\0', cells))))[..16] + "@filee"
: cells[13];
Line(output, "UID:" + uid);
Line(output, "DTSTAMP:" + DateTime.UtcNow.ToString("yyyyMMdd'T'HHmmss'Z'", CultureInfo.InvariantCulture));
if (cells[1].Length > 0)
Line(output, "SUMMARY:" + Escape(cells[1]));
- var start = DateLine("DTSTART", cells[2], cells[5], zone);
+ var start = DateLine("DTSTART", cells[2], zoneId, zone);
if (start.Length > 0)
Line(output, start);
- var end = DateLine(component.Type == "VTODO" ? "DUE" : "DTEND", cells[3], cells[5], zone);
+ var end = DateLine(component.Type == "VTODO" ? "DUE" : "DTEND", cells[3], zoneId, zone);
if (end.Length > 0)
Line(output, end);
if (cells[6].Length > 0)
@@ -488,12 +492,13 @@ internal static partial class ICalendar
Line(output, PersonLine("ORGANIZER", cells[8]));
foreach (var attendee in cells[9].Split('\n', StringSplitOptions.RemoveEmptyEntries))
Line(output, PersonLine("ATTENDEE", attendee));
- if (cells[10].Length > 0)
+ if (cells[10].Length > 0 && cells[10].IndexOfAny(['\r', '\n']) < 0)
Line(output, "RRULE:" + cells[10]);
- foreach (var line in cells[11].Split('\n', StringSplitOptions.RemoveEmptyEntries))
- Line(output, line);
- foreach (var line in cells[12].Split('\n', StringSplitOptions.RemoveEmptyEntries))
- Line(output, line);
+ foreach (var (index, name) in new[] { (11, "EXDATE"), (12, "RECURRENCE-ID") })
+ foreach (var line in cells[index].Split(["\r\n", "\n", "\r"], StringSplitOptions.RemoveEmptyEntries))
+ if (line.StartsWith(name + ":", StringComparison.OrdinalIgnoreCase)
+ || line.StartsWith(name + ";", StringComparison.OrdinalIgnoreCase))
+ Line(output, line);
Line(output, "END:" + component.Type);
}
Line(output, "END:VCALENDAR");
diff --git a/tests/Filee.Engines.Tests/ICalendarTests.cs b/tests/Filee.Engines.Tests/ICalendarTests.cs
index 40321b93..dc6a6e18 100644
--- a/tests/Filee.Engines.Tests/ICalendarTests.cs
+++ b/tests/Filee.Engines.Tests/ICalendarTests.cs
@@ -324,6 +324,124 @@ public class ICalendarTests(EngineFixture fx) : IClassFixture<EngineFixture>
Assert.Equal("Kim; A <[email protected]>", Cell(roundtrip, 1, "Attendees"));
}
+ [Fact]
+ public async Task Injected_rrule_and_exdate_cannot_create_events_or_alarms()
+ {
+ var row = Enumerable.Repeat("", ICalendar.Columns.Length).ToArray();
+ row[1] = "Safe";
+ row[2] = "2026-10-22T09:00:00Z";
+ row[10] = "FREQ=DAILY\nBEGIN:VALARM";
+ row[11] = "EXDATE:20261022T090000Z\r\nEND:VEVENT\nBEGIN:VEVENT\rSUMMARY:Injected"
+ + "\nexdate;VALUE=DATE:20261023\rEXDATEX:20261024T090000Z";
+ var second = (string[])row.Clone();
+ second[1] = "Second";
+ second[10] = "FREQ=WEEKLY\rX-INJECT:1";
+ second[11] = "";
+ var text = (await File.ReadAllTextAsync(await Convert(Csv(ICalendar.Columns, row, second),
+ "csv", "ics"), TestContext.Current.CancellationToken)).Replace("\r\n ", "");
+ var lines = text.Split("\r\n", StringSplitOptions.RemoveEmptyEntries);
+ Assert.Equal(2, lines.Count(line => line == "BEGIN:VEVENT"));
+ Assert.DoesNotContain("VALARM", text);
+ Assert.DoesNotContain("Injected", text);
+ Assert.DoesNotContain("RRULE:", text);
+ Assert.Contains("EXDATE:20261022T090000Z", lines);
+ Assert.Contains("exdate;VALUE=DATE:20261023", lines);
+ Assert.DoesNotContain("EXDATEX:20261024T090000Z", lines);
+ var stack = new Stack<string>();
+ foreach (var line in lines)
+ {
+ if (line.StartsWith("BEGIN:", StringComparison.Ordinal))
+ stack.Push(line[6..]);
+ if (line.StartsWith("END:", StringComparison.Ordinal))
+ Assert.Equal(stack.Pop(), line[4..]);
+ }
+ Assert.Empty(stack);
+ var names = new HashSet<string>(StringComparer.Ordinal)
+ {
+ "BEGIN", "END", "VERSION", "PRODID", "UID", "DTSTAMP", "SUMMARY",
+ "DTSTART", "DTEND", "DUE", "LOCATION", "DESCRIPTION", "ORGANIZER",
+ "ATTENDEE", "RRULE", "EXDATE", "RECURRENCE-ID", "TZID",
+ "TZOFFSETFROM", "TZOFFSETTO", "TZNAME", "RDATE",
+ };
+ foreach (var line in lines)
+ {
+ Assert.Matches(@"^[A-Za-z-]+(?:;[^:\r\n]+)?:[^\r\n]*$", line);
+ Assert.Contains(line.Split([';', ':'], 2)[0].ToUpperInvariant(), names);
+ }
+ }
+
+ [Theory]
+ [InlineData("bad\nBEGIN:VEVENT")]
+ [InlineData("bad\rEND:VEVENT")]
+ public async Task Uid_with_line_break_uses_generated_uid(string uid)
+ {
+ var text = (await File.ReadAllTextAsync(await Convert(Csv(["Title", "Start", "UID"],
+ ["Safe", "2026-10-21", uid]), "csv", "ics"), TestContext.Current.CancellationToken))
+ .Replace("\r\n ", "");
+ Assert.Matches(@"(?m)^UID:[0-9a-f]{16}@filee\r?$", text);
+ Assert.Contains("SUMMARY:Safe\r\nDTSTART;VALUE=DATE:20261021", text);
+ Assert.Equal(1, text.Split("BEGIN:VEVENT").Length - 1);
+ }
+
+ [Theory]
+ [InlineData("Asia/Seoul\nX-INJECT:1")]
+ [InlineData("Asia/Seoul\rX-INJECT:1")]
+ [InlineData("Asia/Seoul:X")]
+ [InlineData("Asia/Seoul;X")]
+ [InlineData("Asia/Seoul\"X")]
+ public async Task Invalid_timezone_cell_is_discarded_for_dates_and_definitions(string timezone)
+ {
+ var text = await File.ReadAllTextAsync(await Convert(Csv(["Title", "Start", "Time zone"],
+ ["Safe", "2026-10-21T09:00:00+09:00", timezone]), "csv", "ics"),
+ TestContext.Current.CancellationToken);
+ Assert.DoesNotContain("TZID", text);
+ Assert.DoesNotContain("VTIMEZONE", text);
+ Assert.Contains("SUMMARY:Safe\r\nDTSTART:20261021T000000Z", text);
+ Assert.Equal(1, text.Split("BEGIN:VEVENT").Length - 1);
+ }
+
+ [Fact]
+ public async Task Invalid_timezone_cannot_borrow_another_events_valid_zone()
+ {
+ var text = (await File.ReadAllTextAsync(await Convert(Csv(
+ ["Title", "Start", "Time zone"],
+ ["Valid", "2026-10-21T09:00:00+09:00", "Asia/Seoul"],
+ ["Invalid", "2026-10-21T09:00:00+09:00", "Asia/Seoul;X"]),
+ "csv", "ics"), TestContext.Current.CancellationToken)).Replace("\r\n ", "");
+ Assert.Contains("BEGIN:VTIMEZONE\r\nTZID:Asia/Seoul", text);
+ Assert.Contains("SUMMARY:Valid\r\nDTSTART;TZID=Asia/Seoul:20261021T090000", text);
+ Assert.Contains("SUMMARY:Invalid\r\nDTSTART:20261021T000000Z", text);
+ }
+
+ [Fact]
+ public async Task Recurrence_id_accepts_only_its_own_content_lines()
+ {
+ var text = (await File.ReadAllTextAsync(await Convert(Csv(["Title", "Start", "Recurrence ID"],
+ ["Safe", "2026-10-21", "RECURRENCE-ID;TZID=Asia/Seoul:20261021T090000\nX-INJECT:1"
+ + "\rrecurrence-id:20261022T090000Z\r\nRECURRENCE-IDX:20261023T090000Z"]),
+ "csv", "ics"), TestContext.Current.CancellationToken)).Replace("\r\n ", "");
+ Assert.Contains("RECURRENCE-ID;TZID=Asia/Seoul:20261021T090000\r\n", text);
+ Assert.Contains("recurrence-id:20261022T090000Z\r\n", text);
+ Assert.DoesNotContain("X-INJECT", text);
+ Assert.DoesNotContain("RECURRENCE-IDX", text);
+ }
+
+ [Fact]
+ public async Task People_remove_quotes_and_line_breaks_without_new_content_lines()
+ {
+ var text = (await File.ReadAllTextAsync(await Convert(Csv(
+ ["Title", "Start", "Organizer", "Attendees"],
+ ["Safe", "2026-10-21", "Lee\r\nX-INJECT:1, B <[email protected]>",
+ "Kim \"A\", B <[email protected]>\r\nPark\rInjected, C <[email protected]>"]),
+ "csv", "ics"), TestContext.Current.CancellationToken)).Replace("\r\n ", "");
+ Assert.Contains("ORGANIZER;CN=\"LeeX-INJECT:1, B\":mailto:[email protected]\r\n", text);
+ Assert.Contains("ATTENDEE;CN=\"Kim A, B\":mailto:[email protected]\r\n", text);
+ Assert.Contains("ATTENDEE;CN=\"ParkInjected, C\":mailto:[email protected]\r\n", text);
+ Assert.DoesNotContain("\r\nX-INJECT:", text);
+ Assert.DoesNotContain("\r\nInjected,", text);
+ Assert.Equal(2, text.Split("ATTENDEE;").Length - 1);
+ }
+
[Fact]
public async Task Long_combining_sequence_folds_within_seventy_five_octets_and_roundtrips()
{