walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix PSL_TYPE_NO_STAR_RULE and improve test suite 

Reported-by: Daniel Kahn Gillmor
This commit is contained in:
Tim Rühsen 2018-02-23 12:09:03 +01:00
parent 9542813a8f
commit 8fd480584e
4 changed files with 77 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/psl.c
View File

@ -841,12 +841,12 @@ static int _psl_is_public_suffix(const psl_ctx_t *psl, const char *domain, int t
if (suffix.nlabels == 1) { if (suffix.nlabels == 1) {
/* TLD, this is the prevailing '*' match. If type excludes the '*' rule, continue. /* TLD, this is the prevailing '*' match. If type excludes the '*' rule, continue.
*/ */
if (type & PSL_TYPE_NO_STAR_RULE) if (!(type & PSL_TYPE_NO_STAR_RULE))
type &= ~PSL_TYPE_NO_STAR_RULE;
else
return 1; return 1;
} }
type &= ~PSL_TYPE_NO_STAR_RULE;
if (psl->utf8 || psl == &_builtin_psl) if (psl->utf8 || psl == &_builtin_psl)
need_conversion = 0; need_conversion = 0;

129
tests/test-is-public-all.c
View File

@ -54,77 +54,84 @@ static int _isspace_ascii(const char c)
return c == ' ' || c == '\t' || c == '\r' || c == '\n'; return c == ' ' || c == '\t' || c == '\r' || c == '\n';
} }
static const char *_type_string(int type)
{
switch (type) {
case PSL_TYPE_ANY: return "PSL_TYPE_ANY";
case PSL_TYPE_PRIVATE: return "PSL_TYPE_PRIVATE";
case PSL_TYPE_ICANN: return "PSL_TYPE_ICANN";
case PSL_TYPE_ANY|PSL_TYPE_NO_STAR_RULE: return "PSL_TYPE_ANY|PSL_TYPE_NO_STAR_RULE";
case PSL_TYPE_PRIVATE|PSL_TYPE_NO_STAR_RULE: return "PSL_TYPE_PRIVATE|PSL_TYPE_NO_STAR_RULE";
case PSL_TYPE_ICANN|PSL_TYPE_NO_STAR_RULE: return "PSL_TYPE_ICANN|PSL_TYPE_NO_STAR_RULE";
default: return "Unsupported type";
}
}
static void test_ps(const psl_ctx_t *psl, const char *domain, int type, int expected)
{
int result;
if ((result = psl_is_public_suffix2(psl, domain, type)) != expected) {
failed++;
printf("psl_is_public_suffix2(%s, %s)=%d (expected %d)\n", domain, _type_string(type), result, expected);
} else ok++;
}
/* section: either PSL_TYPE_PRIVATE or PSL_TYPE_ICANN */
static void test_type_any(const psl_ctx_t *psl, const char *domain, int type, int expected)
{
int result;
int wildcard = (*domain == '.');
int tld = !(strchr(domain + wildcard, '.'));
test_ps(psl, domain, type, expected);
test_ps(psl, domain, type|PSL_TYPE_NO_STAR_RULE, expected);
test_ps(psl, domain, PSL_TYPE_ANY, expected);
test_ps(psl, domain, PSL_TYPE_ANY|PSL_TYPE_NO_STAR_RULE, expected);
if (type == PSL_TYPE_PRIVATE) {
if (tld) {
test_ps(psl, domain, PSL_TYPE_ICANN, 1);
test_ps(psl, domain, PSL_TYPE_ICANN|PSL_TYPE_NO_STAR_RULE, 0);
} else {
test_ps(psl, domain, PSL_TYPE_ICANN, 0);
test_ps(psl, domain, PSL_TYPE_ICANN|PSL_TYPE_NO_STAR_RULE, 0);
}
} else if (type == PSL_TYPE_ICANN) {
if (tld) {
test_ps(psl, domain, PSL_TYPE_PRIVATE, 1);
test_ps(psl, domain, PSL_TYPE_PRIVATE|PSL_TYPE_NO_STAR_RULE, 0);
} else {
test_ps(psl, domain, PSL_TYPE_PRIVATE, 0);
test_ps(psl, domain, PSL_TYPE_PRIVATE|PSL_TYPE_NO_STAR_RULE, 0);
}
}
}
static void test_psl_entry(const psl_ctx_t *psl, const char *domain, int type) static void test_psl_entry(const psl_ctx_t *psl, const char *domain, int type)
{ {
int result; int result;
if (*domain == '!') { /* an exception to a wildcard, e.g. !www.ck (wildcard is *.ck) */ if (*domain == '!') { /* an exception to a wildcard, e.g. !www.ck (wildcard is *.ck) */
if ((result = psl_is_public_suffix(psl, domain + 1))) { test_type_any(psl, domain + 1, type, 0); /* the exception itself is not a PS */
failed++;
printf("psl_is_public_suffix(%s)=%d (expected 0)\n", domain, result); if ((domain = strchr(domain, '.')))
} else ok++; test_type_any(psl, domain, type, 1); /* the related wildcard domain is a PS */
if ((domain = strchr(domain, '.'))) {
if (!(result = psl_is_public_suffix(psl, domain + 1))) {
failed++;
printf("psl_is_public_suffix(%s)=%d (expected 1)\n", domain + 1, result);
} else ok++;
}
} else if (*domain == '*') { /* a wildcard, e.g. *.ck or *.platform.sh */ } else if (*domain == '*') { /* a wildcard, e.g. *.ck or *.platform.sh */
char *xdomain; /* '*.platform.sh' -> 'y.x.platform.sh' */
size_t len; size_t len = strlen(domain);
char *xdomain = alloca(len + 3);
if (!(result = psl_is_public_suffix(psl, domain + 1))) { memcpy(xdomain, "y.x", 3);
failed++; memcpy(xdomain + 3, domain + 1, len);
printf("psl_is_public_suffix(%s)=%d (expected 1)\n", domain + 1, result);
} else ok++; test_type_any(psl, domain + 1, type, 1); /* the domain without wildcard is a PS */
test_type_any(psl, xdomain + 2, type, 1); /* random wildcard-matching domain is a PS... */
test_type_any(psl, xdomain, type, 0); /* ... but sub domain is not */
len = strlen(domain);
xdomain = alloca(len + 1);
memcpy(xdomain, domain, len + 1);
*xdomain = 'x';
if (!(result = psl_is_public_suffix(psl, domain))) {
failed++;
printf("psl_is_public_suffix(%s)=%d (expected 1)\n", domain, result);
} else ok++;
} else { } else {
if (!(result = psl_is_public_suffix(psl, domain))) { test_type_any(psl, domain, type, 1); /* Any normal PSL entry */
failed++;
printf("psl_is_public_suffix(%s)=%d (expected 1)\n", domain, result);
} else ok++;
if (!(strchr(domain, '.'))) {
/* TLDs are always expected to be Public Suffixes */
if (!(result = psl_is_public_suffix2(psl, domain, PSL_TYPE_PRIVATE))) {
failed++;
printf("psl_is_public_suffix2(%s, PSL_TYPE_PRIVATE)=%d (expected 1)\n", domain, result);
} else ok++;
if (!(result = psl_is_public_suffix2(psl, domain, PSL_TYPE_ICANN))) {
failed++;
printf("psl_is_public_suffix2(%s, PSL_TYPE_ICANN)=%d (expected 0)\n", domain, result);
} else ok++;
} else if (type == PSL_TYPE_PRIVATE) {
if (!(result = psl_is_public_suffix2(psl, domain, PSL_TYPE_PRIVATE))) {
failed++;
printf("psl_is_public_suffix2(%s, PSL_TYPE_PRIVATE)=%d (expected 1)\n", domain, result);
} else ok++;
if ((result = psl_is_public_suffix2(psl, domain, PSL_TYPE_ICANN))) {
failed++;
printf("psl_is_public_suffix2(%s, PSL_TYPE_ICANN)=%d (expected 0)\n", domain, result);
} else ok++;
} else if (type == PSL_TYPE_ICANN) {
if (!(result = psl_is_public_suffix2(psl, domain, PSL_TYPE_ICANN))) {
failed++;
printf("psl_is_public_suffix2(%s, PSL_TYPE_ICANN)=%d (expected 1)\n", domain, result);
} else ok++;
if ((result = psl_is_public_suffix2(psl, domain, PSL_TYPE_PRIVATE))) {
failed++;
printf("psl_is_public_suffix2(%s, PSL_TYPE_PRIVATE)=%d (expected 0)\n", domain, result);
} else ok++;
}
} }
} }

3
tests/test-is-public-builtin.c
View File

@ -90,6 +90,9 @@ static void test_psl(void)
{ "", 1, 0 }, /* special case */ { "", 1, 0 }, /* special case */
{ NULL, 1, 1 }, /* special case */ { NULL, 1, 1 }, /* special case */
{ "adfhoweirh", 1, 0 }, /* unknown TLD */ { "adfhoweirh", 1, 0 }, /* unknown TLD */
{ "compute.amazonaws.com", 1, 1 }, /* special rule *.compute.amazonaws.com */
{ "y.compute.amazonaws.com", 1, 1 },
{ "x.y.compute.amazonaws.com", 0, 0 },
}; };
unsigned it; unsigned it;
const psl_ctx_t *psl; const psl_ctx_t *psl;

3
tests/test-is-public.c
View File

@ -84,6 +84,9 @@ static void test_psl(void)
{ "", 1, 0 }, /* special case */ { "", 1, 0 }, /* special case */
{ NULL, 1, 1 }, /* special case */ { NULL, 1, 1 }, /* special case */
{ "adfhoweirh", 1, 0 }, /* unknown TLD */ { "adfhoweirh", 1, 0 }, /* unknown TLD */
{ "compute.amazonaws.com", 1, 1 }, /* special rule *.compute.amazonaws.com */
{ "y.compute.amazonaws.com", 1, 1 },
{ "x.y.compute.amazonaws.com", 0, 0 },
}; };
unsigned it; unsigned it;
int result, ver; int result, ver;