orthanc: Core/HttpServer/HttpServer.cpp annotate

annotate Core/HttpServer/HttpServer.cpp @ 3357:c0aa5f1cf2f5

new class: FileBuffer

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 02 May 2019 09:22:36 +0200
parents	f744730c294b
children	0ce9b4f5fdf5

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1213 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 // http://en.highscore.de/cpp/boost/stringhandling.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	36 #include "../PrecompiledHeaders.h"
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	37 #include "HttpServer.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	39 #include "../ChunkedBuffer.h"
c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	40 #include "../FileBuffer.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	41 #include "../Logging.h"
2895 da43ef7ff32a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	42 #include "../OrthancException.h"
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	43 #include "../TemporaryFile.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	44 #include "HttpToolbox.h"
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	45
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	46 #if ORTHANC_ENABLE_MONGOOSE == 1
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	47 # include <mongoose.h>
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	48
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	49 #elif ORTHANC_ENABLE_CIVETWEB == 1
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	50 # include <civetweb.h>
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	51 # define MONGOOSE_USE_CALLBACKS 1
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	52 # if !defined(CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	53 # error Macro CIVETWEB_HAS_DISABLE_KEEP_ALIVE must be defined
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	54 # endif
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	55
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	56 #else
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	57 # error "Either Mongoose or Civetweb must be enabled to compile this file"
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	58 #endif
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	59
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 #include <algorithm>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 #include <string.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 #include <boost/algorithm/string.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 #include <iostream>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 #include <string.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 #include <boost/thread.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	69 #if !defined(ORTHANC_ENABLE_SSL)
595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	70 # error The macro ORTHANC_ENABLE_SSL must be defined
595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	71 #endif
595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	72
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	73 #if ORTHANC_ENABLE_SSL == 1
748 de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	74 #include <openssl/opensslv.h>
de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	75 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	77 #define ORTHANC_REALM "Orthanc Secure Area"
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	78
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	79
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	80 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 static const char multipart[] = "multipart/form-data; boundary=";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 static unsigned int multipartLength = sizeof(multipart) / sizeof(char) - 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 namespace
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 // Anonymous namespace to avoid clashes between compilation modules
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	89 class MongooseOutputStream : public IHttpOutputStream
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 private:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 struct mg_connection* connection_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	94 public:
306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	95 MongooseOutputStream(struct mg_connection* connection) : connection_(connection)
306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	96 {
306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	97 }
306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	98
909 ef71057d8b26 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	99 virtual void Send(bool isHeader, const void* buffer, size_t length)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 {
217 1ac3aacd10a5 simplifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	101 if (length > 0)
1ac3aacd10a5 simplifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	102 {
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	103 int status = mg_write(connection_, buffer, length);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	104 if (status != static_cast<int>(length))
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	105 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	106 // status == 0 when the connection has been closed, -1 on error
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	107 throw OrthancException(ErrorCode_NetworkProtocol);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	108 }
217 1ac3aacd10a5 simplifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	109 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 }
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	111
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	112 virtual void OnHttpStatusReceived(HttpStatus status)
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	113 {
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	114 // Ignore this
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	115 }
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	116
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	117 virtual void DisableKeepAlive()
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	118 {
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	119 #if ORTHANC_ENABLE_MONGOOSE == 1
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	120 throw OrthancException(ErrorCode_NotImplemented,
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	121 "Only available if using CivetWeb");
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	122
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	123 #elif ORTHANC_ENABLE_CIVETWEB == 1
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	124 # if CIVETWEB_HAS_DISABLE_KEEP_ALIVE == 1
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	125 mg_disable_keep_alive(connection_);
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	126 # else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	127 # warning The function "mg_disable_keep_alive()" is not available, DICOMweb might run slowly
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	128 throw OrthancException(ErrorCode_NotImplemented,
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	129 "Only available if using a patched version of CivetWeb");
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	130 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	131
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	132 #else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	133 # error Please support your embedded Web server here
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	134 #endif
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	135 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 enum PostDataStatus
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 PostDataStatus_Success,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 PostDataStatus_NoLength,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 PostDataStatus_Pending,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 PostDataStatus_Failure
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 // TODO Move this to external file
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 class ChunkedFile : public ChunkedBuffer
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 private:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 std::string filename_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 public:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 ChunkedFile(const std::string& filename) :
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 filename_(filename)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 const std::string& GetFilename() const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 return filename_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 class ChunkStore
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 private:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 typedef std::list<ChunkedFile*> Content;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 Content content_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 unsigned int numPlaces_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 boost::mutex mutex_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 std::set<std::string> discardedFiles_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 void Clear()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 for (Content::iterator it = content_.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	184 it != content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 delete *it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 Content::iterator Find(const std::string& filename)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192 for (Content::iterator it = content_.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	193 it != content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195 if ((*it)->GetFilename() == filename)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 return it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 return content_.end();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 void Remove(const std::string& filename)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 Content::iterator it = Find(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 if (it != content_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 delete *it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 content_.erase(it);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 public:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 ChunkStore()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 numPlaces_ = 10;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 ~ChunkStore()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 PostDataStatus Store(std::string& completed,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 const char* chunkData,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 size_t chunkSize,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 const std::string& filename,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 size_t filesize)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 boost::mutex::scoped_lock lock(mutex_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 std::set<std::string>::iterator wasDiscarded = discardedFiles_.find(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 if (wasDiscarded != discardedFiles_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 discardedFiles_.erase(wasDiscarded);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 return PostDataStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 ChunkedFile* f;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 Content::iterator it = Find(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 if (it == content_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 f = new ChunkedFile(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 // Make some room
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 if (content_.size() >= numPlaces_)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 discardedFiles_.insert(content_.front()->GetFilename());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 delete content_.front();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 content_.pop_front();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 content_.push_back(f);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 f = *it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 f->AddChunk(chunkData, chunkSize);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 if (f->GetNumBytes() > filesize)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 Remove(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 else if (f->GetNumBytes() == filesize)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 f->Flatten(completed);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 Remove(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 return PostDataStatus_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 return PostDataStatus_Pending;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 /*void Print()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 boost::mutex::scoped_lock lock(mutex_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 printf("ChunkStore status:\n");
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 for (Content::const_iterator i = content_.begin();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 i != content_.end(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 printf(" [%s]: %d\n", (i)->GetFilename().c_str(), (i)->GetNumBytes());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287 printf("-----\n");
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 }*/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	292 struct HttpServer::PImpl
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 struct mg_context *context_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 ChunkStore chunkStore_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	299 ChunkStore& HttpServer::GetChunkStore()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 return pimpl_->chunkStore_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	306 static PostDataStatus ReadBody(std::string& postData,
1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	307 struct mg_connection *connection,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	308 const IHttpHandler::Arguments& headers)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	310 IHttpHandler::Arguments::const_iterator cs = headers.find("content-length");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 if (cs == headers.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 {
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	313 // Store all the individual chunks within a temporary file, then
c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	314 // read it back into the memory buffer "postData"
c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	315 FileBuffer buffer;
c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	316
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	317 std::string tmp(1024 * 1024, 0);
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	318
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	319 for (;;)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 {
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	321 int r = mg_read(connection, &tmp[0], tmp.size());
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	322 if (r < 0)
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	323 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	324 return PostDataStatus_Failure;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	325 }
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	326 else if (r == 0)
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	327 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	328 break;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	329 }
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	330 else
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	331 {
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	332 buffer.Append(tmp.c_str(), r);
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	333 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 }
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	335
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	336 buffer.Read(postData);
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	337
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	338 return PostDataStatus_Success;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 }
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	340 else
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	341 {
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	342 // "Content-Length" is available
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	343 int length;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	344 try
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	345 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	346 length = boost::lexical_cast<int>(cs->second);
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	347 }
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	348 catch (boost::bad_lexical_cast&)
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	349 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	350 return PostDataStatus_NoLength;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	351 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	353 if (length < 0)
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	354 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	355 length = 0;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	356 }
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	357
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	358 postData.resize(length);
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	359
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	360 size_t pos = 0;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	361 while (length > 0)
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	362 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	363 int r = mg_read(connection, &postData[pos], length);
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	364 if (r <= 0)
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	365 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	366 return PostDataStatus_Failure;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	367 }
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	368
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	369 assert(r <= length);
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	370 length -= r;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	371 pos += r;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	372 }
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	373
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	374 return PostDataStatus_Success;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	375 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 static PostDataStatus ParseMultipartPost(std::string &completedFile,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 struct mg_connection *connection,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	382 const IHttpHandler::Arguments& headers,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 const std::string& contentType,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 ChunkStore& chunkStore)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 std::string boundary = "--" + contentType.substr(multipartLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 std::string postData;
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	389 PostDataStatus status = ReadBody(postData, connection, headers);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 if (status != PostDataStatus_Success)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 return status;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	396 /*for (IHttpHandler::Arguments::const_iterator i = headers.begin(); i != headers.end(); i++)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 std::cout << "Header [" << i->first << "] = " << i->second << "\n";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 printf("CHUNK\n");*/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	402 typedef IHttpHandler::Arguments::const_iterator ArgumentIterator;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 ArgumentIterator requestedWith = headers.find("x-requested-with");
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 ArgumentIterator fileName = headers.find("x-file-name");
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 ArgumentIterator fileSizeStr = headers.find("x-file-size");
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407
338 3a3b3ba8c1e0 fix for uploads through internet explorer 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	408 if (requestedWith != headers.end() &&
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 requestedWith->second != "XMLHttpRequest")
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 return PostDataStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 size_t fileSize = 0;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415 if (fileSizeStr != headers.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 fileSize = boost::lexical_cast<size_t>(fileSizeStr->second);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 }
2836 7133ad478eea fix Debian warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2790 diff changeset	421 catch (boost::bad_lexical_cast&)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423 return PostDataStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 typedef boost::find_iterator<std::string::iterator> FindIterator;
10 27e2bbc11200 Better signal handling Administrator@jodogne-w01 parents: 8 diff changeset	428 typedef boost::iterator_range<char*> Range;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430 //chunkStore.Print();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 FindIterator last;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 for (FindIterator it =
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 make_find_iterator(postData, boost::first_finder(boundary));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437 it!=FindIterator();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 ++it)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 if (last != FindIterator())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 {
10 27e2bbc11200 Better signal handling Administrator@jodogne-w01 parents: 8 diff changeset	442 Range part(&last->back(), &it->front());
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 Range content = boost::find_first(part, "\r\n\r\n");
345 795ce0fa8e8a fix jodogne parents: 338 diff changeset	444 if (/content != Range()/!content.empty())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 Range c(&content.back() + 1, &it->front() - 2);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 size_t chunkSize = c.size();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 if (chunkSize > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 const char* chunkData = &c.front();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 if (fileName == headers.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 // This file is stored in a single chunk
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 completedFile.resize(chunkSize);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 if (chunkSize > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459 memcpy(&completedFile[0], chunkData, chunkSize);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 return PostDataStatus_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 return chunkStore.Store(completedFile, chunkData, chunkSize, fileName->second, fileSize);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 }
10 27e2bbc11200 Better signal handling Administrator@jodogne-w01 parents: 8 diff changeset	468 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471 last = it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	472 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 }
2836 7133ad478eea fix Debian warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2790 diff changeset	474 catch (std::length_error&)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476 return PostDataStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479 return PostDataStatus_Pending;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	483 static bool IsAccessGranted(const HttpServer& that,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	484 const IHttpHandler::Arguments& headers)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	485 {
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	486 bool granted = false;
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	487
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	488 IHttpHandler::Arguments::const_iterator auth = headers.find("authorization");
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	489 if (auth != headers.end())
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	490 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	491 std::string s = auth->second;
1213 787059de6b9a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1202 diff changeset	492 if (s.size() > 6 &&
787059de6b9a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1202 diff changeset	493 s.substr(0, 6) == "Basic ")
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	494 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	495 std::string b64 = s.substr(6);
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	496 granted = that.IsValidBasicHttpAuthentication(b64);
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	497 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	498 }
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	499
1202 476a17cfdf42 Fix crash when bad HTTP credentials are provided Sebastien Jodogne <s.jodogne@gmail.com> parents: 1122 diff changeset	500 return granted;
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	501 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	502
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	503
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	504 static std::string GetAuthenticatedUsername(const IHttpHandler::Arguments& headers)
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	505 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	506 IHttpHandler::Arguments::const_iterator auth = headers.find("authorization");
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	507
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	508 if (auth == headers.end())
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	509 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	510 return "";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	511 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	512
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	513 std::string s = auth->second;
1213 787059de6b9a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1202 diff changeset	514 if (s.size() <= 6 \|\|
787059de6b9a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1202 diff changeset	515 s.substr(0, 6) != "Basic ")
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	516 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	517 return "";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	518 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	519
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	520 std::string b64 = s.substr(6);
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	521 std::string decoded;
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	522 Toolbox::DecodeBase64(decoded, b64);
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	523 size_t semicolons = decoded.find(':');
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	524
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	525 if (semicolons == std::string::npos)
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	526 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	527 // Bad-formatted request
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	528 return "";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	529 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	530 else
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	531 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	532 return decoded.substr(0, semicolons);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	533 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	534 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	535
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	536
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	537 static bool ExtractMethod(HttpMethod& method,
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	538 const struct mg_request_info *request,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	539 const IHttpHandler::Arguments& headers,
f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	540 const IHttpHandler::GetArguments& argumentsGET)
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	541 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	542 std::string overriden;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	543
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	544 // Check whether some PUT/DELETE faking is done
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	545
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	546 // 1. Faking with Google's approach
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	547 IHttpHandler::Arguments::const_iterator methodOverride =
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	548 headers.find("x-http-method-override");
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	549
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	550 if (methodOverride != headers.end())
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	551 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	552 overriden = methodOverride->second;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	553 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	554 else if (!strcmp(request->request_method, "GET"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	555 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	556 // 2. Faking with Ruby on Rail's approach
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	557 // GET /my/resource?_method=delete <=> DELETE /my/resource
1363 feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	558 for (size_t i = 0; i < argumentsGET.size(); i++)
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	559 {
1363 feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	560 if (argumentsGET[i].first == "_method")
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	561 {
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	562 overriden = argumentsGET[i].second;
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	563 break;
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	564 }
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	565 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	566 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	567
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	568 if (overriden.size() > 0)
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	569 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	570 // A faking has been done within this request
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	571 Toolbox::ToUpperCase(overriden);
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	572
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	573 LOG(INFO) << "HTTP method faking has been detected for " << overriden;
1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	574
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	575 if (overriden == "PUT")
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	576 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	577 method = HttpMethod_Put;
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	578 return true;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	579 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	580 else if (overriden == "DELETE")
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	581 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	582 method = HttpMethod_Delete;
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	583 return true;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	584 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	585 else
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	586 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	587 return false;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	588 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	589 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	590
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	591 // No PUT/DELETE faking was present
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	592 if (!strcmp(request->request_method, "GET"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	593 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	594 method = HttpMethod_Get;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	595 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	596 else if (!strcmp(request->request_method, "POST"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	597 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	598 method = HttpMethod_Post;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	599 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	600 else if (!strcmp(request->request_method, "DELETE"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	601 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	602 method = HttpMethod_Delete;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	603 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	604 else if (!strcmp(request->request_method, "PUT"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	605 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	606 method = HttpMethod_Put;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	607 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	608 else
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	609 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	610 return false;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	611 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	612
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	613 return true;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	614 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	615
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	616
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	617 static void ConfigureHttpCompression(HttpOutput& output,
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	618 const IHttpHandler::Arguments& headers)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	619 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	620 // Look if the client wishes HTTP compression
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	621 // https://en.wikipedia.org/wiki/HTTP_compression
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	622 IHttpHandler::Arguments::const_iterator it = headers.find("accept-encoding");
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	623 if (it != headers.end())
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	624 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	625 std::vector<std::string> encodings;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	626 Toolbox::TokenizeString(encodings, it->second, ',');
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	627
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	628 for (size_t i = 0; i < encodings.size(); i++)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	629 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	630 std::string s = Toolbox::StripSpaces(encodings[i]);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	631
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	632 if (s == "deflate")
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	633 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	634 output.SetDeflateAllowed(true);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	635 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	636 else if (s == "gzip")
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	637 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	638 output.SetGzipAllowed(true);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	639 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	640 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	641 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	642 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	643
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	644
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	645 static void InternalCallback(HttpOutput& output /* out */,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	646 HttpMethod& method /* out */,
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	647 HttpServer& server,
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	648 struct mg_connection *connection,
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	649 const struct mg_request_info *request)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	650 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	651 bool localhost;
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	652
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	653 #if ORTHANC_ENABLE_MONGOOSE == 1
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	654 static const long LOCALHOST = (127ll << 24) + 1ll;
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	655 localhost = (request->remote_ip == LOCALHOST);
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	656 #elif ORTHANC_ENABLE_CIVETWEB == 1
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	657 // The "remote_ip" field of "struct mg_request_info" is tagged as
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	658 // deprecated in Civetweb, using "remote_addr" instead.
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	659 localhost = (std::string(request->remote_addr) == "127.0.0.1");
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	660 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	661 # error
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	662 #endif
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	663
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	664 // Check remote calls
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	665 if (!server.IsRemoteAccessAllowed() &&
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	666 !localhost)
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	667 {
2790 c7313e1f7644 MongooseServer::SetRealm() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2635 diff changeset	668 output.SendUnauthorized(server.GetRealm());
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	669 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	670 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	671
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	672
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	673 // Extract the HTTP headers
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	674 IHttpHandler::Arguments headers;
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	675 for (int i = 0; i < request->num_headers; i++)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	676 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	677 std::string name = request->http_headers[i].name;
1977 ad95331c526a trace log of http headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1963 diff changeset	678 std::string value = request->http_headers[i].value;
ad95331c526a trace log of http headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1963 diff changeset	679
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	680 std::transform(name.begin(), name.end(), name.begin(), ::tolower);
1977 ad95331c526a trace log of http headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1963 diff changeset	681 headers.insert(std::make_pair(name, value));
ad95331c526a trace log of http headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1963 diff changeset	682 VLOG(1) << "HTTP header: [" << name << "]: [" << value << "]";
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	683 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	684
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	685 if (server.IsHttpCompressionEnabled())
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	686 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	687 ConfigureHttpCompression(output, headers);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	688 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	689
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	690
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	691 // Extract the GET arguments
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	692 IHttpHandler::GetArguments argumentsGET;
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	693 if (!strcmp(request->request_method, "GET"))
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	694 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	695 HttpToolbox::ParseGetArguments(argumentsGET, request->query_string);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	696 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	697
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	698
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	699 // Compute the HTTP method, taking method faking into consideration
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	700 method = HttpMethod_Get;
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	701 if (!ExtractMethod(method, request, headers, argumentsGET))
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	702 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1112 diff changeset	703 output.SendStatus(HttpStatus_400_BadRequest);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	704 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	705 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	706
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	707
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	708 // Authenticate this connection
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	709 if (server.IsAuthenticationEnabled() &&
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	710 !IsAccessGranted(server, headers))
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	711 {
2790 c7313e1f7644 MongooseServer::SetRealm() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2635 diff changeset	712 output.SendUnauthorized(server.GetRealm());
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	713 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	714 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	715
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	716
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	717 #if ORTHANC_ENABLE_MONGOOSE == 1
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	718 // Apply the filter, if it is installed
1571 3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	719 char remoteIp[24];
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	720 sprintf(remoteIp, "%d.%d.%d.%d",
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	721 reinterpret_cast<const uint8_t*>(&request->remote_ip) [3],
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	722 reinterpret_cast<const uint8_t*>(&request->remote_ip) [2],
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	723 reinterpret_cast<const uint8_t*>(&request->remote_ip) [1],
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	724 reinterpret_cast<const uint8_t*>(&request->remote_ip) [0]);
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	725
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	726 const char* requestUri = request->uri;
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	727
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	728 #elif ORTHANC_ENABLE_CIVETWEB == 1
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	729 const char* remoteIp = request->remote_addr;
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	730 const char* requestUri = request->local_uri;
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	731 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	732 # error
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	733 #endif
1571 3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	734
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	735 if (requestUri == NULL)
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	736 {
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	737 requestUri = "";
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	738 }
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	739
1571 3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	740 std::string username = GetAuthenticatedUsername(headers);
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	741
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	742 IIncomingHttpRequestFilter *filter = server.GetIncomingHttpRequestFilter();
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	743 if (filter != NULL)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	744 {
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	745 if (!filter->IsAllowed(method, requestUri, remoteIp,
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	746 username.c_str(), headers, argumentsGET))
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	747 {
2790 c7313e1f7644 MongooseServer::SetRealm() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2635 diff changeset	748 //output.SendUnauthorized(server.GetRealm());
1963 af0c90ae0915 Use 403 Forbidden status if the incoming HTTP request is disallowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	749 output.SendStatus(HttpStatus_403_Forbidden);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	750 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	751 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	752 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	753
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	754
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	755 // Extract the body of the request for PUT and POST
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1443 diff changeset	756
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1443 diff changeset	757 // TODO Avoid unneccessary memcopy of the body
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1443 diff changeset	758
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	759 std::string body;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	760 if (method == HttpMethod_Post \|\|
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	761 method == HttpMethod_Put)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	762 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	763 PostDataStatus status;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	764
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	765 IHttpHandler::Arguments::const_iterator ct = headers.find("content-type");
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	766 if (ct == headers.end())
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	767 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	768 // No content-type specified. Assume no multi-part content occurs at this point.
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	769 status = ReadBody(body, connection, headers);
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	770 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	771 else
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	772 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	773 std::string contentType = ct->second;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	774 if (contentType.size() >= multipartLength &&
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	775 !memcmp(contentType.c_str(), multipart, multipartLength))
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	776 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	777 status = ParseMultipartPost(body, connection, headers, contentType, server.GetChunkStore());
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	778 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	779 else
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	780 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	781 status = ReadBody(body, connection, headers);
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	782 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	783 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	784
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	785 switch (status)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	786 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	787 case PostDataStatus_NoLength:
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1112 diff changeset	788 output.SendStatus(HttpStatus_411_LengthRequired);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	789 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	790
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	791 case PostDataStatus_Failure:
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1112 diff changeset	792 output.SendStatus(HttpStatus_400_BadRequest);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	793 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	794
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	795 case PostDataStatus_Pending:
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	796 output.AnswerEmpty();
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	797 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	798
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	799 default:
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	800 break;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	801 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	802 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	803
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	804
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	805 // Decompose the URI into its components
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	806 UriComponents uri;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	807 try
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	808 {
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	809 Toolbox::SplitUriComponents(uri, requestUri);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	810 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	811 catch (OrthancException&)
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	812 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1112 diff changeset	813 output.SendStatus(HttpStatus_400_BadRequest);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	814 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	815 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	816
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	817
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	818 LOG(INFO) << EnumerationToString(method) << " " << Toolbox::FlattenUri(uri);
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	819
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	820 bool found = false;
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	821
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	822 if (server.HasHandler())
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	823 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	824 found = server.GetHandler().Handle(output, RequestOrigin_RestApi, remoteIp, username.c_str(),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	825 method, uri, headers, argumentsGET, body.c_str(), body.size());
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	826 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	827
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	828 if (!found)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	829 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	830 throw OrthancException(ErrorCode_UnknownResource);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	831 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	832 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	833
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	834
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	835 static void ProtectedCallback(struct mg_connection *connection,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	836 const struct mg_request_info *request)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	837 {
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	838 try
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	839 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	840 #if ORTHANC_ENABLE_MONGOOSE == 1
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	841 void *that = request->user_data;
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	842 const char* requestUri = request->uri;
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	843 #elif ORTHANC_ENABLE_CIVETWEB == 1
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	844 // https://github.com/civetweb/civetweb/issues/409
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	845 void *that = mg_get_user_data(mg_get_context(connection));
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	846 const char* requestUri = request->local_uri;
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	847 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	848 # error
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	849 #endif
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	850
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	851 if (requestUri == NULL)
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	852 {
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	853 requestUri = "";
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	854 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	855
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	856 HttpServer* server = reinterpret_cast<HttpServer*>(that);
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	857
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	858 if (server == NULL)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	859 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	860 MongooseOutputStream stream(connection);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	861 HttpOutput output(stream, false /* assume no keep-alive */);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	862 output.SendStatus(HttpStatus_500_InternalServerError);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	863 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	864 }
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	865
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	866 MongooseOutputStream stream(connection);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	867 HttpOutput output(stream, server->IsKeepAliveEnabled());
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	868 HttpMethod method = HttpMethod_Get;
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1568 diff changeset	869
27774f6f84e4 improved error handling in http answers jodogne parents: 1568 diff changeset	870 try
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	871 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	872 try
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	873 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	874 InternalCallback(output, method, *server, connection, request);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	875 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	876 catch (OrthancException&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	877 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	878 throw; // Pass the exception to the main handler below
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	879 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	880 // Now convert native exceptions as OrthancException
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	881 catch (boost::bad_lexical_cast&)
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	882 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	883 throw OrthancException(ErrorCode_BadParameterType,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	884 "Syntax error in some user-supplied data");
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	885 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	886 catch (std::runtime_error&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	887 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	888 // Presumably an error while parsing the JSON body
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	889 throw OrthancException(ErrorCode_BadRequest);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	890 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	891 catch (std::bad_alloc&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	892 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	893 throw OrthancException(ErrorCode_NotEnoughMemory,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	894 "The server hosting Orthanc is running out of memory");
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	895 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	896 catch (...)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	897 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	898 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	899 "An unhandled exception was generated inside the HTTP server");
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	900 }
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	901 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	902 catch (OrthancException& e)
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	903 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	904 assert(server != NULL);
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1568 diff changeset	905
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	906 // Using this candidate handler results in an exception
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	907 try
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	908 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	909 if (server->GetExceptionFormatter() == NULL)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	910 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	911 LOG(ERROR) << "Exception in the HTTP handler: " << e.What();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	912 output.SendStatus(e.GetHttpStatus());
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	913 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	914 else
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	915 {
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	916 server->GetExceptionFormatter()->Format(output, e, method, requestUri);
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	917 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	918 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	919 catch (OrthancException&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	920 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	921 // An exception here reflects the fact that the status code
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	922 // was already set by the HTTP handler.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	923 }
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	924 }
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	925 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	926 catch (...)
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	927 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	928 // We should never arrive at this point, where it is even impossible to send an answer
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	929 LOG(ERROR) << "Catastrophic error inside the HTTP server, giving up";
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	930 }
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	931 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	932
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	933
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	934 #if MONGOOSE_USE_CALLBACKS == 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935 static void* Callback(enum mg_event event,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	936 struct mg_connection *connection,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 const struct mg_request_info *request)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939 if (event == MG_NEW_REQUEST)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	941 ProtectedCallback(connection, request);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 // Mark as processed
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 return (void*) "";
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	945 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	946 else
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 return NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	952 #elif MONGOOSE_USE_CALLBACKS == 1
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	953 static int Callback(struct mg_connection *connection)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	954 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	955 const struct mg_request_info *request = mg_get_request_info(connection);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	956
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	957 ProtectedCallback(connection, request);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	958
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	959 return 1; // Do not let Mongoose handle the request by itself
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	960 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	961
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	962 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	963 # error Please set MONGOOSE_USE_CALLBACKS
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	964 #endif
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	965
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	966
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	967
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	968
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	970 bool HttpServer::IsRunning() const
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	971 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	972 return (pimpl_->context_ != NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	974
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	975
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	976 HttpServer::HttpServer() : pimpl_(new PImpl)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978 pimpl_->context_ = NULL;
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	979 handler_ = NULL;
34 96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	980 remoteAllowed_ = false;
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	981 authentication_ = false;
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	982 ssl_ = false;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	983 port_ = 8000;
417 7441037663cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	984 filter_ = NULL;
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	985 keepAlive_ = false;
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	986 httpCompression_ = true;
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	987 exceptionFormatter_ = NULL;
2790 c7313e1f7644 MongooseServer::SetRealm() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2635 diff changeset	988 realm_ = ORTHANC_REALM;
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	989 threadsCount_ = 50; // Default value in mongoose
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	990 tcpNoDelay_ = true;
748 de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	991
3145 239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	992 #if ORTHANC_ENABLE_MONGOOSE == 1
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	993 LOG(INFO) << "This Orthanc server uses Mongoose as its embedded HTTP server";
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	994 #endif
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	995
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	996 #if ORTHANC_ENABLE_CIVETWEB == 1
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	997 LOG(INFO) << "This Orthanc server uses CivetWeb as its embedded HTTP server";
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	998 #endif
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	999
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	1000 #if ORTHANC_ENABLE_SSL == 1
749 b8c49473be38 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	1001 // Check for the Heartbleed exploit
748 de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1002 // https://en.wikipedia.org/wiki/OpenSSL#Heartbleed_bug
de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1003 if (OPENSSL_VERSION_NUMBER < 0x1000107fL /* openssl-1.0.1g */ &&
de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1004 OPENSSL_VERSION_NUMBER >= 0x1000100fL /* openssl-1.0.1 */)
de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1005 {
749 b8c49473be38 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	1006 LOG(WARNING) << "This version of OpenSSL is vulnerable to the Heartbleed exploit";
748 de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1007 }
de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1008 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1009 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1010
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1011
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1012 HttpServer::~HttpServer()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1013 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1014 Stop();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1015 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1016
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1017
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1018 void HttpServer::SetPortNumber(uint16_t port)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1019 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1020 Stop();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1021 port_ = port;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1022 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1024 void HttpServer::Start()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1026 #if ORTHANC_ENABLE_MONGOOSE == 1
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1027 LOG(INFO) << "Starting embedded Web server using Mongoose";
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1028 #elif ORTHANC_ENABLE_CIVETWEB == 1
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1029 LOG(INFO) << "Starting embedded Web server using Civetweb";
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1030 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1031 # error
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1032 #endif
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1033
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1034 if (!IsRunning())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1036 std::string port = boost::lexical_cast<std::string>(port_);
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1037 std::string numThreads = boost::lexical_cast<std::string>(threadsCount_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1038
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1039 if (ssl_)
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1040 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1041 port += "s";
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1042 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1043
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1044 const char *options[] = {
1110 becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1045 // Set the TCP port for the HTTP server
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046 "listening_ports", port.c_str(),
1110 becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1047
becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1048 // Optimization reported by Chris Hafey
becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1049 // https://groups.google.com/d/msg/orthanc-users/CKueKX0pJ9E/_UCbl8T-VjIJ
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1050 "enable_keep_alive", (keepAlive_ ? "yes" : "no"),
1110 becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1051
2579 010577b52f5f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2577 diff changeset	1052 #if ORTHANC_ENABLE_CIVETWEB == 1
2577 6783a7c02990 keep_alive_timeout_ms for civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1053 // https://github.com/civetweb/civetweb/blob/master/docs/UserManual.md#enable_keep_alive-no
6783a7c02990 keep_alive_timeout_ms for civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1054 "keep_alive_timeout_ms", (keepAlive_ ? "500" : "0"),
6783a7c02990 keep_alive_timeout_ms for civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1055 #endif
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1056
3136 f948deef53d9 using tcp_nodelay in civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3069 diff changeset	1057 #if ORTHANC_ENABLE_CIVETWEB == 1
f948deef53d9 using tcp_nodelay in civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3069 diff changeset	1058 // Disable TCP Nagle's algorithm to maximize speed (this
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1059 // option is not available in Mongoose).
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1060 // https://groups.google.com/d/topic/civetweb/35HBR9seFjU/discussion
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1061 // https://eklitzke.org/the-caveats-of-tcp-nodelay
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1062 "tcp_nodelay", (tcpNoDelay_ ? "1" : "0"),
3136 f948deef53d9 using tcp_nodelay in civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3069 diff changeset	1063 #endif
f948deef53d9 using tcp_nodelay in civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3069 diff changeset	1064
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1065 // Set the number of threads
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1066 "num_threads", numThreads.c_str(),
2577 6783a7c02990 keep_alive_timeout_ms for civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1067
1110 becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1068 // Set the SSL certificate, if any. This must be the last option.
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1069 ssl_ ? "ssl_certificate" : NULL,
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1070 certificate_.c_str(),
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1071 NULL
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1072 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1074 #if MONGOOSE_USE_CALLBACKS == 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1075 pimpl_->context_ = mg_start(&Callback, this, options);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1076
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1077 #elif MONGOOSE_USE_CALLBACKS == 1
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1078 struct mg_callbacks callbacks;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1079 memset(&callbacks, 0, sizeof(callbacks));
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1080 callbacks.begin_request = Callback;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1081 pimpl_->context_ = mg_start(&callbacks, this, options);
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1082
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1083 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1084 # error Please set MONGOOSE_USE_CALLBACKS
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1085 #endif
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1086
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1087 if (!pimpl_->context_)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088 {
3330 10e2b9f4162f more details in errors Alain Mazy <alain@mazy.be> parents: 3180 diff changeset	1089 throw OrthancException(ErrorCode_HttpPortInUse,
10e2b9f4162f more details in errors Alain Mazy <alain@mazy.be> parents: 3180 diff changeset	1090 " (port = " + boost::lexical_cast<std::string>(port_) + ")");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091 }
2633 40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1092
40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1093 LOG(WARNING) << "HTTP server listening on port: " << GetPortNumber()
40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1094 << " (HTTPS encryption is "
40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1095 << (IsSslEnabled() ? "enabled" : "disabled")
40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1096 << ", remote access is "
40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1097 << (IsRemoteAccessAllowed() ? "" : "not ")
40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1098 << "allowed)";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1099 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1102 void HttpServer::Stop()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104 if (IsRunning())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 mg_stop(pimpl_->context_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1107 pimpl_->context_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1108 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1112 void HttpServer::ClearUsers()
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1113 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1114 Stop();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1115 registeredUsers_.clear();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1116 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1117
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1118
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1119 void HttpServer::RegisterUser(const char* username,
ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1120 const char* password)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1121 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1122 Stop();
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	1123
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	1124 std::string tag = std::string(username) + ":" + std::string(password);
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	1125 std::string encoded;
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	1126 Toolbox::EncodeBase64(encoded, tag);
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	1127 registeredUsers_.insert(encoded);
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1128 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1129
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1130 void HttpServer::SetSslEnabled(bool enabled)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1131 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1132 Stop();
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1133
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	1134 #if ORTHANC_ENABLE_SSL == 0
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1135 if (enabled)
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1136 {
1674 4fc502d469f4 fix build if SSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	1137 throw OrthancException(ErrorCode_SslDisabled);
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1138 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1139 else
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1140 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1141 ssl_ = false;
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1142 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1143 #else
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1144 ssl_ = enabled;
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1145 #endif
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1146 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1147
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1148
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1149 void HttpServer::SetKeepAliveEnabled(bool enabled)
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1150 {
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1151 Stop();
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1152 keepAlive_ = enabled;
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 1977 diff changeset	1153 LOG(INFO) << "HTTP keep alive is " << (enabled ? "enabled" : "disabled");
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1154
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1155 #if ORTHANC_ENABLE_MONGOOSE == 1
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1156 if (enabled)
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1157 {
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1158 LOG(WARNING) << "You should disable HTTP keep alive, as you are using Mongoose";
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1159 }
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1160 #endif
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1161 }
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1162
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1163
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1164 void HttpServer::SetAuthenticationEnabled(bool enabled)
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1165 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1166 Stop();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1167 authentication_ = enabled;
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1168 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1169
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1170 void HttpServer::SetSslCertificate(const char* path)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1171 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1172 Stop();
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1173 certificate_ = path;
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1174 }
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1175
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1176 void HttpServer::SetRemoteAccessAllowed(bool allowed)
34 96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1177 {
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1178 Stop();
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1179 remoteAllowed_ = allowed;
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1180 }
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1181
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1182 void HttpServer::SetHttpCompressionEnabled(bool enabled)
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1183 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1184 Stop();
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1185 httpCompression_ = enabled;
1518 eb46cc06389a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	1186 LOG(WARNING) << "HTTP compression is " << (enabled ? "enabled" : "disabled");
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1187 }
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	1188
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1189 void HttpServer::SetIncomingHttpRequestFilter(IIncomingHttpRequestFilter& filter)
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1190 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1191 Stop();
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1192 filter_ = &filter;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1193 }
34 96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1194
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1195
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1196 void HttpServer::SetHttpExceptionFormatter(IHttpExceptionFormatter& formatter)
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1197 {
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1198 Stop();
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1199 exceptionFormatter_ = &formatter;
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1200 }
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1201
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1202
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1203 bool HttpServer::IsValidBasicHttpAuthentication(const std::string& basic) const
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1204 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1205 return registeredUsers_.find(basic) != registeredUsers_.end();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1206 }
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1207
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1208
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1209 void HttpServer::Register(IHttpHandler& handler)
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1210 {
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1211 Stop();
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1212 handler_ = &handler;
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1213 }
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1214
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1215
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1216 IHttpHandler& HttpServer::GetHandler() const
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1217 {
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1218 if (handler_ == NULL)
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1219 {
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1220 throw OrthancException(ErrorCode_InternalError);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1221 }
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1222
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1223 return *handler_;
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1224 }
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1225
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1226
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1227 void HttpServer::SetThreadsCount(unsigned int threads)
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1228 {
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1229 if (threads <= 0)
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1230 {
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1231 throw OrthancException(ErrorCode_ParameterOutOfRange);
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1232 }
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1233
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1234 Stop();
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1235 threadsCount_ = threads;
3180 07a2f637b76d new option: "HttpThreadsCount" to set the number of threads in the embedded HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	1236
07a2f637b76d new option: "HttpThreadsCount" to set the number of threads in the embedded HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	1237 LOG(INFO) << "The embedded HTTP server will use " << threads << " threads";
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1238 }
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1239
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1240
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1241 void HttpServer::SetTcpNoDelay(bool tcpNoDelay)
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1242 {
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1243 Stop();
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1244 tcpNoDelay_ = tcpNoDelay;
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1245 LOG(INFO) << "TCP_NODELAY for the HTTP sockets is set to "
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1246 << (tcpNoDelay ? "true" : "false");
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1247 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1248 }

Mercurial > hg > orthanc

annotate Core/HttpServer/HttpServer.cpp @ 3357:c0aa5f1cf2f5