jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup of the default_resource examples

Browse source
This commit is contained in:
eidheim 2016-03-16 11:29:04 +01:00
commit c7f35ade7f
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
http_examples.cpp
View file

@ -10,6 +10,7 @@
#include <fstream> #include <fstream>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <array> #include <array>
#include <algorithm>
using namespace std; using namespace std;
//Added for the json-example: //Added for the json-example:
@ -85,12 +86,14 @@ int main() {
//Default file: index.html //Default file: index.html
//Can for instance be used to retrieve an HTML 5 client that uses REST-resources on this server //Can for instance be used to retrieve an HTML 5 client that uses REST-resources on this server
server.default_resource["GET"]=[](HttpServer::Response& response, shared_ptr<HttpServer::Request> request) { server.default_resource["GET"]=[](HttpServer::Response& response, shared_ptr<HttpServer::Request> request) {
string web_root_path=boost::filesystem::canonical("web").string(); const auto web_root_path=boost::filesystem::canonical("web");
boost::filesystem::path path=web_root_path; boost::filesystem::path path=web_root_path;
path/=request->path; path/=request->path;
if(boost::filesystem::exists(path)) { if(boost::filesystem::exists(path)) {
auto path_str=boost::filesystem::canonical(path).string(); path=boost::filesystem::canonical(path);
if(path_str.substr(0, web_root_path.size())==web_root_path) { //Check if path is within web_root_path
if(distance(web_root_path.begin(), web_root_path.end())<=distance(path.begin(), path.end()) &&
equal(web_root_path.begin(), web_root_path.end(), path.begin())) {
if(boost::filesystem::is_directory(path)) if(boost::filesystem::is_directory(path))
path/="index.html"; path/="index.html";
if(boost::filesystem::exists(path) && boost::filesystem::is_regular_file(path)) { if(boost::filesystem::exists(path) && boost::filesystem::is_regular_file(path)) {

9
https_examples.cpp
View file

@ -10,6 +10,7 @@
#include <fstream> #include <fstream>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <array> #include <array>
#include <algorithm>
using namespace std; using namespace std;
//Added for the json-example: //Added for the json-example:
@ -85,12 +86,14 @@ int main() {
//Default file: index.html //Default file: index.html
//Can for instance be used to retrieve an HTML 5 client that uses REST-resources on this server //Can for instance be used to retrieve an HTML 5 client that uses REST-resources on this server
server.default_resource["GET"]=[](HttpsServer::Response& response, shared_ptr<HttpsServer::Request> request) { server.default_resource["GET"]=[](HttpsServer::Response& response, shared_ptr<HttpsServer::Request> request) {
string web_root_path=boost::filesystem::canonical("web").string(); const auto web_root_path=boost::filesystem::canonical("web");
boost::filesystem::path path=web_root_path; boost::filesystem::path path=web_root_path;
path/=request->path; path/=request->path;
if(boost::filesystem::exists(path)) { if(boost::filesystem::exists(path)) {
auto path_str=boost::filesystem::canonical(path).string(); path=boost::filesystem::canonical(path);
if(path_str.substr(0, web_root_path.size())==web_root_path) { //Check if path is within web_root_path
if(distance(web_root_path.begin(), web_root_path.end())<=distance(path.begin(), path.end()) &&
equal(web_root_path.begin(), web_root_path.end(), path.begin())) {
if(boost::filesystem::is_directory(path)) if(boost::filesystem::is_directory(path))
path/="index.html"; path/="index.html";
if(boost::filesystem::exists(path) && boost::filesystem::is_regular_file(path)) { if(boost::filesystem::exists(path) && boost::filesystem::is_regular_file(path)) {