Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DateTimeParser Validation and Performance Improvements #4593

Merged
merged 5 commits into from
Jun 29, 2024
Merged

DateTimeParser Validation and Performance Improvements #4593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f399dd
DateTimeParser Improvements
andrewauclair Jun 25, 2024
5d3d19a
DateTimeParser Validation
andrewauclair Jun 25, 2024
85b3c34
Fix CodeQL Issues
andrewauclair Jun 25, 2024
00c6f94
Fix Naming
andrewauclair Jun 26, 2024
325f35e
Removing REGEX_LIST
andrewauclair Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Foundation/include/Poco/DateTimeFormat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ class Foundation_API DateTimeFormat
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;
Expand Down
34 changes: 16 additions & 18 deletions Foundation/src/DateTimeFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,6 @@ const std::string DateTimeFormat::MONTH_NAMES[] =
};


DateTimeFormat::RegexList DateTimeFormat::REGEX_LIST =
{
&DateTimeFormat::ISO8601_REGEX,
&DateTimeFormat::RFC822_REGEX,
&DateTimeFormat::RFC1123_REGEX,
&DateTimeFormat::HTTP_REGEX,
&DateTimeFormat::RFC850_REGEX,
&DateTimeFormat::RFC1036_REGEX,
&DateTimeFormat::ASCTIME_REGEX,
&DateTimeFormat::SORTABLE_REGEX
};


bool DateTimeFormat::hasFormat(const std::string& fmt)
{
return FORMAT_LIST.find(fmt) != FORMAT_LIST.end();
Expand All @@ -150,11 +137,22 @@ bool DateTimeFormat::hasFormat(const std::string& fmt)

bool DateTimeFormat::isValid(const std::string& dateTime)
{
for (const auto& f : REGEX_LIST)
{
if (RegularExpression(*f).match(dateTime)) return true;
}
return false;
static const RegularExpression regexList[] = {
RegularExpression(DateTimeFormat::ISO8601_REGEX),
RegularExpression(DateTimeFormat::RFC822_REGEX),
RegularExpression(DateTimeFormat::RFC1123_REGEX),
RegularExpression(DateTimeFormat::HTTP_REGEX),
RegularExpression(DateTimeFormat::RFC850_REGEX),
RegularExpression(DateTimeFormat::RFC1036_REGEX),
RegularExpression(DateTimeFormat::ASCTIME_REGEX),
RegularExpression(DateTimeFormat::SORTABLE_REGEX)
};

for (const auto& f : regexList)
{
if (f.match(dateTime)) return true;
}
return false;
}


Expand Down
230 changes: 176 additions & 54 deletions Foundation/src/DateTimeParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,140 @@
#include "Poco/Exception.h"
#include "Poco/Ascii.h"
#include "Poco/String.h"
#include <iostream>

namespace {
using ParseIter = std::string::const_iterator;

namespace Poco {
[[nodiscard]] ParseIter skipNonDigits(ParseIter it, ParseIter end)
{
while (it != end && !Poco::Ascii::isDigit(*it))
{
++it;
}
return it;
}


#define SKIP_JUNK() \
while (it != end && !Ascii::isDigit(*it)) ++it
[[nodiscard]] ParseIter skipDigits(ParseIter it, ParseIter end)
{
while (it != end && Poco::Ascii::isDigit(*it))
{
++it;
}
return it;
}


#define SKIP_DIGITS() \
while (it != end && Ascii::isDigit(*it)) ++it
int parseNumberN(const std::string& dtStr, ParseIter& it, ParseIter end, int n)
{
ParseIter numStart = end;
int i = 0;

for (; it != end && i < n && Poco::Ascii::isDigit(*it); ++it, ++i)
{
if (numStart == end)
{
numStart = it;
}
}

#define PARSE_NUMBER(var) \
while (it != end && Ascii::isDigit(*it)) var = var*10 + ((*it++) - '0')
if (numStart == end)
{
throw Poco::SyntaxException("Invalid DateTimeString: " + dtStr + ", No number found to parse");
}

std::string number(numStart, it);
try
{
return std::stoi(number);
}
catch(const std::exception& e)
{
throw Poco::SyntaxException("Invalid DateTimeString: " + dtStr + ", invalid number: " + number);
}
}
}

#define PARSE_NUMBER_N(var, n) \
{ int i = 0; while (i++ < n && it != end && Ascii::isDigit(*it)) var = var*10 + ((*it++) - '0'); }
namespace Poco {


#define PARSE_FRACTIONAL_N(var, n) \
{ int i = 0; while (i < n && it != end && Ascii::isDigit(*it)) { var = var*10 + ((*it++) - '0'); i++; } while (i++ < n) var *= 10; }
void DateTimeParser::parse(const std::string& fmt, const std::string& dtStr, DateTime& dateTime, int& timeZoneDifferential)
{
const auto str = Poco::trim(dtStr);

if (fmt.empty() || str.empty())
{
throw SyntaxException("Invalid DateTimeString: " + dtStr);
}
else if (DateTimeFormat::hasFormat(fmt) && !DateTimeFormat::isValid(str))
{
throw SyntaxException("Invalid DateTimeString: " + dtStr);
}

const auto parse_number = [&dtStr](ParseIter& it, ParseIter end)
{
ParseIter numStart = end;

inline std::string cleanedInputString(const std::string& str)
{
return Poco::trim(str);
}
for (; it != end && Poco::Ascii::isDigit(*it); ++it)
{
if (numStart == end)
{
numStart = it;
}
}

void DateTimeParser::parse(const std::string& fmt, const std::string& dtStr, DateTime& dateTime, int& timeZoneDifferential)
{
const auto str = cleanedInputString(dtStr);
if (numStart == end)
{
throw Poco::SyntaxException("Invalid DateTimeString: " + dtStr + ", No number found to parse");
}

std::string number(numStart, it);
try
{
return std::stoi(number);
}
catch(const std::exception& e)
{
throw SyntaxException("Invalid DateTimeString: " + dtStr + ", invalid number: " + number);
}
};



if (fmt.empty() || str.empty() || (DateTimeFormat::hasFormat(fmt) && !DateTimeFormat::isValid(str)))
throw SyntaxException("Invalid DateTimeString:" + dtStr);
const auto parseFractionalN = [dtStr](ParseIter& it, ParseIter end, int n)
{
ParseIter numStart = end;
int i = 0;

for (; it != end && i < n && Poco::Ascii::isDigit(*it); ++it, ++i)
{
if (numStart == end)
{
numStart = it;
}
}

if (numStart == end)
{
return 0;
}

std::string number(numStart, it);
int result = 0;
try
{
result = std::stoi(number);
}
catch(const std::exception& e)
{
throw SyntaxException("Invalid DateTimeString: " + dtStr + ", invalid number: " + number);
}

while (i++ < n) result *= 10;

return result;
};

int year = 0;
int month = 0;
Expand Down Expand Up @@ -81,8 +179,8 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& dtStr, Dat
{
switch (*itf)
{
case 'w':
case 'W':
case 'w': // Weekday, abbreviated
case 'W': // Weekday
while (it != end && Ascii::isSpace(*it)) ++it;
while (it != end && Ascii::isAlpha(*it)) ++it;
break;
Expand All @@ -94,32 +192,33 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& dtStr, Dat
case 'd':
case 'e':
case 'f':
SKIP_JUNK();
PARSE_NUMBER_N(day, 2);
it = skipNonDigits(it, end);
day = parseNumberN(dtStr, it, end, 2);
dayParsed = true;
break;
case 'm':
case 'n':
case 'o':
SKIP_JUNK();
PARSE_NUMBER_N(month, 2);
it = skipNonDigits(it, end);
month = parseNumberN(dtStr, it, end, 2);
monthParsed = true;
break;
case 'y':
SKIP_JUNK();
PARSE_NUMBER_N(year, 2);
it = skipNonDigits(it, end);
year = parseNumberN(dtStr, it, end, 2);
if (year >= 69)
year += 1900;
else
year += 2000;
break;
case 'Y':
SKIP_JUNK();
PARSE_NUMBER_N(year, 4);
it = skipNonDigits(it, end);
year = parseNumberN(dtStr, it, end, 4);
break;
case 'r':
SKIP_JUNK();
PARSE_NUMBER(year);
it = skipNonDigits(it, end);
year = parse_number(it, end);

if (year < 1000)
{
if (year >= 69)
Expand All @@ -130,46 +229,53 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& dtStr, Dat
break;
case 'H':
case 'h':
SKIP_JUNK();
PARSE_NUMBER_N(hour, 2);
it = skipNonDigits(it, end);
hour = parseNumberN(dtStr, it, end, 2);
break;
case 'a':
case 'A':
hour = parseAMPM(it, end, hour);
break;
case 'M':
SKIP_JUNK();
PARSE_NUMBER_N(minute, 2);
it = skipNonDigits(it, end);
minute = parseNumberN(dtStr, it, end, 2);
break;
case 'S':
SKIP_JUNK();
PARSE_NUMBER_N(second, 2);
it = skipNonDigits(it, end);
second = parseNumberN(dtStr, it, end, 2);
break;
case 's':
SKIP_JUNK();
PARSE_NUMBER_N(second, 2);
it = skipNonDigits(it, end);
second = parseNumberN(dtStr, it, end, 2);

if (it != end && (*it == '.' || *it == ','))
{
++it;
PARSE_FRACTIONAL_N(millis, 3);
PARSE_FRACTIONAL_N(micros, 3);
SKIP_DIGITS();

if (it != end && !Ascii::isDigit(*it))
{
throw SyntaxException("Invalid DateTimeString: " + dtStr + ", missing millisecond");
}

millis = parseFractionalN(it, end, 3);
micros = parseFractionalN(it, end, 3);
it = skipDigits(it, end);
}
break;
case 'i':
SKIP_JUNK();
PARSE_NUMBER_N(millis, 3);
it = skipNonDigits(it, end);
millis = parseNumberN(dtStr, it, end, 3);
break;
case 'c':
SKIP_JUNK();
PARSE_NUMBER_N(millis, 1);
it = skipNonDigits(it, end);
millis = parseNumberN(dtStr, it, end, 1);
millis *= 100;
break;
case 'F':
SKIP_JUNK();
PARSE_FRACTIONAL_N(millis, 3);
PARSE_FRACTIONAL_N(micros, 3);
SKIP_DIGITS();
it = skipNonDigits(it, end);
millis = parseNumberN(dtStr, it, end, 3);
micros = parseNumberN(dtStr, it, end, 3);
it = skipDigits(it, end);
break;
case 'z':
case 'Z':
Expand Down Expand Up @@ -233,7 +339,7 @@ DateTime DateTimeParser::parse(const std::string& str, int& timeZoneDifferential

bool DateTimeParser::tryParse(const std::string& dtStr, DateTime& dateTime, int& timeZoneDifferential)
{
const auto str = cleanedInputString(dtStr);
const auto str = Poco::trim(dtStr);

if (str.length() < 4) return false;

Expand Down Expand Up @@ -338,12 +444,28 @@ int DateTimeParser::parseTZD(std::string::const_iterator& it, const std::string:
int sign = *it == '+' ? 1 : -1;
++it;
int hours = 0;
PARSE_NUMBER_N(hours, 2);
try
{
hours = parseNumberN("", it, end, 2);
}
catch(const SyntaxException& e)
{
throw SyntaxException("Timezone invalid number: hours");
}

if (hours < 0 || hours > 23)
throw SyntaxException("Timezone difference hours out of range");
if (it != end && *it == ':') ++it;
int minutes = 0;
PARSE_NUMBER_N(minutes, 2);
try
{
minutes = parseNumberN("", it, end, 2);
}
catch(const SyntaxException& e)
{
throw SyntaxException("Timezone invalid number: minutes");
}

if (minutes < 0 || minutes > 59)
throw SyntaxException("Timezone difference minutes out of range");
tzd += sign*(hours*3600 + minutes*60);
Expand Down
Loading
Loading