generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01:00
Code Issues Projects Releases Wiki Activity

Stricter DateTimeParser for known formats (fixes #569) (#4330)

Browse Source 
* GH #569: Cherry pick and correct code from devel-experimental.

* GH #569: Add missing timezone codes.

* enh(Foundation): DateTimeParser: stricter checks of timezones, more tests for invalid inputs. (#569)

* enh(Foundation): Small fixes of issues detected by CodeQL

---------

Co-authored-by: Alex Fabijanic <alex@pocoproject.org>
This commit is contained in:
Matej Kenda
2023-12-11 14:48:33 +01:00
committed by GitHub
parent 24b7122f43
commit 4f1cf68307
10 changed files with 339 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Foundation/include/Poco/DateTimeFormat.h
View File

@@ -19,16 +19,21 @@
#include "Poco/Foundation.h"
#include <unordered_set>
namespace Poco {
class RegularExpression;
class Foundation_API DateTimeFormat
/// Definition of date/time formats and various
/// constants used by DateTimeFormatter and DateTimeParser.
{
public:
// predefined date formats
static const std::string ISO8601_FORMAT;
/// The date/time format defined in the ISO 8601 standard.
@@ -37,6 +42,8 @@ public:
/// 2005-01-01T12:00:00+01:00
/// 2005-01-01T11:00:00Z
static const std::string ISO8601_REGEX;
static const std::string ISO8601_FRAC_FORMAT;
/// The date/time format defined in the ISO 8601 standard,
/// with fractional seconds.
@@ -52,6 +59,8 @@ public:
/// Sat, 1 Jan 05 12:00:00 +0100
/// Sat, 1 Jan 05 11:00:00 GMT
static const std::string RFC822_REGEX;
static const std::string RFC1123_FORMAT;
/// The date/time format defined in RFC 1123 (obsoletes RFC 822).
///
@@ -59,6 +68,8 @@ public:
/// Sat, 1 Jan 2005 12:00:00 +0100
/// Sat, 1 Jan 2005 11:00:00 GMT
static const std::string RFC1123_REGEX;
static const std::string HTTP_FORMAT;
/// The date/time format defined in the HTTP specification (RFC 2616),
/// which is basically a variant of RFC 1036 with a zero-padded day field.
@@ -67,6 +78,8 @@ public:
/// Sat, 01 Jan 2005 12:00:00 +0100
/// Sat, 01 Jan 2005 11:00:00 GMT
static const std::string HTTP_REGEX;
static const std::string RFC850_FORMAT;
/// The date/time format defined in RFC 850 (obsoleted by RFC 1036).
///
@@ -74,6 +87,8 @@ public:
/// Saturday, 1-Jan-05 12:00:00 +0100
/// Saturday, 1-Jan-05 11:00:00 GMT
static const std::string RFC850_REGEX;
static const std::string RFC1036_FORMAT;
/// The date/time format defined in RFC 1036 (obsoletes RFC 850).
///
@@ -81,18 +96,24 @@ public:
/// Saturday, 1 Jan 05 12:00:00 +0100
/// Saturday, 1 Jan 05 11:00:00 GMT
static const std::string RFC1036_REGEX;
static const std::string ASCTIME_FORMAT;
/// The date/time format produced by the ANSI C asctime() function.
///
/// Example:
/// Sat Jan 1 12:00:00 2005
static const std::string ASCTIME_REGEX;
static const std::string SORTABLE_FORMAT;
/// A simple, sortable date/time format.
///
/// Example:
/// 2005-01-01 12:00:00
static const std::string SORTABLE_REGEX;
// ^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)$
// names used by formatter and parser
static const std::string WEEKDAY_NAMES[7];
@@ -100,6 +121,19 @@ public:
static const std::string MONTH_NAMES[12];
/// English names of months (January, February, ...).
static bool hasFormat(const std::string& fmt);
/// Returns true if fmt is a known standard format.
static bool isValid(const std::string& dateTime);
/// Returns true if dateTime validates against at least one supported format.
typedef std::unordered_set<const std::string*> RegexList;
static RegexList REGEX_LIST;
private:
typedef std::unordered_set<std::string> Formatlist;
static Formatlist FORMAT_LIST;
};