From 2ce6e4924e932ad03cb6f05af497a3c8b8c3b994 Mon Sep 17 00:00:00 2001 From: 0z5a Date: Sun, 22 Nov 2026 00:13:47 +0100 Subject: [PATCH] Apply numeric UTC offsets when parsing timestamps ConvertTimestampStringToTimePoint only used TimeGM for timestamps the parser recognised as UTC. A numeric offset such as +01:00 or -0500 fell through to std::mktime, which reads the fields as local time and never applies the offset, so the result depended on the process's zone. Read the parsed offset for ISO 8601, ISO 8601 basic and RFC 822 and subtract it from the TimeGM result. Anything that is not a numeric offset still takes the existing mktime path. See #4006. --- ...ugfix-fix-datetime-numeric-utc-offset.json | 6 +++ .../source/utils/DateTimeCommon.cpp | 53 ++++++++++++++++--- .../utils/DateTimeTest.cpp | 18 +++++++ 3 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 .changelog/bugfix-fix-datetime-numeric-utc-offset.json diff --git a/.changelog/bugfix-fix-datetime-numeric-utc-offset.json b/.changelog/bugfix-fix-datetime-numeric-utc-offset.json new file mode 100644 index 00000000000..ec3828cb321 --- /dev/null +++ b/.changelog/bugfix-fix-datetime-numeric-utc-offset.json @@ -0,0 +1,6 @@ +{ + "type": "bugfix", + "category": "aws-cpp-sdk-core", + "contributor": "0z5a", + "description": "Apply numeric UTC offsets when parsing ISO 8601, ISO 8601 basic and RFC 822 timestamps instead of reading them as local time ([#4006](https://github.com/aws/aws-sdk-cpp/issues/4006))" +} diff --git a/src/aws-cpp-sdk-core/source/utils/DateTimeCommon.cpp b/src/aws-cpp-sdk-core/source/utils/DateTimeCommon.cpp index 3204e94c8ba..6fc97dc3f1a 100644 --- a/src/aws-cpp-sdk-core/source/utils/DateTimeCommon.cpp +++ b/src/aws-cpp-sdk-core/source/utils/DateTimeCommon.cpp @@ -399,6 +399,34 @@ class DateParser bool ShouldIAssumeThisIsUTC() const { return m_utcAssumed; } const char* GetParsedTimezone() const { return m_tz; } + // Reads a numeric UTC offset ("+hh", "+hhmm" or "+hh:mm") from the parsed timezone, in seconds east of UTC. + bool GetNumericUtcOffset(int& offsetSeconds) const { + if (m_tz[0] != '+' && m_tz[0] != '-') { + return false; + } + + const char* digits = m_tz + 1; + size_t len = strlen(digits); + bool hasMinutes = len == 4 || (len == 5 && digits[2] == ':'); + if (len != 2 && !hasMinutes) { + return false; + } + + const char* minuteDigits = digits + len - 2; + if (!isdigit(digits[0]) || !isdigit(digits[1]) || (hasMinutes && (!isdigit(minuteDigits[0]) || !isdigit(minuteDigits[1])))) { + return false; + } + + int hours = (digits[0] - '0') * 10 + (digits[1] - '0'); + int minutes = hasMinutes ? (minuteDigits[0] - '0') * 10 + (minuteDigits[1] - '0') : 0; + if (hours > 23 || minutes > 59) { + return false; + } + + offsetSeconds = (hours * 3600 + minutes * 60) * (m_tz[0] == '-' ? -1 : 1); + return true; + } + protected: bool m_error; const char* m_toParse; @@ -1457,6 +1485,8 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm { std::tm timeStruct; bool isUtc = true; + bool hasUtcOffset = false; + int utcOffsetSeconds = 0; int milliseconds = 0; switch (format) @@ -1467,6 +1497,7 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm parser.Parse(); m_valid = parser.WasParseSuccessful(); isUtc = parser.ShouldIAssumeThisIsUTC(); + hasUtcOffset = parser.GetNumericUtcOffset(utcOffsetSeconds); timeStruct = parser.GetParsedTimestamp(); break; } @@ -1476,6 +1507,7 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm parser.Parse(); m_valid = parser.WasParseSuccessful(); isUtc = parser.ShouldIAssumeThisIsUTC(); + hasUtcOffset = parser.GetNumericUtcOffset(utcOffsetSeconds); timeStruct = parser.GetParsedTimestamp(); milliseconds = parser.GetParsedMilliseconds(); break; @@ -1486,6 +1518,7 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm parser.Parse(); m_valid = parser.WasParseSuccessful(); isUtc = parser.ShouldIAssumeThisIsUTC(); + hasUtcOffset = parser.GetNumericUtcOffset(utcOffsetSeconds); timeStruct = parser.GetParsedTimestamp(); milliseconds = parser.GetParsedMilliseconds(); break; @@ -1498,6 +1531,7 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm { m_valid = true; isUtc = rfcParser.ShouldIAssumeThisIsUTC(); + hasUtcOffset = rfcParser.GetNumericUtcOffset(utcOffsetSeconds); timeStruct = rfcParser.GetParsedTimestamp(); break; } @@ -1507,6 +1541,7 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm { m_valid = true; isUtc = isoParser.ShouldIAssumeThisIsUTC(); + hasUtcOffset = isoParser.GetNumericUtcOffset(utcOffsetSeconds); timeStruct = isoParser.GetParsedTimestamp(); milliseconds = isoParser.GetParsedMilliseconds(); break; @@ -1517,6 +1552,7 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm { m_valid = true; isUtc = isoBasicParser.ShouldIAssumeThisIsUTC(); + hasUtcOffset = isoBasicParser.GetNumericUtcOffset(utcOffsetSeconds); timeStruct = isoBasicParser.GetParsedTimestamp(); milliseconds = isoBasicParser.GetParsedMilliseconds(); break; @@ -1531,14 +1567,15 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm if (m_valid) { std::time_t tt; - if(isUtc) - { - tt = Aws::Time::TimeGM(&timeStruct); - } - else - { - AWS_LOGSTREAM_ERROR(CLASS_TAG, "Non-UTC timestamp detected. This is always a bug. Make the world a better place and fix whatever sent you this timestamp: " << timestamp) - tt = std::mktime(&timeStruct); + if (isUtc || hasUtcOffset) { + // With a numeric offset the parsed fields are local time at that offset, so take it off to get UTC. + tt = Aws::Time::TimeGM(&timeStruct) - utcOffsetSeconds; + } else { + AWS_LOGSTREAM_ERROR( + CLASS_TAG, + "Non-UTC timestamp detected. This is always a bug. Make the world a better place and fix whatever sent you this timestamp: " + << timestamp) + tt = std::mktime(&timeStruct); } if (IsSecondsSinceEpochRepresentable(tt)) diff --git a/tests/aws-cpp-sdk-core-tests/utils/DateTimeTest.cpp b/tests/aws-cpp-sdk-core-tests/utils/DateTimeTest.cpp index ad263019668..8b018165acc 100644 --- a/tests/aws-cpp-sdk-core-tests/utils/DateTimeTest.cpp +++ b/tests/aws-cpp-sdk-core-tests/utils/DateTimeTest.cpp @@ -228,6 +228,24 @@ TEST_F(DateTimeTest, TestISO_8601BasicParsing) ASSERT_EQ(gmtDate, DateTime(utcOffsetVersion, DateFormat::ISO_8601_BASIC)); } +TEST_F(DateTimeTest, TestParsingWithNonZeroUtcOffset) { + // Same instant as the Smithy DatetimeOffsets protocol tests, written with different offsets. + DateTime gmtDate("2019-12-16T23:48:18Z", DateFormat::ISO_8601); + ASSERT_TRUE(gmtDate.WasParseSuccessful()); + ASSERT_EQ(1576540098, gmtDate.Seconds()); + + ASSERT_EQ(gmtDate, DateTime("2019-12-16T22:48:18-01:00", DateFormat::ISO_8601)); + ASSERT_EQ(gmtDate, DateTime("2019-12-17T00:48:18+01:00", DateFormat::ISO_8601)); + ASSERT_EQ(gmtDate, DateTime("2019-12-17T05:18:18+05:30", DateFormat::ISO_8601)); + ASSERT_EQ(gmtDate, DateTime("2019-12-16T23:48:18-00:00", DateFormat::ISO_8601)); + ASSERT_EQ(gmtDate, DateTime("2019-12-16T23:48:18+0000", DateFormat::ISO_8601)); + ASSERT_EQ(gmtDate, DateTime("2019-12-16T13:48:18.000-10:00", DateFormat::ISO_8601)); + ASSERT_EQ(gmtDate, DateTime("20191217T004818+0100", DateFormat::ISO_8601_BASIC)); + ASSERT_EQ(gmtDate, DateTime("Tue, 17 Dec 2019 00:48:18 +0100", DateFormat::RFC822)); + ASSERT_EQ(gmtDate, DateTime("Mon, 16 Dec 2019 18:48:18 -0500", DateFormat::RFC822)); + ASSERT_EQ(gmtDate, DateTime("2019-12-17T00:48:18+01:00", DateFormat::AutoDetect)); +} + TEST_F(DateTimeTest, TestISO_8601ParsingMSPrecision) { const char* gmtDateStr = "2002-10-02T08:05:09.000Z";