Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2025-02-20 15:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Process middleware now returns a bool, and processing the request now actually stops if a middleware returns true, as intended.

Browse Source
This commit is contained in:
Relintai 2022-01-09 16:03:27 +01:00
parent 3873463dfa
commit 73df53418a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/http/web_root.cpp
View File

@ -68,7 +68,9 @@ void WebRoot::default_404_error_handler(Request *request, int error_code) {
} }
void WebRoot::handle_request_main(Request *request) { void WebRoot::handle_request_main(Request *request) {
process_middlewares(request); if (process_middlewares(request)) {
return;
}
// handle files first // handle files first
if (try_send_wwwroot_file(request)) { if (try_send_wwwroot_file(request)) {
@ -95,13 +97,15 @@ void WebRoot::handle_error_send_request(Request *request, const int error_code)
func(request, error_code); func(request, error_code);
} }
void WebRoot::process_middlewares(Request *request) { bool WebRoot::process_middlewares(Request *request) {
for (int i = 0; i < _middlewares.size(); ++i) { for (int i = 0; i < _middlewares.size(); ++i) {
if (_middlewares[i]->on_before_handle_request_main(request)) { if (_middlewares[i]->on_before_handle_request_main(request)) {
// handled // handled
return; return true;
} }
} }
return false;
} }
bool WebRoot::try_send_wwwroot_file(Request *request) { bool WebRoot::try_send_wwwroot_file(Request *request) {

2
core/http/web_root.h
View File

@ -25,7 +25,7 @@ public:
void handle_request_main(Request *request); void handle_request_main(Request *request);
void handle_error_send_request(Request *request, const int error_code); void handle_error_send_request(Request *request, const int error_code);
void process_middlewares(Request *request); bool process_middlewares(Request *request);
bool try_send_wwwroot_file(Request *request); bool try_send_wwwroot_file(Request *request);
void send_file(const String &path, Request *request); void send_file(const String &path, Request *request);