klavirshik
/
GoodbyeDPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update blackwhitelist.c

This commit is contained in:
SashaXser 2023-11-17 12:50:31 +04:00 committed by GitHub
parent 3a944e2401
commit 7b390ba2a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 61 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/blackwhitelist.c
View File

@ -2,8 +2,8 @@
* Blacklist for GoodbyeDPI HTTP DPI circumvention tricks * Blacklist for GoodbyeDPI HTTP DPI circumvention tricks
* *
* This is a simple domain hash table. * This is a simple domain hash table.
* Domain records are added from a file, where every * Domain records are added from a text file, where every
* domain is separated by a new line. * domain is separated with a new line.
*/ */
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
@ -11,117 +11,100 @@
#include "utils/uthash.h" #include "utils/uthash.h"
#include "utils/getline.h" #include "utils/getline.h"
/* Define the minimum length of a host name */ typedef struct blackwhitelist_record {
#define HOST_MINLEN 3 const char *host;
UT_hash_handle hh; /* makes this structure hashable */
} blackwhitelist_record_t;
/* Define the structure of a blacklist record */ static blackwhitelist_record_t *blackwhitelist = NULL;
typedef struct blacklist_record {
const char *host; /* The host name of the blacklisted domain */
UT_hash_handle hh; /* The hash handle for the hash table */
} blacklist_record_t;
/* Check if a host name is in the blacklist hash table */ static int check_get_hostname(const char *host) {
static int blacklist_check_hostname(const char *host, blacklist_record_t *blacklist) { blackwhitelist_record_t *tmp_record = NULL;
blacklist_record_t *tmp_record = NULL; if (!blackwhitelist) return FALSE;
if (!blacklist) return FALSE; /* Return false if the hash table is empty */
HASH_FIND_STR(blacklist, host, tmp_record); /* Find the host name in the hash table */ HASH_FIND_STR(blackwhitelist, host, tmp_record);
if (tmp_record) { if (tmp_record) {
debug("blacklist_check_hostname found host\n"); debug("check_get_hostname found host\n");
return TRUE; /* Return true if the host name is found */ return TRUE;
} }
debug("blacklist_check_hostname host not found\n"); debug("check_get_hostname host not found\n");
return FALSE; /* Return false if the host name is not found */ return FALSE;
} }
/* Add a host name to the blacklist hash table */ static int add_hostname(const char *host) {
static int blacklist_add_hostname(const char *host, blacklist_record_t **blacklist) { if (!host)
if (!host || !blacklist) return FALSE;
return FALSE; /* Return false if the host name or the hash table pointer is null */
blacklist_record_t *tmp_record = NULL; blackwhitelist_record_t *tmp_record = malloc(sizeof(blackwhitelist_record_t));
char *host_c = NULL; char *host_c = NULL;
if (!blacklist_check_hostname(host, *blacklist)) { /* Check if the host name is already in the hash table */ if (!check_get_hostname(host)) {
tmp_record = malloc(sizeof(blacklist_record_t)); /* Allocate memory for a new record */ host_c = strdup(host);
if (!tmp_record) return FALSE; /* Return false if the allocation fails */ tmp_record->host = host_c;
host_c = strdup(host); /* Duplicate the host name */ HASH_ADD_KEYPTR(hh, blackwhitelist, tmp_record->host,
if (!host_c) { /* Return false if the duplication fails */ strlen(tmp_record->host), tmp_record);
free(tmp_record); /* Free the allocated memory for the record */
return FALSE;
}
tmp_record->host = host_c; /* Set the host name field of the record */
HASH_ADD_KEYPTR(hh, *blacklist, tmp_record->host,
strlen(tmp_record->host), tmp_record); /* Add the record to the hash table */
debug("Added host %s\n", host_c); debug("Added host %s\n", host_c);
return TRUE; /* Return true if the host name is added successfully */ return TRUE;
} }
debug("Not added host %s\n", host); debug("Not added host %s\n", host);
return FALSE; /* Return false if the host name is already in the hash table */ free(tmp_record);
if (host_c)
free(host_c);
return FALSE;
} }
/* Load the blacklist from a file and store it in a hash table */ int blackwhitelist_load_list(const char *filename) {
int blacklist_load_list(const char *filename, blacklist_record_t **blacklist) { char *line = malloc(HOST_MAXLEN + 1);
char *line = NULL; size_t linelen = HOST_MAXLEN + 1;
size_t linelen = 0;
int cnt = 0; int cnt = 0;
ssize_t read; ssize_t read;
FILE *fp = fopen(filename, "r"); /* Open the file for reading */ FILE *fp = fopen(filename, "r");
if (!fp) return FALSE; /* Return false if the file does not exist or cannot be opened */ if (!fp) return FALSE;
while ((read = getline(&line, &linelen, fp)) != -1) { /* Read a line from the file */ while ((read = getline(&line, &linelen, fp)) != -1) {
/* Remove the trailing newline or carriage return characters */ /* works with both \n and \r\n */
line[strcspn(line, "\r\n")] = '\0'; line[strcspn(line, "\r\n")] = '\0';
if (strlen(line) < HOST_MINLEN) { /* Skip the line if the host name is too short */ if (strlen(line) > HOST_MAXLEN) {
printf("WARNING: host %s is less than %d bytes, skipping\n", line, HOST_MINLEN); printf("WARNING: host %s exceeds maximum host length and has not been added\n",
line);
continue; continue;
} }
if (blacklist_add_hostname(line, blacklist)) /* Add the host name to the hash table */ if (strlen(line) < 3) {
cnt++; /* Increment the counter of added host names */ printf("WARNING: host %s is less than 3 bytes, skipping\n", line);
continue;
}
if (add_hostname(line))
cnt++;
} }
free(line); /* Free the allocated memory for the line buffer */ free(line);
if (!*blacklist) return FALSE; /* Return false if the hash table is empty */ if (!blackwhitelist) return FALSE;
printf("Loaded %d hosts from file %s\n", cnt, filename); printf("Loaded %d hosts from file %s\n", cnt, filename);
fclose(fp); /* Close the file */ fclose(fp);
return TRUE; /* Return true if the hash table is loaded successfully */ return TRUE;
} }
/* Free the memory allocated for the blacklist hash table and its records */ int blackwhitelist_check_hostname(const char *host_addr, size_t host_len) {
void blacklist_free_list(blacklist_record_t **blacklist) {
blacklist_record_t *tmp_record = NULL, *tmp = NULL;
if (!blacklist || !*blacklist) return; /* Return if the hash table pointer is null or the hash table is empty */
HASH_ITER(hh, *blacklist, tmp_record, tmp) { /* Iterate over the hash table records */
HASH_DEL(*blacklist, tmp_record); /* Delete the record from the hash table */
free(tmp_record->host); /* Free the memory allocated for the host name */
free(tmp_record); /* Free the memory allocated for the record */
}
*blacklist = NULL; /* Set the hash table pointer to null */
}
/* Check if a host name matches any of the blacklisted domains */
int blacklist_match_hostname(const char *host_addr, size_t host_len, blacklist_record_t *blacklist) {
char current_host[HOST_MAXLEN + 1]; char current_host[HOST_MAXLEN + 1];
char *tokenized_host = NULL; char *tokenized_host = NULL;
if (host_len > HOST_MAXLEN) return FALSE; /* Return false if the host name is too long */ if (host_len > HOST_MAXLEN) return FALSE;
if (host_addr && host_len) { if (host_addr && host_len) {
memcpy(current_host, host_addr, host_len); /* Copy the host name to a local buffer */ memcpy(current_host, host_addr, host_len);
current_host[host_len] = '\0'; /* Add a null terminator */ current_host[host_len] = '\0';
} }
if (blacklist_check_hostname(current_host, blacklist)) /* Check if the host name is in the hash table */ if (check_get_hostname(current_host))
return TRUE; /* Return true if the host name is found */ return TRUE;
tokenized_host = strchr(current_host, '.'); /* Find the first dot in the host name */ tokenized_host = strchr(current_host, '.');
while (tokenized_host != NULL && tokenized_host < (current_host + HOST_MAXLEN)) { while (tokenized_host != NULL && tokenized_host < (current_host + HOST_MAXLEN)) {
/* Search hostname only if there is next token */ /* Search hostname only if there is next token */
if (strchr(tokenized_host + 1, '.') && blacklist_check_hostname(tokenized_host + 1, blacklist)) if (strchr(tokenized_host + 1, '.') && check_get_hostname(tokenized_host + 1))
return TRUE; /* Return true if the host name is found */ return TRUE;
tokenized_host = strchr(tokenized_host + 1, '.'); /* Find the next dot in the host name */ tokenized_host = strchr(tokenized_host + 1, '.');
} }
debug("____blacklist_match_hostname FALSE: host %s\n", current_host); debug("____blackwhitelist_check_hostname FALSE: host %s\n", current_host);
return FALSE; /* Return false if the host name is not found */ return FALSE;
} }