2 Commits

Author SHA1 Message Date
alexei.dolgolyov 42e62c1ed2 fix(journal): stop bet edits silently un-settling graded bets
A stake/notes-only edit re-graded from Pending, which un-settled a won/lost
bet once its result row had been pruned by snapshot retention (the journal is
FK-free and outlives results). Now only re-grade when the selection or event
actually changed, or the bet is still Pending — mirroring RecordPlacedBet.
2026-05-29 13:57:23 +03:00
alexei.dolgolyov 08486667c3 fix(export): neutralize CSV/DDE formula injection in exported text
Exported journal notes and scraped event titles could begin with a formula
trigger (= + - @, tab, CR) that Excel/LibreOffice execute on open.
Csv.NeutralizeFormula apostrophe-prefixes such cells so they render as text;
applied to user notes, raw event ids and scraped titles. Numeric/date cells
the exporter formats itself stay numeric for downstream analysis.
2026-05-29 13:57:18 +03:00
6 changed files with 124 additions and 12 deletions
+15
View File
@@ -44,4 +44,19 @@ public static class Csv
return value;
return "\"" + value.Replace("\"", "\"\"") + "\"";
}
/// <summary>
/// Defuses spreadsheet formula / DDE injection: when a cell would start with a formula
/// trigger (<c>= + - @</c>, tab or CR) it is prefixed with an apostrophe so Excel /
/// LibreOffice render it as text. Apply to USER-supplied or SCRAPED text fields (notes,
/// event titles) before they enter a row — numeric/date cells your own code formats are
/// trusted and don't need it (keeping them numeric for analysis).
/// </summary>
public static string NeutralizeFormula(string? field)
{
var value = field ?? string.Empty;
return value.Length > 0 && value[0] is '=' or '+' or '-' or '@' or '\t' or '\r'
? "'" + value
: value;
}
}
@@ -60,7 +60,7 @@ public sealed class ExportToCsvUseCase
{
b.PlacedAt.ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture),
Title(titles, b.EventId),
b.EventId.Value,
Csv.NeutralizeFormula(b.EventId.Value),
b.Selection.Type.ToString(),
b.Selection.Side.ToString(),
b.Selection.Value?.Value.ToString(CultureInfo.InvariantCulture) ?? string.Empty,
@@ -68,7 +68,7 @@ public sealed class ExportToCsvUseCase
b.Stake.ToString(CultureInfo.InvariantCulture),
b.Outcome.ToString(),
b.NetProfit?.ToString(CultureInfo.InvariantCulture) ?? string.Empty,
b.Notes ?? string.Empty,
Csv.NeutralizeFormula(b.Notes),
});
return await WriteAsync("journal", Csv.Document(header, rows), ct).ConfigureAwait(false);
@@ -93,7 +93,7 @@ public sealed class ExportToCsvUseCase
{
b.OpenedAt.ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture),
Title(titles, b.EventId),
b.EventId.Value,
Csv.NeutralizeFormula(b.EventId.Value),
b.PickedSide.ToString(),
b.Rate.ToString(CultureInfo.InvariantCulture),
b.Stake.ToString(CultureInfo.InvariantCulture),
@@ -127,6 +127,8 @@ public sealed class ExportToCsvUseCase
return titles;
}
// Titles are scraped ("Side1 vs Side2") so they're treated as untrusted text and
// neutralized against CSV/formula injection.
private static string Title(IReadOnlyDictionary<DomainEventId, string> titles, DomainEventId id) =>
titles.TryGetValue(id, out var t) ? t : id.Value;
Csv.NeutralizeFormula(titles.TryGetValue(id, out var t) ? t : id.Value);
}
@@ -55,23 +55,33 @@ public sealed class UpdatePlacedBetUseCase
"The event must already be present in the scrape store.");
}
// Preserve the original entry time; re-grade from Pending so a changed
// selection/event settles against the current result.
// Only the selection or the event affects grading. When neither changed (e.g. a
// stake/notes-only edit) keep the existing outcome — re-grading from Pending here
// would SILENTLY UN-SETTLE a won/lost bet whose result row has since been pruned by
// snapshot retention (the journal is FK-free and outlives result pruning). A
// still-Pending bet is always (re)graded, mirroring RecordPlacedBetUseCase.
var gradingInputChanged = !existing.EventId.Equals(eventId)
|| !existing.Selection.Equals(selection);
var regrade = gradingInputChanged || existing.Outcome == BetOutcome.Pending;
var toPersist = new PlacedBet(
Id: id,
EventId: eventId,
Selection: selection,
Stake: stake,
PlacedAt: existing.PlacedAt,
Outcome: BetOutcome.Pending,
Outcome: regrade ? BetOutcome.Pending : existing.Outcome,
Notes: notes);
var result = await _results.GetAsync(eventId, ct).ConfigureAwait(false);
if (result is not null)
if (regrade)
{
var graded = Marathon.Domain.Betting.BetOutcomeResolver.Resolve(toPersist.Selection, result);
if (graded is not null)
toPersist = toPersist.WithOutcome(graded.Value);
var result = await _results.GetAsync(eventId, ct).ConfigureAwait(false);
if (result is not null)
{
var graded = Marathon.Domain.Betting.BetOutcomeResolver.Resolve(toPersist.Selection, result);
if (graded is not null)
toPersist = toPersist.WithOutcome(graded.Value);
}
}
await _bets.UpdateAsync(toPersist, ct).ConfigureAwait(false);
@@ -38,4 +38,32 @@ public sealed class CsvTests
"Kelly,ok\r\n" +
"\"Flat, fixed\",\"say \"\"hi\"\"\"\r\n");
}
[Theory]
[InlineData("=cmd|'/c calc'!A1")]
[InlineData("+1+1")]
[InlineData("-2+3")]
[InlineData("@SUM(A1)")]
[InlineData("\ttab")]
[InlineData("\rcr")]
public void NeutralizeFormula_PrefixesLeadingFormulaTriggers(string dangerous)
{
Csv.NeutralizeFormula(dangerous).Should().Be("'" + dangerous);
}
[Theory]
[InlineData("Home vs Away")]
[InlineData("normal note")]
[InlineData("3-1 win")]
[InlineData("")]
public void NeutralizeFormula_LeavesSafeValuesUntouched(string safe)
{
Csv.NeutralizeFormula(safe).Should().Be(safe);
}
[Fact]
public void NeutralizeFormula_Null_IsEmpty()
{
Csv.NeutralizeFormula(null).Should().BeEmpty();
}
}
@@ -74,6 +74,27 @@ public sealed class ExportToCsvUseCaseTests : IDisposable
content.Should().Contain("evt-1");
}
[Fact]
public async Task ExportJournalAsync_NeutralizesFormulaInjection_InNotes()
{
var bet = new PlacedBet(
Guid.NewGuid(),
new EventId("evt-1"),
new Bet(MatchScope.Instance, BetType.Win, Side.Side1, null, new OddsRate(2.0m)),
100m, T0, BetOutcome.Pending, "=cmd|'/c calc'!A1");
_bets.ListAsync(Arg.Any<CancellationToken>()).Returns(new[] { bet });
_events.GetManyAsync(Arg.Any<IReadOnlyCollection<EventId>>(), Arg.Any<CancellationToken>())
.Returns(new Dictionary<EventId, Event>());
var path = await CreateSut().ExportJournalAsync();
var content = await File.ReadAllTextAsync(path!);
// The dangerous note is apostrophe-prefixed so no cell opens as a live formula in
// Excel; it sits in the last column, preceded by the CSV separator.
content.Should().Contain(",'=cmd");
content.Should().NotContain(",=cmd");
}
[Fact]
public async Task ExportPaperLedgerAsync_ReturnsNull_When_NoBets()
{
@@ -82,4 +82,40 @@ public sealed class UpdatePlacedBetUseCaseTests
Arg.Any<CancellationToken>());
await _bets.Received(1).SaveChangesAsync(Arg.Any<CancellationToken>());
}
[Fact]
public async Task NotesOnlyEdit_PreservesSettledOutcome_EvenWhenResultPruned()
{
var id = Guid.NewGuid();
var eid = new EventId("evt-1");
var sameSelection = Selection(side: Side.Side1, rate: 2.0m);
var settledWon = new PlacedBet(id, eid, sameSelection, 50m, PlacedAt, BetOutcome.Won, "old");
_bets.GetAsync(id, Arg.Any<CancellationToken>()).Returns(settledWon);
_events.GetAsync(eid, Arg.Any<CancellationToken>()).Returns(Ev(eid));
// Result row has been pruned by retention.
_results.GetAsync(eid, Arg.Any<CancellationToken>()).Returns((EventResult?)null);
// Same selection/event — only the note changes.
var updated = await CreateSut().ExecuteAsync(id, eid, sameSelection, stake: 50m, notes: "new note");
updated.Outcome.Should().Be(BetOutcome.Won); // NOT silently reset to Pending
updated.Notes.Should().Be("new note");
}
[Fact]
public async Task ChangedSelection_WithNoResult_ResetsToPending()
{
var id = Guid.NewGuid();
var eid = new EventId("evt-1");
var settledWon = new PlacedBet(id, eid, Selection(side: Side.Side1, rate: 2.0m), 50m, PlacedAt, BetOutcome.Won, "old");
_bets.GetAsync(id, Arg.Any<CancellationToken>()).Returns(settledWon);
_events.GetAsync(eid, Arg.Any<CancellationToken>()).Returns(Ev(eid));
_results.GetAsync(eid, Arg.Any<CancellationToken>()).Returns((EventResult?)null);
// Selection changed (Side1 → Side2) but no result to grade against → must be Pending,
// never the now-stale Won.
var updated = await CreateSut().ExecuteAsync(id, eid, Selection(side: Side.Side2, rate: 3.0m), stake: 50m, notes: "old");
updated.Outcome.Should().Be(BetOutcome.Pending);
}
}