View | Details | Raw Unified | Return to bug 6549
Collapse All | Expand All

(-)/usr/share/perl5/Mail/SpamAssassin/Message/Metadata/Received.pm.bak (-4 / +19 lines)
Lines 411-422 Link Here
411
      $envfrom = $1;
411
      $envfrom = $1;
412
    }
412
    }
413
413
414
    # bug 3236: ignore Squirrelmail injection steps.
414
    # bug 3236: deal with Squirrelmail injection steps.
415
    # see also bugs 4008, 2462 and particularly 3302
415
    # from 142.169.110.122 (SquirrelMail authenticated user synapse) by
416
    # from 142.169.110.122 (SquirrelMail authenticated user synapse) by
416
    # mail.nomis80.org with HTTP; Sat, 3 Apr 2004 10:33:43 -0500 (EST)
417
    # mail.nomis80.org with HTTP; Sat, 3 Apr 2004 10:33:43 -0500 (EST)
417
    if (/ \(SquirrelMail authenticated user /) {
418
418
      dbg("received-header: ignored SquirrelMail injection: $_");
419
    #Received: from 212.116.219.52 (proxying for 41.220.75.3)
419
      return 0;
420
    #   (SquirrelMail authenticated user u159201872)
421
    #   by webmail.telia.dk with HTTP;
422
    #   Wed, 24 Jun 2009 08:24:44 +0200 (CEST)
423
424
    if (/\(SquirrelMail authenticated user / && /by (\S+) with (HTTP)/)  {
425
      $by = $1; $auth = $2;
426
      if (/\(proxying for (${IP_ADDRESS})/) {
427
          $ip = $1;
428
      } elsif (/^(${IP_ADDRESS})\s+\(SquirrelMail/) {
429
          $ip = $1;
430
      } else {
431
          dbg("received-header: ignored SquirrelMail injection: $_");
432
          return 0;
433
      }
434
      goto enough;
420
    }
435
    }
421
436
422
    # AOL WebMail headers
437
    # AOL WebMail headers

Return to bug 6549