Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify redirection when user is already authenticated 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2023-04-26 22:10:43 +02:00
parent 5c0dd19fb0
commit e6b46a2c60
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/docs/content/specs/config.yaml
View File

@ -401,7 +401,7 @@ components:
type: string
dnsmasq:
type: string
civetweb:
webserver:
type: string
misc:
type: object
@ -634,7 +634,7 @@ components:
log:
ftl: "/var/log/pihole/FTL.log"
dnsmasq: "/var/log/pihole/pihole.log"
civetweb: "/var/log/pihole/HTTP_info.log"
webserver: "/var/log/pihole/webserver.log"
misc:
nice: -10
delay_startup: 10

26
src/webserver/lua_web.c
View File

@ -101,31 +101,9 @@ int request_handler(struct mg_connection *conn, void *cbdata)
// Check if the user is authenticated
if(check_client_auth(&api) != API_AUTH_UNAUTHORIZED)
{
// User is already authenticated
char target[256] = { 0 };
char decoded_target[256] = { 0 };
if(req_info->query_string != NULL && GET_VAR("target", target, req_info->query_string) > 0)
{
// Redirect to target page
const int len = mg_url_decode(target, strlen(target), decoded_target, sizeof(decoded_target) - 1u, false);
// mg_url_decode() returns the length of the decoded
// string, if -1 is returned, the buffer is too small
if(len < 0)
{
log_warn("Error decoding target string: %s", target);
memcpy(decoded_target, target, sizeof(decoded_target));
}
}
else
{
// Redirect to index page
strncpy(decoded_target, config.webserver.paths.webhome.v.s, sizeof(target) - 10);
strcat(decoded_target, "index.lp");
}
// User is already authenticated, redirect to index page
log_web("User is already authenticated, redirect to %s", decoded_target);
mg_printf(conn, "HTTP/1.1 302 Found\r\nLocation: %s\r\n\r\n", decoded_target);
log_web("User is already authenticated, redirecting to %sindex.lp", config.webserver.paths.webhome.v.s);
mg_printf(conn, "HTTP/1.1 302 Found\r\nLocation: %sindex.lp\r\n\r\n", config.webserver.paths.webhome.v.s);
return 302;
}
}