Commit 10652023 authored by bol-van's avatar bol-van
Browse files

nfqws,tpws: ^ prefix in hostlist disables subdomain matches

parent 307d38f6

nfq/desync.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static void auto_hostlist_failed(struct desync_profile *dp, const char *hostname 
		{

			DLOG("auto hostlist (profile %d) : adding %s to %s\n", dp->n, hostname, dp->hostlist_auto->filename);

			HOSTLIST_DEBUGLOG_APPEND("%s : profile %d : client %s : proto %s : adding to %s", hostname, dp->n, client_ip_port, l7proto_str(l7proto), dp->hostlist_auto->filename);

			if (!StrPoolAddStr(&dp->hostlist_auto->hostlist, hostname))

			if (!HostlistPoolAddStr(&dp->hostlist_auto->hostlist, hostname, 0))

			{

				DLOG_ERR("StrPoolAddStr out of memory\n");

				return;

nfq/hostlist.c

+35 −14
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include "helpers.h"



// inplace tolower() and add to pool

static bool addpool(strpool **hostlist, char **s, const char *end, int *ct)

static bool addpool(hostlist_pool **hostlist, char **s, const char *end, int *ct)

{

	char *p=*s;
@@ -17,10 +17,16 @@ static bool addpool(strpool **hostlist, char **s, const char *end, int *ct) 
	else

	{

		// advance until eol lowering all chars

		uint32_t flags = 0;

		if (*p=='^')

		{

			p = ++(*s);

			flags |= HOSTLIST_POOL_FLAG_STRICT_MATCH;

		}

		for (; p<end && *p && *p!='\r' && *p != '\n'; p++) *p=tolower(*p);

		if (!StrPoolAddStrLen(hostlist, *s, p-*s))

		if (!HostlistPoolAddStrLen(hostlist, *s, p-*s, flags))

		{

			StrPoolDestroy(hostlist);

			HostlistPoolDestroy(hostlist);

			*hostlist = NULL;

			return false;

		}
@@ -32,12 +38,12 @@ static bool addpool(strpool **hostlist, char **s, const char *end, int *ct) 
	return true;

}



bool AppendHostlistItem(strpool **hostlist, char *s)

bool AppendHostlistItem(hostlist_pool **hostlist, char *s)

{

	return addpool(hostlist,&s,s+strlen(s),NULL);

}



bool AppendHostList(strpool **hostlist, const char *filename)

bool AppendHostList(hostlist_pool **hostlist, const char *filename)

{

	char *p, *e, s[256], *zbuf;

	size_t zsize;
@@ -114,10 +120,10 @@ static bool LoadHostList(struct hostlist_file *hfile) 
			return true;

		}

		if (FILE_MOD_COMPARE(&hfile->mod_sig,&fsig)) return true; // up to date

		StrPoolDestroy(&hfile->hostlist);

		HostlistPoolDestroy(&hfile->hostlist);

		if (!AppendHostList(&hfile->hostlist, hfile->filename))

		{

			StrPoolDestroy(&hfile->hostlist);

			HostlistPoolDestroy(&hfile->hostlist);

			return false;

		}

		hfile->mod_sig=fsig;
@@ -138,10 +144,10 @@ static bool LoadHostLists(struct hostlist_files_head *list) 
	return bres;

}



bool NonEmptyHostlist(strpool **hostlist)

bool NonEmptyHostlist(hostlist_pool **hostlist)

{

	// add impossible hostname if the list is empty

	return *hostlist ? true : StrPoolAddStrLen(hostlist, "@&()", 4);

	return *hostlist ? true : HostlistPoolAddStrLen(hostlist, "@&()", 4, 0);

}



static void MakeAutolistsNonEmpty()
@@ -164,19 +170,34 @@ bool LoadAllHostLists() 






static bool SearchHostList(strpool *hostlist, const char *host)

static bool SearchHostList(hostlist_pool *hostlist, const char *host)

{

	if (hostlist)

	{

		const char *p = host;

		bool bInHostList;

		const struct hostlist_pool *hp;

		bool bHostFull=true;

		while (p)

		{

			bInHostList = StrPoolCheckStr(hostlist, p);

			DLOG("hostlist check for %s : %s\n", p, bInHostList ? "positive" : "negative");

			if (bInHostList) return true;

			DLOG("hostlist check for %s : ", p);

			hp = HostlistPoolGetStr(hostlist, p);

			if (hp)

			{

				if ((hp->flags & HOSTLIST_POOL_FLAG_STRICT_MATCH) && !bHostFull)

				{

					DLOG("negative : strict_mismatch : %s != %s\n", p, host);

				}

				else

				{

					DLOG("positive\n");

					return true;

				}

			}

			else

				DLOG("negative\n");

			p = strchr(p, '.');

			if (p) p++;

			bHostFull = false;

		}

	}

	return false;

nfq/hostlist.h

+3 −3
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
#include "pools.h"

#include "params.h"



bool AppendHostlistItem(strpool **hostlist, char *s);

bool AppendHostList(strpool **hostlist, const char *filename);

bool AppendHostlistItem(hostlist_pool **hostlist, char *s);

bool AppendHostList(hostlist_pool **hostlist, const char *filename);

bool LoadAllHostLists();

bool NonEmptyHostlist(strpool **hostlist);

bool NonEmptyHostlist(hostlist_pool **hostlist);

// return : true = apply fooling, false = do not apply

bool HostlistCheck(const struct desync_profile *dp,const char *host, bool *excluded, bool bSkipReloadCheck);

struct hostlist_file *RegisterHostlist(struct desync_profile *dp, bool bExclude, const char *filename);

nfq/nfqws.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static bool parse_split_pos_list(char *opt, struct proto_pos *splits, int splits 
	return true;

}



static bool parse_domain_list(char *opt, strpool **pp)

static bool parse_domain_list(char *opt, hostlist_pool **pp)

{

	char *e,*p,c;

nfq/pools.c

+17 −10
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
		free(elem); \

		return false; \

	}

#define ADD_HOSTLIST_POOL(etype, ppool, keystr, keystr_len, flg) \

	ADD_STR_POOL(etype,ppool,keystr,keystr_len); \

	elem->flags = flg;





#undef uthash_nonfatal_oom
@@ -42,27 +45,31 @@ static void ut_oom_recover(void *elem) 
}



// for not zero terminated strings

bool StrPoolAddStrLen(strpool **pp, const char *s, size_t slen)

bool HostlistPoolAddStrLen(hostlist_pool **pp, const char *s, size_t slen, uint32_t flags)

{

	ADD_STR_POOL(strpool, pp, s, slen)

	ADD_HOSTLIST_POOL(hostlist_pool, pp, s, slen, flags)

	return true;

}

// for zero terminated strings

bool StrPoolAddStr(strpool **pp, const char *s)

bool HostlistPoolAddStr(hostlist_pool **pp, const char *s, uint32_t flags)

{

	return StrPoolAddStrLen(pp, s, strlen(s));

	return HostlistPoolAddStrLen(pp, s, strlen(s), flags);

}



bool StrPoolCheckStr(strpool *p, const char *s)

hostlist_pool *HostlistPoolGetStr(hostlist_pool *p, const char *s)

{

	strpool *elem;

	hostlist_pool *elem;

	HASH_FIND_STR(p, s, elem);

	return elem != NULL;

	return elem;

}

bool HostlistPoolCheckStr(hostlist_pool *p, const char *s)

{

	return !!HostlistPoolGetStr(p,s);

}



void StrPoolDestroy(strpool **pp)

void HostlistPoolDestroy(hostlist_pool **pp)

{

	DESTROY_STR_POOL(strpool, pp)

	DESTROY_STR_POOL(hostlist_pool, pp)

}
@@ -178,7 +185,7 @@ struct hostlist_file *hostlist_files_add(struct hostlist_files_head *head, const 
static void hostlist_files_entry_destroy(struct hostlist_file *entry)

{

	free(entry->filename);

	StrPoolDestroy(&entry->hostlist);

	HostlistPoolDestroy(&entry->hostlist);

	free(entry);

}

void hostlist_files_destroy(struct hostlist_files_head *head)