pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify regex-test mode for better batch-processing capabilities

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-06-28 22:03:06 +02:00
parent d51224cb57
commit dde020ea54
6 changed files with 47 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/args.c
+12
View File
@@ -274,3 +274,15 @@ const char __attribute__ ((const)) *cli_done(void)
{
return is_term() ? COL_GREEN"done!"COL_NC : "done!";
}
// Sets font to bold
const char __attribute__ ((const)) *cli_bold(void)
{
return is_term() ? COL_BOLD : "";
}
// Resets font to normal
const char __attribute__ ((const)) *cli_normal(void)
{
return is_term() ? COL_NC : "";
}
src/args.h
+2
View File
@@ -21,5 +21,7 @@ const char *cli_cross(void) __attribute__ ((const));
const char *cli_info(void) __attribute__ ((const));
const char *cli_qst(void) __attribute__ ((const));
const char *cli_done(void) __attribute__ ((const));
const char *cli_bold(void) __attribute__ ((const));
const char *cli_normal(void) __attribute__ ((const));
#endif //ARGS_H
src/database/gravity-db.c
+1 -1
View File
@@ -797,7 +797,7 @@ bool in_whitelist(const char *domain, const int clientID, clientsData* client)
// optimization as the database lookup will most likely hit (a) more domains and (b)
// will be faster (given a sufficiently large number of regex whitelisting filters).
return domain_in_list(domain, stmt, "whitelist") ||
match_regex(domain, clientID, REGEX_WHITELIST) != -1;
match_regex(domain, clientID, REGEX_WHITELIST, false) != -1;
}
bool in_gravity(const char *domain, const int clientID, clientsData* client)
src/dnsmasq_interface.c
+1 -1
View File
@@ -101,7 +101,7 @@ static bool check_domain_blocked(const char *domain, const int clientID,
// Skipped when the domain is whitelisted or blocked by exact blacklist or gravity
int regex_idx = 0;
if(!query->whitelisted && !blockDomain &&
(regex_idx = match_regex(domain, clientID, REGEX_BLACKLIST)) > -1)
(regex_idx = match_regex(domain, clientID, REGEX_BLACKLIST, false)) > -1)
{
// We block this domain
blockDomain = true;
src/regex.c
+30 -74
View File
@@ -68,7 +68,7 @@ static bool compile_regex(const char *regexin, const int index, const enum regex
return true;
}
int match_regex(const char *input, const int clientID, const enum regex_type regexid)
int match_regex(const char *input, const int clientID, const enum regex_type regexid, const bool regextest)
{
int match_idx = -1;
#ifdef USE_TRE_REGEX
@@ -136,9 +136,31 @@ int match_regex(const char *input, const int clientID, const enum regex_type reg
input, regexbuffer[regexid][index]);
}
// Always check all regular expressions for clientID = -1
if(clientID >= 0)
if(regextest && regexid == REGEX_CLI)
{
// CLI provided regular expression
logg(" %s%s%s matches",
cli_bold(), regexbuffer[regexid][index], cli_normal());
}
else if(regextest && regexid == REGEX_BLACKLIST)
{
// Database-sourced regular expression
logg(" %s%s%s matches (regex blacklist, DB ID %i)",
cli_bold(), regexbuffer[regexid][index], cli_normal(),
regex_id[regexid][index]);
}
else if(regextest && regexid == REGEX_WHITELIST)
{
// Database-sourced regular expression
logg(" %s%s%s matches (regex whitelist, DB ID %i)",
cli_bold(), regexbuffer[regexid][index], cli_normal(),
regex_id[regexid][index]);
}
else
{
// Only check the first match when not in regex-test mode
break;
}
}
// Print no match message when in regex debug mode
@@ -329,21 +351,6 @@ void read_regex_from_database(void)
counters->clients, timer_elapsed_msec(REGEX_TIMER));
}
// Get regex string from rowid in database
static const char __attribute__ ((pure)) *get_regex_from_rowid(const enum regex_type regexid, const int matchid)
{
unsigned int index;
for(index = 0; index < counters->num_regex[regexid]; index++)
{
if(regex_id[regexid][index] == matchid)
break;
}
if(index < counters->num_regex[regexid])
return regexbuffer[regexid][index];
else
return "[not available]";
}
int regex_test(const bool debug_mode, const char *domainin, const char *regexin)
{
// Prepare counters and regex memories
@@ -359,59 +366,23 @@ int regex_test(const bool debug_mode, const char *domainin, const char *regexin)
// Re-enable terminal output
log_ctrl(false, true);
bool matched = false;
int matchidx;
int matchidx = -1;
if(regexin == NULL)
{
// Read and compile regex lists from database
logg("%s Loading regex filters from database...", cli_info());
timer_start(REGEX_TIMER);
read_regex_table(REGEX_BLACKLIST);
read_regex_table(REGEX_WHITELIST);
logg(" Compiled %i black- and %i whitelist regex filters in %.3f msec\n",
counters->num_regex[REGEX_BLACKLIST],
counters->num_regex[REGEX_WHITELIST],
timer_elapsed_msec(REGEX_TIMER));
// Check user-provided domain against all loaded regular blacklist expressions
logg("%s Checking domain against blacklist...", cli_info());
timer_start(REGEX_TIMER);
matchidx = match_regex(domainin, -1, REGEX_BLACKLIST);
logg(" Time: %.3f msec", timer_elapsed_msec(REGEX_TIMER));
if(matchidx > -1)
{
matched = true;
logg("%s \"%s\" matched by \"%s\"\n", cli_tick(),
domainin, get_regex_from_rowid(REGEX_BLACKLIST, matchidx));
}
else
{
logg("%s No result for \"%s\"\n", cli_cross(), domainin);
}
matchidx = match_regex(domainin, -1, REGEX_BLACKLIST, true);
// Check user-provided domain against all loaded regular whitelist expressions
logg("%s Checking domain against whitelist...", cli_info());
timer_start(REGEX_TIMER);
matchidx = match_regex(domainin, -1, REGEX_WHITELIST);
logg(" Time: %.3f msec", timer_elapsed_msec(REGEX_TIMER));
if(matchidx > -1)
{
matched = true;
logg("%s \"%s\" matched by \"%s\"\n", cli_tick(),
domainin, get_regex_from_rowid(REGEX_WHITELIST, matchidx));
}
else
{
logg("%s No result for \"%s\"\n", cli_cross(), domainin);
}
matchidx = match_regex(domainin, -1, REGEX_WHITELIST, true);
}
else
{
// Compile CLI regex
logg("%s Compiling regex filter...", cli_info());
counters->num_regex[REGEX_BLACKLIST] = counters->num_regex[REGEX_WHITELIST] = 0;
counters->num_regex[REGEX_CLI] = 1;
@@ -427,26 +398,11 @@ int regex_test(const bool debug_mode, const char *domainin, const char *regexin)
regex_available[REGEX_CLI][0] = true;
else
return EXIT_FAILURE;
logg(" Compiled regex filter in %.3f msec\n", timer_elapsed_msec(REGEX_TIMER));
// Check user-provided domain against user-provided regular expression
logg("%s Checking domain...", cli_info());
timer_start(REGEX_TIMER);
matchidx = match_regex(domainin, -1, REGEX_CLI);
logg(" Time: %.3f msec", timer_elapsed_msec(REGEX_TIMER));
if(matchidx > -1)
{
matched = true;
logg("%s \"%s\" matched by \"%s\"\n",
cli_tick(), domainin, get_regex_from_rowid(REGEX_CLI, matchidx));
}
else
{
logg("%s No result for \"%s\"\n", cli_cross(), domainin);
}
matchidx = match_regex(domainin, -1, REGEX_CLI, true);
}
// Return status 0 = MATCH, 1 = ERROR, 2 = NO MATCH
return matched ? EXIT_SUCCESS : 2;
return matchidx > -1 ? EXIT_SUCCESS : 2;
}
src/regex_r.h
+1 -1
View File
@@ -15,7 +15,7 @@
extern const char *regextype[];
int match_regex(const char *input, const int clientID, const enum regex_type);
int match_regex(const char *input, const int clientID, const enum regex_type, const bool regextest);
void allocate_regex_client_enabled(clientsData *client, const int clientID);
void read_regex_from_database(void);