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

Improve URI matching algorithm

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2021-01-25 20:10:43 +01:00
parent e8e4c5f180
commit fa4c194045
4 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/list.c
+48 -49
View File
@@ -205,24 +205,16 @@ static int api_list_write(struct ftl_conn *api,
}
// Clients don't have the enabled property
if(listtype != GRAVITY_CLIENTS)
{
cJSON *json_enabled = cJSON_GetObjectItemCaseSensitive(api->payload.json, "enabled");
if (!cJSON_IsBool(json_enabled)) {
return send_json_error(api, 400,
"bad_request",
"No \"enabled\" boolean in body data",
NULL);
}
cJSON *json_enabled = cJSON_GetObjectItemCaseSensitive(api->payload.json, "enabled");
if (cJSON_IsBool(json_enabled))
row.enabled = cJSON_IsTrue(json_enabled);
}
else
row.enabled = true; // Default value
cJSON *json_item = cJSON_GetObjectItemCaseSensitive(api->payload.json, "item");
if(cJSON_IsString(json_item) && strlen(json_item->valuestring) > 0)
row.item = json_item->valuestring;
else if(api->method == HTTP_PUT)
row.item = NULL;
else
row.argument = json_item->valuestring;
else if (api->method != HTTP_PUT) // PUT uses the URI argument
{
return send_json_error(api, 400,
"bad_request",
@@ -234,19 +226,19 @@ static int api_list_write(struct ftl_conn *api,
if(cJSON_IsString(json_comment) && strlen(json_comment->valuestring) > 0)
row.comment = json_comment->valuestring;
else
row.comment = NULL;
row.comment = NULL; // Default value
cJSON *json_description = cJSON_GetObjectItemCaseSensitive(api->payload.json, "description");
if(cJSON_IsString(json_description) && strlen(json_description->valuestring) > 0)
row.description = json_description->valuestring;
else
row.description = NULL;
row.description = NULL; // Default value
cJSON *json_oldtype = cJSON_GetObjectItemCaseSensitive(api->payload.json, "oldtype");
if(cJSON_IsString(json_oldtype) && strlen(json_oldtype->valuestring) > 0)
row.oldtype = json_oldtype->valuestring;
else
row.oldtype = NULL;
row.oldtype = NULL; // Default value
bool okay = true;
char *regex_msg = NULL;
@@ -387,47 +379,54 @@ int api_list(struct ftl_conn *api)
listtype = GRAVITY_CLIENTS;
can_modify = true;
}
else if((argument = startsWith("/api/domains/allow/exact", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_ALLOW_EXACT;
can_modify = true;
}
else if((argument = startsWith("/api/domains/allow/regex", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_ALLOW_REGEX;
can_modify = true;
}
else if((argument = startsWith("/api/domains/allow", api)) != NULL)
{
if((argument = startsWith("/api/domains/allow/exact", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_ALLOW_EXACT;
can_modify = true;
}
else if((argument = startsWith("/api/domains/allow/regex", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_ALLOW_REGEX;
can_modify = true;
}
else
listtype = GRAVITY_DOMAINLIST_ALLOW_ALL;
}
else if((argument = startsWith("/api/domains/deny/exact", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_DENY_EXACT;
can_modify = true;
}
else if((argument = startsWith("/api/domains/deny/regex", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_DENY_REGEX;
can_modify = true;
}
else if((argument = startsWith("/api/domains/deny", api)) != NULL)
{
if((argument = startsWith("/api/domains/deny/exact", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_DENY_EXACT;
can_modify = true;
}
else if((argument = startsWith("/api/domains/deny/regex", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_DENY_REGEX;
can_modify = true;
}
else
listtype = GRAVITY_DOMAINLIST_DENY_ALL;
listtype = GRAVITY_DOMAINLIST_DENY_ALL;
}
else if((argument = startsWith("/api/domains/exact", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_ALL_EXACT;
}
else if((argument = startsWith("/api/domains/regex", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_ALL_REGEX;
}
else if((argument = startsWith("/api/domains", api)) != NULL)
{
listtype = GRAVITY_DOMAINLIST_ALL_ALL;
}
else
{
if((argument = startsWith("/api/domains/exact", api)) != NULL)
listtype = GRAVITY_DOMAINLIST_ALL_EXACT;
else if((argument = startsWith("/api/domains/regex", api)) != NULL)
listtype = GRAVITY_DOMAINLIST_ALL_REGEX;
else
{
argument = startsWith("/api/domains", api);
listtype = GRAVITY_DOMAINLIST_ALL_ALL;
}
cJSON *json = JSON_NEW_OBJ();
JSON_OBJ_REF_STR(json, "uri", api->request->local_uri);
return send_json_error(api, 400,
"bad_request",
"Invalid request: Specified endpoint not available",
json);
}
if(api->method == HTTP_GET)
src/database/gravity-db.c
-1
View File
@@ -1427,7 +1427,6 @@ bool gravityDB_addToTable(const enum gravity_list_type listtype, tablerow *row,
if(method == HTTP_POST) // Create NEW entry, error if existing
{
// The item is the argument for all POST requests
row->argument = row->item;
if(listtype == GRAVITY_GROUPS)
querystr = "INSERT INTO \"group\" (name,enabled,description) VALUES (:argument,:enabled,:description);";
else if(listtype == GRAVITY_ADLISTS)
src/database/gravity-db.h
-1
View File
@@ -31,7 +31,6 @@ typedef struct {
const char *argument;
const char *oldtype;
const char *ip;
const char *item;
long id;
time_t date_added;
time_t date_modified;
src/webserver/http-common.c
+6 -2
View File
@@ -146,9 +146,13 @@ const char* __attribute__((pure)) startsWith(const char *path, const struct ftl_
if(api->request->local_uri[strlen(path)] == '/')
// Path match with argument after ".../"
return api->request->local_uri + strlen(path) + 1u;
else
// Path match without argument
else if(strlen(path) == strlen(api->request->local_uri))
// Path match directly, no argument
return "";
else
// Further components in URL, assume this did't match, e.g.
// /api/domains/regex[123].com
return NULL;
else
// Path does not match
return NULL;