Skip to content
Snippets Groups Projects
Commit 915bd7c7 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Refactor the birthdate parsing logic, add unit test 

The birthdate parsing is now a lot more robust and will recognize all kinds
of variants/formats and use range checks to disambiguate provided dates and
even support partial dates (e.g. year only, year/month and month/year).

The tests should all pass regardless of what the sysop has set for their
system date format in SCFG.

I had considered using sscanf() for the parsing logic but ended up going with
strtoul() only and that seems to be working well (as reflected by the passing
test cases).
parent 44147ffd
Branches
Tags
No related merge requests found
Pipeline #7799 failed
Stage: build
Stage: test
Stage: cleanup
Show whitespace changes
Inline Side-by-side
exec/tests/user/birthdate.js 0 → 100644
+ 50
− 0
View file @ 915bd7c7
// This test requires Synchronet v3.20c or later to pass
const test = {
"50 ": "19500101",
"60.1": "19600101",
"69e1": "19690101",
"12 31 1969": "19691231",
"12.31.1969": "19691231",
"12.31.1969.1": "19691231",
"12-31-1969": "19691231",
"12*31*1969": "19691231",
"12@31#1969": "19691231",
"12%31^1969": "19691231",
"12&31$1969": "19691231",
"12/31/1969": "19691231",
"12/32/1969": "19691231",
"31/12/1969": "19691231",
"1969/12/31": "19691231",
"70": "19700101",
"1970": "19700101",
"19700101": "19700101",
"1/1/70": "19700101",
"01/01/70": "19700101",
"001/001/070": "19700101",
"01/01/1970": "19700101",
"1970/01": "19700101",
"01/1970": "19700101",
"1970/1": "19700101",
"1/1970": "19700101",
"00/00/00": "20000101",
"1": "20010101",
"10": "20100101",
"11/11/11": "20111111", // Nigel Tufnel Day
"12/13": "20131201",
"13/12": "20131201",
"19": "20190101",
// Ambiguous year "20" and higher is a moving target, so don't test
"2038/12/31": "20381231",
"2106/12/31": "21061231",
"3000/01/01": "30000101",
"3000/12/31": "30001231",
}
for (var i in test) {
var u = new User;
u.birthdate = i;
if (u.birthdate != test[i])
throw new Error(format("birthdate='%s' produced '%s' instead of expeced: '%s'"
,i, u.birthdate, test[i]));
}
src/sbbs3/userdat.c
+ 116
− 37
View file @ 915bd7c7
......@@ -897,27 +897,113 @@ int putusername(scfg_t* cfg, int number, const char *name)
return USER_SUCCESS;
}
#define DECVAL(ch, mul) (DEC_CHAR_TO_INT(ch) * (mul))
static int birthdate_year_field(enum date_fmt fmt, int first, int third)
{
switch (fmt) {
case YYMMDD:
return first;
case DDMMYY:
case MMDDYY:
return third;
}
return 0;
}
static int birthdate_month_field(enum date_fmt fmt, int first, int second)
{
switch (fmt) {
case YYMMDD:
case DDMMYY:
return second;
case MMDDYY:
return first;
}
return 0;
}
static int birthdate_day_field(enum date_fmt fmt, int first, int second, int third)
{
switch (fmt) {
case YYMMDD:
return third;
case DDMMYY:
return first;
case MMDDYY:
return second;
}
return 0;
}
enum birth_field { BIRTH_YEAR, BIRTH_MONTH, BIRTH_DAY };
static int split_birthdate(int value, enum birth_field field)
{
switch (field) {
case BIRTH_YEAR:
if (value < 10000)
return value;
return value / 10000;
case BIRTH_MONTH:
if (value < 10000)
return 1;
return (value / 100) % 100;
case BIRTH_DAY:
if (value < 10000)
return 1;
return value % 100;
}
return 0;
}
// Handles field-separated and non-separated bithdate strings
static int parse_birthdate_field(scfg_t* cfg, const char* birth, enum birth_field field)
{
char* next = NULL;
int first;
int second;
int third;
first = strtoul(birth, &next, 10);
if (next == NULL || *next == '\0') // No separators, assume CCYYMMDD or CCYY
return split_birthdate(first, field);
++next;
second = strtoul(next, &next, 10);
if (next == NULL || *next == '\0') { // No 'Day' field provided
if (field == BIRTH_DAY)
return 1;
if (first > 12 || (cfg->sys_date_fmt == YYMMDD && second <= 12))
return field == BIRTH_YEAR ? first : second; // year first
return field == BIRTH_YEAR ? second : first; // month first
}
++next;
third = strtoul(next, NULL, 10);
enum date_fmt fmt = cfg->sys_date_fmt;
if (first > 31)
fmt = YYMMDD;
else if (first > 12)
fmt = DDMMYY;
else if (second > 12)
fmt = MMDDYY;
switch (field) {
case BIRTH_YEAR:
return birthdate_year_field(fmt, first, third);
case BIRTH_MONTH:
return birthdate_month_field(fmt, first, second);
case BIRTH_DAY:
return birthdate_day_field(fmt, first, second, third);
}
return 0;
}
int getbirthyear(scfg_t* cfg, const char* birth)
{
if (IS_DIGIT(birth[2])) // CCYYMMDD format
return DECVAL(birth[0], 1000)
+ DECVAL(birth[1], 100)
+ DECVAL(birth[2], 10)
+ DECVAL(birth[3], 1);
// DD/MM/[CC]YY or [CC]MM/DD/YY format
int year = parse_birthdate_field(cfg, birth, BIRTH_YEAR);
if (year < 100) {
time_t now = time(NULL);
struct tm tm;
if (localtime_r(&now, &tm) == NULL)
return 0;
tm.tm_year += 1900;
int year;
if (cfg->sys_date_fmt == YYMMDD)
year = strtoul(birth, NULL, 10);
else // MMDDYY or DDMMYY
year = strtoul(birth + 6, NULL, 10);
if (year < 100) {
year += 1900;
if (tm.tm_year - year > 105)
year += 100;
......@@ -925,30 +1011,23 @@ int getbirthyear(scfg_t* cfg, const char* birth)
return year;
}
int getbirthmonth(scfg_t* cfg, const char* birth)
static int int_range(int val, int min, int max)
{
if (IS_DIGIT(birth[5])) // CCYYMMDD format
return DECVAL(birth[4], 10) + DECVAL(birth[5], 1);
if (cfg->sys_date_fmt != MMDDYY) { // DD/MM/YY or YY/MM/DD format
return DECVAL(birth[3], 10) + DECVAL(birth[4], 1);
} else { // MM/DD/YY format
return DECVAL(birth[0], 10) + DECVAL(birth[1], 1);
if (val < min)
return min;
if (val > max)
return max;
return val;
}
int getbirthmonth(scfg_t* cfg, const char* birth)
{
return int_range(parse_birthdate_field(cfg, birth, BIRTH_MONTH), 1, 12);
}
int getbirthday(scfg_t* cfg, const char* birth)
{
if (IS_DIGIT(birth[5])) // CCYYMMDD format
return DECVAL(birth[6], 10) + DECVAL(birth[7], 1);
switch (cfg->sys_date_fmt) {
case DDMMYY:
return DECVAL(birth[0], 10) + DECVAL(birth[1], 1);
case MMDDYY:
return DECVAL(birth[3], 10) + DECVAL(birth[4], 1);
case YYMMDD:
return DECVAL(birth[6], 10) + DECVAL(birth[7], 1);
}
return 0;
return int_range(parse_birthdate_field(cfg, birth, BIRTH_DAY), 1, 31);
}
// Always returns string in MM/DD/YY format
......@@ -1031,7 +1110,7 @@ int getage(scfg_t* cfg, const char *birth)
}
/****************************************************************************/
/* Converts from MM/DD/YYYYY, DD/MM/YYYY, or YYYY/MM/DD to YYYYMMDD */
/* Converts from MM/DD/[CC]YY, DD/MM/[CC]YY, or [CC]YY/MM/DD to CCYYMMDD */
/****************************************************************************/
char* parse_birthdate(scfg_t* cfg, const char* birthdate, char* out, size_t maxlen)
{
......@@ -1041,7 +1120,7 @@ char* parse_birthdate(scfg_t* cfg, const char* birthdate, char* out, size_t maxl
}
/****************************************************************************/
/* Converts from user birth date to MM/DD/YYYYY, DD/MM/YYYY, or YYYY/MM/DD */
/* Converts from user birth date to MM/DD/YYYY, DD/MM/YYYY, or YYYY/MM/DD */
/****************************************************************************/
char* format_birthdate(scfg_t* cfg, const char* birthdate, char* out, size_t maxlen)
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment