From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 71F241FAEB for ; Fri, 30 Mar 2018 01:20:50 +0000 (UTC) From: "Eric Wong (Contractor, The Linux Foundation)" To: meta@public-inbox.org Subject: [PATCH 8/9] msgtime: parse 3-digit years properly Date: Fri, 30 Mar 2018 01:20:47 +0000 Message-Id: <20180330012048.15985-9-e@80x24.org> In-Reply-To: <20180330012048.15985-1-e@80x24.org> References: <20180330012048.15985-1-e@80x24.org> List-Id: Some folks had bad mail clients which generated 3-digit years around Y2K... --- MANIFEST | 1 + lib/PublicInbox/MsgTime.pm | 3 +++ t/time.t | 28 ++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 t/time.t diff --git a/MANIFEST b/MANIFEST index ad145f7..4a1096d 100644 --- a/MANIFEST +++ b/MANIFEST @@ -185,6 +185,7 @@ t/spamcheck_spamc.t t/spawn.t t/thread-all.t t/thread-cycle.t +t/time.t t/utf8.mbox t/v2mda.t t/v2reindex.t diff --git a/lib/PublicInbox/MsgTime.pm b/lib/PublicInbox/MsgTime.pm index 4295e87..c67a41f 100644 --- a/lib/PublicInbox/MsgTime.pm +++ b/lib/PublicInbox/MsgTime.pm @@ -47,6 +47,9 @@ sub msg_date_only ($) { my ($ts, $zone); foreach my $d (@date) { $zone = undef; + # Y2K problems: 3-digit years + $d =~ s!([A-Za-z]{3}) (\d{3}) (\d\d:\d\d:\d\d)! + my $yyyy = $2 + 1900; "$1 $yyyy $3"!e; $ts = eval { str2time($d) }; if ($@) { my $mid = $hdr->header_raw('Message-ID'); diff --git a/t/time.t b/t/time.t new file mode 100644 index 0000000..370a0bd --- /dev/null +++ b/t/time.t @@ -0,0 +1,28 @@ +# Copyright (C) 2018 all contributors +# License: AGPL-3.0+ +use strict; +use warnings; +use Test::More; +use_ok 'PublicInbox::MIME'; +use PublicInbox::MsgTime qw(msg_datestamp); +my $mime = PublicInbox::MIME->create( + header => [ + From => 'a@example.com', + To => 'test@example.com', + Subject => 'this is a subject', + 'Message-ID' => '', + Date => 'Fri, 02 Oct 93 00:00:00 +0000', + ], + body => "hello world\n", +); + +my $ts = msg_datestamp($mime->header_obj); +use POSIX qw(strftime); +is(strftime('%Y-%m-%d %H:%M:%S', gmtime($ts)), '1993-10-02 00:00:00', + 'got expected date with 2 digit year'); +$mime->header_set(Date => 'Fri, 02 Oct 101 01:02:03 +0000'); +$ts = msg_datestamp($mime->header_obj); +is(strftime('%Y-%m-%d %H:%M:%S', gmtime($ts)), '2001-10-02 01:02:03', + 'got expected date with 3 digit year'); + +done_testing(); -- EW