soutade/gPass
1
0
Fork 0
Code Issues Pull Requests Packages Releases 2 Activity

Do simpler things to create wildcard domains

Browse Source
This commit is contained in:
Grégory Soutadé 2017-09-14 20:20:42 +02:00
parent 5a1d6c7390
commit f98cc4a863
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chrome_addon/lib/main.js
View File

@ -288,21 +288,16 @@ function wildcard_domain(domain)
{ {
var parts = domain.split("."); var parts = domain.split(".");
if (parts.length >= 3) // Standard root domain (zzz.xxx.com) or more
if (parts.length > 2)
{ {
// Seems to be a two level root domain (ie zzz.xxx.co.uk ...) res = "*.";
if (parts[parts.length-2].lenght <= 3) for (i=1; i<parts.length; i++)
{ res += parts[i];
if (parts.length > 3)
return "*" + "." + parts[parts.length-3] + "." + parts[parts.length-2] + "." + parts[parts.length-1];
}
// Standard root domain (zzz.xxx.com)
else
return "*" + "." + parts[parts.length-2] + "." + parts[parts.length-1];
} }
// Simple xxx.com // Simple xxx.com
else if (parts.length == 2) else if (parts.length == 2)
return "*" + "." + parts[0] + "." + parts[1]; return "*." + domain;
return ""; return "";
} }

15
cli/main.c
View File

@ -297,20 +297,13 @@ static char* wildcard_domain(char* domain)
} }
// Final level // Final level
level_length[cur_level] = tmp - level_ptr[cur_level-1]; level_length[cur_level-1] = tmp - level_ptr[cur_level-1];
tmp = NULL; tmp = NULL;
if (cur_level >= 3) if (cur_level > 2)
{ {
// Seems to be a two level root domain (ie zzz.xxx.co.uk ...) // Standard root domain (zzz.xxx.com) or more
if (level_length[cur_level-2] <= 3) tmp = level_ptr[1];
{
if (cur_level > 3)
tmp = level_ptr[cur_level-3];
}
else
// Standard root domain (zzz.xxx.com)
tmp = level_ptr[cur_level-2];
} }
// Simple xxx.com // Simple xxx.com
else if (cur_level == 2) else if (cur_level == 2)