9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

filter: match in two passes, before and after stripping

Browse source
This commit is contained in:
Ed Kellett 2018-08-14 22:38:51 +01:00
parent fccc6d5669
commit 744ac30804
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
1 changed files with 32 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
extensions/filter.c
View file

@ -276,23 +276,46 @@ int match_callback(unsigned id,
return 0; return 0;
} }
static char check_buffer[2000];
static char clean_buffer[BUFSIZE];
unsigned match_message(const char *msg) unsigned match_message(const char *prefix,
struct Client *source,
const char *command,
const char *target,
const char *msg)
{ {
unsigned state = 0; unsigned state = 0;
if (!filter_enable) if (!filter_enable)
return 0; return 0;
if (!filter_db) if (!filter_db)
return 0; return 0;
hs_error_t r = hs_scan(filter_db, msg, strlen(msg), 0, filter_scratch, match_callback, &state); snprintf(check_buffer, sizeof check_buffer, "%s:%s!%s@%s#%c %s %s :%s",
prefix,
#if FILTER_NICK
source->name,
#else
"*",
#endif
#if FILTER_USER
source->username,
#else
"*",
#endif
#if FILTER_HOST
source->host,
#else
"*",
#endif
source->user && source->user->suser[0] != '\0' ? '1' : '0',
command, target,
msg);
hs_error_t r = hs_scan(filter_db, check_buffer, strlen(check_buffer), 0, filter_scratch, match_callback, &state);
if (r != HS_SUCCESS && r != HS_SCAN_TERMINATED) if (r != HS_SUCCESS && r != HS_SCAN_TERMINATED)
return 0; return 0;
return state; return state;
} }
static char check_buffer[2000];
static char clean_buffer[BUFSIZE];
void void
filter_msg_user(void *data_) filter_msg_user(void *data_)
{ {
@ -311,26 +334,8 @@ filter_msg_user(void *data_)
char *text = strcpy(clean_buffer, data->text); char *text = strcpy(clean_buffer, data->text);
strip_colour(text); strip_colour(text);
strip_unprintable(text); strip_unprintable(text);
snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s 0 :%s", unsigned r = match_message("0", s, cmdname[data->msgtype], "0", data->text) |
#if FILTER_NICK match_message("1", s, cmdname[data->msgtype], "0", text);
s->name,
#else
"*",
#endif
#if FILTER_USER
s->username,
#else
"*",
#endif
#if FILTER_HOST
s->host,
#else
"*",
#endif
s->user && s->user->suser[0] != '\0' ? '1' : '0',
cmdname[data->msgtype],
text);
unsigned r = match_message(check_buffer);
if (r & ACT_DROP) { if (r & ACT_DROP) {
sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), form_str(ERR_CANNOTSENDTOCHAN),
@ -365,27 +370,8 @@ filter_msg_channel(void *data_)
char *text = strcpy(clean_buffer, data->text); char *text = strcpy(clean_buffer, data->text);
strip_colour(text); strip_colour(text);
strip_unprintable(text); strip_unprintable(text);
snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s %s :%s", unsigned r = match_message("0", s, cmdname[data->msgtype], data->chptr->chname, data->text) |
#if FILTER_NICK match_message("1", s, cmdname[data->msgtype], data->chptr->chname, text);
s->name,
#else
"*",
#endif
#if FILTER_USER
s->username,
#else
"*",
#endif
#if FILTER_HOST
s->host,
#else
"*",
#endif
s->user && s->user->suser[0] != '\0' ? '1' : '0',
cmdname[data->msgtype],
data->chptr->chname,
text);
unsigned r = match_message(check_buffer);
if (r & ACT_DROP) { if (r & ACT_DROP) {
sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), form_str(ERR_CANNOTSENDTOCHAN),