bryzgalov/cf7-spam-to-telegram
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix: phone leak, field-by-value detection, strict Flamingo email fallback

Browse Source 
Three pilot-surfaced issues in one pass:

1. PhoneParser regex used '\s' in the candidate character class, so a
   digit on a following flattened line bled into the phone. '+7977
   6277470\n1' (phone + trailing checkbox value) parsed as 12 digits,
   producing '+797762774701'. Replaced '\s' with a literal space so
   newlines/tabs stop the candidate.

2. Custom-themed forms don't use 'your-name' / 'your-email' keys
   (washanyanya.ru has text-211 / text-212 / name_user). Added
   FieldDetector::find_name + find_email as fallbacks. Classifier
   and MessageFormatter now call them if no standard key matches,
   so 'Александр' in text-211 is recognised as a cyrillic name and
   scored / displayed accordingly.

3. FlamingoHelper copied '_from_email' into 'your-email' without
   validating it. Flamingo derives that meta from whatever field it
   considers "first"; on phone-first forms it ends up holding the
   phone number. Now we only copy _from_email if it contains '@',
   and dropped the _from_name shortcut entirely — FieldDetector
   handles the name via the actual field values.

Tests: +1 FieldDetectorTest (13 cases); +2 PhoneParserTest cases for
newline/tab bleeds; +1 ClassifierTest case; +1 MessageFormatterTest
case for custom field keys. Full suite 53/53 green.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Vladimir Bryzgalov
2026-04-18 00:22:39 +05:00
parent dbdfc9afa9
commit 8efb82ca43
11 changed files with 283 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/PhoneParserTest.php
+18
View File
@@ -72,4 +72,22 @@ final class PhoneParserTest extends TestCase
self::assertSame('+74951234567', $r['e164']);
self::assertTrue($r['is_russian']);
}
public function test_digits_on_next_line_do_not_leak_into_number(): void
{
// Pilot bug: CF7 spam flatten joined values with "\n"; '\s' in the
// candidate regex matched newlines, so '+79776277470\n1' (phone then
// a checkbox value on the next line) turned into a 12-digit number
// ending in 1.
$r = PhoneParser::parse("+79776277470\n1");
self::assertSame('+79776277470', $r['e164']);
self::assertTrue($r['is_russian']);
}
public function test_tab_between_fields_does_not_leak(): void
{
// Same family as above but with tabs.
$r = PhoneParser::parse("89031234567\t1");
self::assertSame('+79031234567', $r['e164']);
}
}