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

Merge pull request #2049 from pi-hole/tweak/remove_redirection

Browse Source 
Remove appending ?target=... when redirecting to login page
This commit is contained in:
Dominik
2024-09-02 19:25:42 +02:00
committed by GitHub
parent 11d6c79a0f ecc05dccf5
commit 0f4448b4bb
1 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/webserver/lua_web.c
+4 -44
View File
@@ -74,7 +74,6 @@ int request_handler(struct mg_connection *conn, void *cbdata)
/* Handler may access the request info using mg_get_request_info */
const struct mg_request_info *req_info = mg_get_request_info(conn);
const size_t uri_raw_len = strlen(req_info->local_uri_raw);
// Build minimal api struct to check authentication
struct ftl_conn api = { 0 };
@@ -122,50 +121,11 @@ int request_handler(struct mg_connection *conn, void *cbdata)
// Check if the user is authenticated
if(!authorized)
{
// Append query string to target
char *target = NULL;
if(req_info->query_string != NULL)
{
target = calloc(uri_raw_len + strlen(req_info->query_string) + 2u, sizeof(char));
strcpy(target, req_info->local_uri_raw);
strcat(target, "?");
strcat(target, req_info->query_string);
}
else
{
target = strdup(req_info->local_uri_raw);
}
if(target == NULL)
{
log_err("Error allocating memory for redirection target");
return send_json_error(&api, 500,
"internal_error",
"Internal server error",
"Cannot allocate memory for redirection target");
}
// Encode target string
const size_t encoded_target_len = strlen(target) * 3u + 1u;
char *encoded_target = calloc(encoded_target_len, sizeof(char));
if(encoded_target == NULL)
{
log_err("Error allocating memory for encoded redirection target");
return send_json_error(&api, 500,
"internal_error",
"Internal server error",
"Cannot allocate memory for encoded redirection target");
}
// Encode target string
mg_url_encode(target, encoded_target, encoded_target_len);
free(target);
// User is not authenticated, redirect to login page
log_web("Authentication required, redirecting to %slogin?target=%s",
config.webserver.paths.webhome.v.s, encoded_target);
mg_printf(conn, "HTTP/1.1 302 Found\r\nLocation: %slogin?target=%s\r\n\r\n",
config.webserver.paths.webhome.v.s, encoded_target);
free(encoded_target);
log_web("Authentication required, redirecting to %slogin",
config.webserver.paths.webhome.v.s);
mg_printf(conn, "HTTP/1.1 302 Found\r\nLocation: %slogin\r\n\r\n",
config.webserver.paths.webhome.v.s);
return 302;
}
}