Skip to content

only allow regular files in set_static_file_info, return 404 in all o… #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 23, 2022
Merged

only allow regular files in set_static_file_info, return 404 in all o… #470

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c593fbb
only allow regular files in set_static_file_info, return 404 in all o…
MichaelSB Jun 15, 2022
074fe25
Merge branch 'master' into response_check_file_type
MichaelSB Jun 17, 2022
719929b
Merge branch 'master' into response_check_file_type
MichaelSB Jun 18, 2022
a330717
Merge branch 'master' into response_check_file_type
MichaelSB Jun 20, 2022
b788fc4
Merge branch 'master' into response_check_file_type
MichaelSB Jun 22, 2022
df3d7ca
define S_ISREG on windows
MichaelSB Jun 22, 2022
beb6e86
Merge branch 'response_check_file_type' of github.com:MichaelSB/Crow …
MichaelSB Jun 22, 2022
5f73f39
Simplified condition for defining S_ISREG
MichaelSB Jun 22, 2022
83cde80
added comment on S_ISREG
MichaelSB Jun 22, 2022
6d6d36d
Merge branch 'master' into response_check_file_type
MichaelSB Jun 22, 2022
97405c8
Merge branch 'master' into response_check_file_type
MichaelSB Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions include/crow/http_response.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
#include <ios>
#include <fstream>
#include <sstream>
// S_ISREG is not defined for windows
// This defines it like suggested in https://stackoverflow.com/a/62371749
#if defined(_MSC_VER)
#define _CRT_INTERNAL_NONSTDC_NAMES 1
#endif
#include <sys/stat.h>
#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG)
#endif

#include "crow/http_request.h"
#include "crow/ci_map.h"
Expand Down Expand Up @@ -233,7 +241,7 @@ namespace crow
#ifdef CROW_ENABLE_COMPRESSION
compressed = false;
#endif
if (file_info.statResult == 0)
if (file_info.statResult == 0 && S_ISREG(file_info.statbuf.st_mode))
{
std::size_t last_dot = path.find_last_of(".");
std::string extension = path.substr(last_dot + 1);
Expand All @@ -257,7 +265,6 @@ namespace crow
{
code = 404;
file_info.path.clear();
this->end();
}
}

Expand Down