orthanc: OrthancFramework/Sources/HttpServer/HttpServer.cpp annotate

annotate OrthancFramework/Sources/HttpServer/HttpServer.cpp @ 4831:7053502fbf97

added copyright UCLouvain

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 25 Nov 2021 19:01:11 +0100
parents	57b1a36645ae
children	2e71a08eea15 43e613a7756b

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
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4382 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
4831 7053502fbf97 added copyright UCLouvain Sebastien Jodogne <s.jodogne@gmail.com> parents: 4616 diff changeset	6 * Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	11 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	12 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * 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	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	16 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	20 * <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
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 // http://en.highscore.de/cpp/boost/stringhandling.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	26 #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	27 #include "HttpServer.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	29 #include "../ChunkedBuffer.h"
c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	30 #include "../FileBuffer.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	31 #include "../Logging.h"
2895 da43ef7ff32a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	32 #include "../OrthancException.h"
3357 c0aa5f1cf2f5 new class: FileBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3356 diff changeset	33 #include "../TemporaryFile.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	34 #include "HttpToolbox.h"
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	35 #include "IHttpHandler.h"
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	36 #include "MultipartStreamReader.h"
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	37 #include "StringHttpOutput.h"
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	38
4226 7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	39 #if ORTHANC_ENABLE_PUGIXML == 1
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	40 # include "IWebDavBucket.h"
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	41 #endif
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	42
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	43 #if ORTHANC_ENABLE_MONGOOSE == 1
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	44 # 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	45
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	46 #elif ORTHANC_ENABLE_CIVETWEB == 1
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	47 # 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	48 # 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	49 # 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	50 # 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	51 # endif
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	52 # if !defined(CIVETWEB_HAS_WEBDAV_WRITING)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	53 # error Macro CIVETWEB_HAS_WEBDAV_WRITING must be defined
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 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 #else
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	56 # 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	57 #endif
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	58
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 #include <algorithm>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 #include <boost/algorithm/string.hpp>
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	61 #include <boost/algorithm/string/predicate.hpp>
3672 ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	62 #include <boost/filesystem.hpp>
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	63 #include <boost/lexical_cast.hpp>
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	64 #include <boost/thread.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 #include <iostream>
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	66 #include <stdio.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 #include <string.h>
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
3801 9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	74 # include <openssl/opensslv.h>
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	75 # include <openssl/err.h>
748 de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	76 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	78 #define ORTHANC_REALM "Orthanc Secure Area"
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	79
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	80
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	81 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 namespace
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 // Anonymous namespace to avoid clashes between compilation modules
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	86 class MongooseOutputStream : public IHttpOutputStream
0 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 private:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 struct mg_connection* connection_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	91 public:
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	92 explicit MongooseOutputStream(struct mg_connection* connection) :
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	93 connection_(connection)
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	94 {
306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	95 }
306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	96
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	97 virtual void Send(bool isHeader,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	98 const void* buffer,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	99 size_t length) ORTHANC_OVERRIDE
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
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	112 virtual void OnHttpStatusReceived(HttpStatus status) ORTHANC_OVERRIDE
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
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	117 virtual void DisableKeepAlive() ORTHANC_OVERRIDE
3154 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
4616 57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	125 # if CIVETWEB_VERSION_MAJOR == 1 && CIVETWEB_VERSION_MINOR <= 13 // From "civetweb-1.13.patch"
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	126 mg_disable_keep_alive(connection_);
4616 57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	127 # else
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	128 /**
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	129 * Function "mg_disable_keep_alive()" contributed by Sebastien
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	130 * Jodogne was renamed as "mg_disable_connection_keep_alive()"
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	131 * in the official CivetWeb repository:
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	132 * https://github.com/civetweb/civetweb/commit/78d45f4c4b0ab821f4f259b21ad3783f6d6c556a
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	133 **/
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	134 mg_disable_connection_keep_alive(connection_);
57b1a36645ae upgrade to civetweb 1.14 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4454 diff changeset	135 # endif
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	136 # else
4449 6a6017027162 "#warning" is not available on Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	137 # if defined(__GNUC__) \|\| defined(__clang__)
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	138 # warning The function "mg_disable_keep_alive()" is not available, DICOMweb might run slowly
4449 6a6017027162 "#warning" is not available on Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	139 # endif
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	140 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	141 "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	142 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	143
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	144 #else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	145 # 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	146 #endif
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3145 diff changeset	147 }
0 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
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 enum PostDataStatus
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 PostDataStatus_Success,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 PostDataStatus_NoLength,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 PostDataStatus_Pending,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 PostDataStatus_Failure
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	161 namespace
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 {
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	163 class ChunkedFile : public ChunkedBuffer
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	164 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	165 private:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	166 std::string filename_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	168 public:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	169 explicit ChunkedFile(const std::string& filename) :
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	170 filename_(filename)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	171 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	172 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	174 const std::string& GetFilename() const
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	175 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	176 return filename_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	177 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	178 };
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	179 }
0 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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	183 class HttpServer::ChunkStore : public boost::noncopyable
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 private:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 typedef std::list<ChunkedFile*> Content;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 Content content_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 unsigned int numPlaces_;
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 boost::mutex mutex_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 std::set<std::string> discardedFiles_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193 void Clear()
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 for (Content::iterator it = content_.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	196 it != content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 delete *it;
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 Content::iterator Find(const std::string& filename)
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 for (Content::iterator it = content_.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	205 it != content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 if ((*it)->GetFilename() == filename)
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 return it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 }
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 return content_.end();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 void Remove(const std::string& filename)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 Content::iterator it = Find(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 if (it != content_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 delete *it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 content_.erase(it);
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 public:
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 ChunkStore()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 numPlaces_ = 10;
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 ~ChunkStore()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 Clear();
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 PostDataStatus Store(std::string& completed,
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	238 const void* chunkData,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 size_t chunkSize,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 const std::string& filename,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 size_t filesize)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 boost::mutex::scoped_lock lock(mutex_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 std::set<std::string>::iterator wasDiscarded = discardedFiles_.find(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 if (wasDiscarded != discardedFiles_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 discardedFiles_.erase(wasDiscarded);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 return PostDataStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 ChunkedFile* f;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 Content::iterator it = Find(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 if (it == content_.end())
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 f = new ChunkedFile(filename);
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 // Make some room
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 if (content_.size() >= numPlaces_)
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 discardedFiles_.insert(content_.front()->GetFilename());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 delete content_.front();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 content_.pop_front();
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 content_.push_back(f);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 f = *it;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 }
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 f->AddChunk(chunkData, chunkSize);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 if (f->GetNumBytes() > filesize)
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 Remove(filename);
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 else if (f->GetNumBytes() == filesize)
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 f->Flatten(completed);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 Remove(filename);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 return PostDataStatus_Success;
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 return PostDataStatus_Pending;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287 }
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 /*void Print()
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 boost::mutex::scoped_lock lock(mutex_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 printf("ChunkStore status:\n");
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 for (Content::const_iterator i = content_.begin();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 i != content_.end(); i++)
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 printf(" [%s]: %d\n", (i)->GetFilename().c_str(), (i)->GetNumBytes());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 printf("-----\n");
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 };
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
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	304 struct HttpServer::PImpl
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 struct mg_context *context_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 ChunkStore chunkStore_;
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	308
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	309 PImpl() :
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	310 context_(NULL)
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	311 {
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	312 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	316 class HttpServer::MultipartFormDataHandler : public MultipartStreamReader::IHandler
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 {
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	318 private:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	319 IHttpHandler& handler_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	320 ChunkStore& chunkStore_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	321 const std::string& remoteIp_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	322 const std::string& username_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	323 const UriComponents& uri_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	324 bool isJQueryUploadChunk_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	325 std::string jqueryUploadFileName_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	326 size_t jqueryUploadFileSize_;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	327
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	328 void HandleInternal(const MultipartStreamReader::HttpHeaders& headers,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	329 const void* part,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	330 size_t size)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	331 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	332 StringHttpOutput stringOutput;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	333 HttpOutput fakeOutput(stringOutput, false);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	334 HttpToolbox::GetArguments getArguments;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	335
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	336 if (!handler_.Handle(fakeOutput, RequestOrigin_RestApi, remoteIp_.c_str(), username_.c_str(),
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	337 HttpMethod_Post, uri_, headers, getArguments, part, size))
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	338 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	339 throw OrthancException(ErrorCode_UnknownResource);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	340 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	341 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	342
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	343 public:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	344 MultipartFormDataHandler(IHttpHandler& handler,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	345 ChunkStore& chunkStore,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	346 const std::string& remoteIp,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	347 const std::string& username,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	348 const UriComponents& uri,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	349 const MultipartStreamReader::HttpHeaders& headers) :
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	350 handler_(handler),
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	351 chunkStore_(chunkStore),
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	352 remoteIp_(remoteIp),
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	353 username_(username),
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	354 uri_(uri),
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	355 isJQueryUploadChunk_(false),
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	356 jqueryUploadFileSize_(0) // Dummy initialization
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	357 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	358 typedef HttpToolbox::Arguments::const_iterator Iterator;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	359
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	360 Iterator requestedWith = headers.find("x-requested-with");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	361 if (requestedWith != headers.end() &&
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	362 requestedWith->second != "XMLHttpRequest")
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	363 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	364 throw OrthancException(ErrorCode_NetworkProtocol, "HTTP header \"X-Requested-With\" should be "
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	365 "\"XMLHttpRequest\" in multipart uploads");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	366 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	367
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	368 Iterator fileName = headers.find("x-file-name");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	369 Iterator fileSize = headers.find("x-file-size");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	370 if (fileName != headers.end() \|\|
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	371 fileSize != headers.end())
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	372 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	373 if (fileName == headers.end())
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	374 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	375 throw OrthancException(ErrorCode_NetworkProtocol, "HTTP header \"X-File-Name\" is missing");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	376 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	377
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	378 if (fileSize == headers.end())
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	379 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	380 throw OrthancException(ErrorCode_NetworkProtocol, "HTTP header \"X-File-Size\" is missing");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	381 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	382
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	383 isJQueryUploadChunk_ = true;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	384 jqueryUploadFileName_ = fileName->second;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	385
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	386 try
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	387 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	388 int64_t s = boost::lexical_cast<int64_t>(fileSize->second);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	389 if (s < 0)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	390 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	391 throw OrthancException(ErrorCode_NetworkProtocol, "HTTP header \"X-File-Size\" has negative value");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	392 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	393 else
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	394 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	395 jqueryUploadFileSize_ = static_cast<size_t>(s);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	396 if (static_cast<int64_t>(jqueryUploadFileSize_) != s)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	397 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	398 throw OrthancException(ErrorCode_NotEnoughMemory);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	399 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	400 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	401 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	402 catch (boost::bad_lexical_cast& e)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	403 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	404 throw OrthancException(ErrorCode_NetworkProtocol, "HTTP header \"X-File-Size\" is not an integer");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	405 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	406 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	407 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	408
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	409 virtual void HandlePart(const MultipartStreamReader::HttpHeaders& headers,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	410 const void* part,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	411 size_t size) ORTHANC_OVERRIDE
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	412 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	413 if (isJQueryUploadChunk_)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	414 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	415 std::string completedFile;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	416
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	417 PostDataStatus status = chunkStore_.Store(completedFile, part, size, jqueryUploadFileName_, jqueryUploadFileSize_);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	418
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	419 switch (status)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	420 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	421 case PostDataStatus_Failure:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	422 throw OrthancException(ErrorCode_NetworkProtocol, "Error in the multipart form upload");
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	423
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	424 case PostDataStatus_Success:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	425 assert(completedFile.size() == jqueryUploadFileSize_);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	426 HandleInternal(headers, completedFile.empty() ? NULL : completedFile.c_str(), completedFile.size());
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	427 break;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	428
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	429 case PostDataStatus_Pending:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	430 break;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	431
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	432 default:
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	433 throw OrthancException(ErrorCode_InternalError);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	434 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	435 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	436 else
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	437 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	438 HandleInternal(headers, part, size);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	439 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	440 }
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	441 };
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	442
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	443
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	444 void HttpServer::ProcessMultipartFormData(const std::string& remoteIp,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	445 const std::string& username,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	446 const UriComponents& uri,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	447 const std::map<std::string, std::string>& headers,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	448 const std::string& body,
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	449 const std::string& boundary)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	450 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	451 MultipartFormDataHandler handler(GetHandler(), pimpl_->chunkStore_, remoteIp, username, uri, headers);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	452
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	453 MultipartStreamReader reader(boundary);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	454 reader.SetHandler(handler);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	455 reader.AddChunk(body);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	456 reader.CloseStream();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 }
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	458
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	460 static PostDataStatus ReadBodyWithContentLength(std::string& body,
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	461 struct mg_connection *connection,
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	462 const std::string& contentLength)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 {
4152 36257d6f348f Support of multipart messages larger than 2GB in the embedded HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	464 size_t length;
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	465 try
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	466 {
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	467 int64_t tmp = boost::lexical_cast<int64_t>(contentLength);
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	468 if (tmp < 0)
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	469 {
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	470 return PostDataStatus_NoLength;
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	471 }
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	472
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	473 length = static_cast<size_t>(tmp);
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	474 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	475 catch (boost::bad_lexical_cast&)
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	476 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	477 return PostDataStatus_NoLength;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	478 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	479
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	480 body.resize(length);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	481
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	482 size_t pos = 0;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	483 while (length > 0)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 {
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	485 int r = mg_read(connection, &body[pos], length);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	486 if (r <= 0)
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	487 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	488 return PostDataStatus_Failure;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	489 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	490
4152 36257d6f348f Support of multipart messages larger than 2GB in the embedded HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	491 assert(static_cast<size_t>(r) <= length);
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	492 length -= r;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	493 pos += r;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	494 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	495
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	496 return PostDataStatus_Success;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	497 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	498
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	499
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	500 static PostDataStatus ReadBodyWithoutContentLength(std::string& body,
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	501 struct mg_connection *connection)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	502 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	503 // Store the individual chunks in a temporary file, then read it
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	504 // back into the memory buffer "body"
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	505 FileBuffer buffer;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	506
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	507 std::string tmp(1024 * 1024, 0);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	508
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	509 for (;;)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	510 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	511 int r = mg_read(connection, &tmp[0], tmp.size());
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	512 if (r < 0)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	513 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	514 return PostDataStatus_Failure;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	515 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	516 else if (r == 0)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	517 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	518 break;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	519 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	520 else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	521 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	522 buffer.Append(tmp.c_str(), r);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	523 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	524 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	525
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	526 buffer.Read(body);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	527
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	528 return PostDataStatus_Success;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	529 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	530
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	531
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	532 static PostDataStatus ReadBodyToString(std::string& body,
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	533 struct mg_connection *connection,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	534 const HttpToolbox::Arguments& headers)
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	535 {
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	536 HttpToolbox::Arguments::const_iterator contentLength = headers.find("content-length");
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	537
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	538 if (contentLength != headers.end())
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	539 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	540 // "Content-Length" is available
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	541 return ReadBodyWithContentLength(body, connection, contentLength->second);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	542 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	543 else
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	544 {
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	545 // No Content-Length
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	546 return ReadBodyWithoutContentLength(body, connection);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 }
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	548 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	549
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	550
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	551 static PostDataStatus ReadBodyToStream(IHttpHandler::IChunkedRequestReader& stream,
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	552 struct mg_connection *connection,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	553 const HttpToolbox::Arguments& headers)
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	554 {
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	555 HttpToolbox::Arguments::const_iterator contentLength = headers.find("content-length");
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	556
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	557 if (contentLength != headers.end())
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	558 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	559 // "Content-Length" is available
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	560 std::string body;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	561 PostDataStatus status = ReadBodyWithContentLength(body, connection, contentLength->second);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	562
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	563 if (status == PostDataStatus_Success &&
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	564 !body.empty())
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	565 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	566 stream.AddBodyChunk(body.c_str(), body.size());
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	567 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	568
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	569 return status;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	570 }
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	571 else
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	572 {
3404 e280ced38a4c ErrorCode_UnsupportedMediaType Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	573 // No Content-Length: This is a chunked transfer. Stream the HTTP connection.
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	574 std::string tmp(1024 * 1024, 0);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	575
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	576 for (;;)
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	577 {
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	578 int r = mg_read(connection, &tmp[0], tmp.size());
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	579 if (r < 0)
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	580 {
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	581 return PostDataStatus_Failure;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	582 }
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	583 else if (r == 0)
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	584 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	585 break;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	586 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	587 else
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	588 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	589 stream.AddBodyChunk(tmp.c_str(), r);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	590 }
3356 f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	591 }
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	592
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	593 return PostDataStatus_Success;
f744730c294b Orthanc now accepts chunked transfer encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3330 diff changeset	594 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	597
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	598 enum AccessMode
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	599 {
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	600 AccessMode_Forbidden,
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	601 AccessMode_AuthorizationToken,
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	602 AccessMode_RegisteredUser
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	603 };
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	604
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	605
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	606 static AccessMode IsAccessGranted(const HttpServer& that,
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	607 const HttpToolbox::Arguments& headers)
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	608 {
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	609 static const std::string BASIC = "Basic ";
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	610 static const std::string BEARER = "Bearer ";
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	611
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	612 HttpToolbox::Arguments::const_iterator auth = headers.find("authorization");
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	613 if (auth != headers.end())
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	614 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	615 std::string s = auth->second;
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	616 if (boost::starts_with(s, BASIC))
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	617 {
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	618 std::string b64 = s.substr(BASIC.length());
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	619 if (that.IsValidBasicHttpAuthentication(b64))
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	620 {
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	621 return AccessMode_RegisteredUser;
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	622 }
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	623 }
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	624 else if (boost::starts_with(s, BEARER) &&
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	625 that.GetIncomingHttpRequestFilter() != NULL)
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	626 {
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	627 // New in Orthanc 1.8.1
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	628 std::string token = s.substr(BEARER.length());
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	629 if (that.GetIncomingHttpRequestFilter()->IsValidBearerToken(token))
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	630 {
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	631 return AccessMode_AuthorizationToken;
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	632 }
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	633 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	634 }
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	635
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	636 return AccessMode_Forbidden;
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	637 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	638
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	639
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	640 static std::string GetAuthenticatedUsername(const HttpToolbox::Arguments& headers)
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	641 {
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	642 HttpToolbox::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	643
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	644 if (auth == headers.end())
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	645 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	646 return "";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	647 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	648
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	649 std::string s = auth->second;
1213 787059de6b9a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1202 diff changeset	650 if (s.size() <= 6 \|\|
787059de6b9a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1202 diff changeset	651 s.substr(0, 6) != "Basic ")
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	652 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	653 return "";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	654 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	655
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	656 std::string b64 = s.substr(6);
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	657 std::string decoded;
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	658 Toolbox::DecodeBase64(decoded, b64);
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	659 size_t semicolons = decoded.find(':');
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	660
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	661 if (semicolons == std::string::npos)
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	662 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	663 // Bad-formatted request
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	664 return "";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	665 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	666 else
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	667 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	668 return decoded.substr(0, semicolons);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	669 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	670 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	671
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	672
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	673 static bool ExtractMethod(HttpMethod& method,
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	674 const struct mg_request_info *request,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	675 const HttpToolbox::Arguments& headers,
a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	676 const HttpToolbox::GetArguments& argumentsGET)
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	677 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	678 std::string overriden;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	679
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	680 // Check whether some PUT/DELETE faking is done
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	681
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	682 // 1. Faking with Google's approach
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	683 HttpToolbox::Arguments::const_iterator methodOverride =
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	684 headers.find("x-http-method-override");
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	685
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	686 if (methodOverride != headers.end())
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	687 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	688 overriden = methodOverride->second;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	689 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	690 else if (!strcmp(request->request_method, "GET"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	691 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	692 // 2. Faking with Ruby on Rail's approach
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	693 // 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	694 for (size_t i = 0; i < argumentsGET.size(); i++)
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	695 {
1363 feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	696 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	697 {
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	698 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	699 break;
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	700 }
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	701 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	702 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	703
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	704 if (overriden.size() > 0)
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	705 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	706 // A faking has been done within this request
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	707 Toolbox::ToUpperCase(overriden);
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	708
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	709 CLOG(INFO, HTTP) << "HTTP method faking has been detected for " << overriden;
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	710
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	711 if (overriden == "PUT")
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	712 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	713 method = HttpMethod_Put;
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	714 return true;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	715 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	716 else if (overriden == "DELETE")
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	717 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	718 method = HttpMethod_Delete;
416 1188cb0ddaa5 http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	719 return true;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	720 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	721 else
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	722 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	723 return false;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	724 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	725 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	726
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	727 // No PUT/DELETE faking was present
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	728 if (!strcmp(request->request_method, "GET"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	729 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	730 method = HttpMethod_Get;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	731 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	732 else if (!strcmp(request->request_method, "POST"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	733 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	734 method = HttpMethod_Post;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	735 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	736 else if (!strcmp(request->request_method, "DELETE"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	737 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	738 method = HttpMethod_Delete;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	739 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	740 else if (!strcmp(request->request_method, "PUT"))
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	741 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	742 method = HttpMethod_Put;
414 26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	743 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	744 else
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	745 {
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	746 return false;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	747 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	748
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	749 return true;
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	750 }
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	751
26290b46056b http method faking Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	752
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	753 static void ConfigureHttpCompression(HttpOutput& output,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	754 const HttpToolbox::Arguments& headers)
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	755 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	756 // Look if the client wishes HTTP compression
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	757 // https://en.wikipedia.org/wiki/HTTP_compression
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	758 HttpToolbox::Arguments::const_iterator it = headers.find("accept-encoding");
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	759 if (it != headers.end())
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	760 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	761 std::vector<std::string> encodings;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	762 Toolbox::TokenizeString(encodings, it->second, ',');
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	763
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	764 for (size_t i = 0; i < encodings.size(); i++)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	765 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	766 std::string s = Toolbox::StripSpaces(encodings[i]);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	767
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	768 if (s == "deflate")
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	769 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	770 output.SetDeflateAllowed(true);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	771 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	772 else if (s == "gzip")
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	773 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	774 output.SetGzipAllowed(true);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	775 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	776 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	777 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	778 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	779
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	780
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	781 #if ORTHANC_ENABLE_PUGIXML == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	782
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	783 # if CIVETWEB_HAS_WEBDAV_WRITING == 0
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	784 static void AnswerWebDavReadOnly(HttpOutput& output,
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	785 const std::string& uri)
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	786 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	787 CLOG(ERROR, HTTP) << "Orthanc was compiled without support for read-write access to WebDAV: " << uri;
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	788 output.SendStatus(HttpStatus_403_Forbidden);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	789 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	790 # endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	791
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	792 static bool HandleWebDav(HttpOutput& output,
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	793 const HttpServer::WebDavBuckets& buckets,
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	794 const std::string& method,
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	795 const HttpToolbox::Arguments& headers,
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	796 const std::string& uri,
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	797 struct mg_connection connection / to read the PUT body if need be */)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	798 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	799 if (buckets.empty())
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	800 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	801 return false; // Speed up things if WebDAV is not used
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	802 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	803
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	804 /**
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	805 * The "buckets" maps an URI relative to the root of the
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	806 * bucket, to the content of the bucket. The root URI does not
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	807 * contain a trailing slash.
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	808 **/
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	809
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	810 if (method == "OPTIONS")
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	811 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	812 // Remove the trailing slash, if any (necessary for davfs2)
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	813 std::string s = uri;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	814 if (!s.empty() &&
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	815 s[s.size() - 1] == '/')
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	816 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	817 s.resize(s.size() - 1);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	818 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	819
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	820 HttpServer::WebDavBuckets::const_iterator bucket = buckets.find(s);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	821 if (bucket == buckets.end())
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	822 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	823 return false;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	824 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	825 else
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	826 {
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	827 output.AddHeader("DAV", "1,2"); // Necessary for Windows XP
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	828
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	829 #if CIVETWEB_HAS_WEBDAV_WRITING == 1
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	830 output.AddHeader("Allow", "GET, PUT, DELETE, OPTIONS, PROPFIND, HEAD, LOCK, UNLOCK, PROPPATCH, MKCOL");
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	831 #else
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	832 output.AddHeader("Allow", "GET, PUT, DELETE, OPTIONS, PROPFIND, HEAD");
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	833 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	834
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	835 output.SendStatus(HttpStatus_200_Ok);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	836 return true;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	837 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	838 }
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	839 else if (method == "GET" \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	840 method == "PROPFIND" \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	841 method == "PROPPATCH" \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	842 method == "PUT" \|\|
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	843 method == "DELETE" \|\|
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	844 method == "HEAD" \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	845 method == "LOCK" \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	846 method == "UNLOCK" \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	847 method == "MKCOL")
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	848 {
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	849 // Locate the WebDAV bucket of interest, if any
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	850 for (HttpServer::WebDavBuckets::const_iterator bucket = buckets.begin();
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	851 bucket != buckets.end(); ++bucket)
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	852 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	853 assert(!bucket->first.empty() &&
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	854 bucket->first[bucket->first.size() - 1] != '/' &&
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	855 bucket->second != NULL);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	856
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	857 if (uri == bucket->first \|\|
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	858 boost::starts_with(uri, bucket->first + "/"))
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	859 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	860 std::string s = uri.substr(bucket->first.size());
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	861 if (s.empty())
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	862 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	863 s = "/";
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	864 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	865
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	866 std::vector<std::string> path;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	867 Toolbox::SplitUriComponents(path, s);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	868
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	869
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	870 /**
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	871 * WebDAV - PROPFIND
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	872 **/
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	873
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	874 if (method == "PROPFIND")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	875 {
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	876 HttpToolbox::Arguments::const_iterator i = headers.find("depth");
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	877 if (i == headers.end())
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	878 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	879 throw OrthancException(ErrorCode_NetworkProtocol, "WebDAV PROPFIND without depth");
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	880 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	881
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	882 int depth = boost::lexical_cast<int>(i->second);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	883 if (depth != 0 &&
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	884 depth != 1)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	885 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	886 throw OrthancException(
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	887 ErrorCode_NetworkProtocol,
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	888 "WebDAV PROPFIND at unsupported depth (can only be 0 or 1): " + i->second);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	889 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	890
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	891 std::string answer;
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	892
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	893 MimeType mime;
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	894 std::string content;
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	895 boost::posix_time::ptime modificationTime = boost::posix_time::second_clock::universal_time();
4246 6c3721ff284c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4233 diff changeset	896
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	897 if (bucket->second->IsExistingFolder(path))
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	898 {
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	899 if (depth == 0)
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	900 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	901 IWebDavBucket::Collection c;
4246 6c3721ff284c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4233 diff changeset	902 c.Format(answer, uri);
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	903 }
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	904 else if (depth == 1)
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	905 {
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	906 IWebDavBucket::Collection c;
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	907
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	908 if (!bucket->second->ListCollection(c, path))
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	909 {
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	910 output.SendStatus(HttpStatus_404_NotFound);
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	911 return true;
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	912 }
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	913
4246 6c3721ff284c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4233 diff changeset	914 c.Format(answer, uri);
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	915 }
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	916 else
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	917 {
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	918 throw OrthancException(ErrorCode_InternalError);
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	919 }
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	920 }
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	921 else if (!path.empty() &&
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	922 bucket->second->GetFileContent(mime, content, modificationTime, path))
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	923 {
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	924 if (depth == 0 \|\|
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	925 depth == 1)
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	926 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	927 std::unique_ptr<IWebDavBucket::File> f(new IWebDavBucket::File(path.back()));
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	928 f->SetContentLength(content.size());
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	929 f->SetModificationTime(modificationTime);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	930 f->SetMimeType(mime);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	931
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	932 IWebDavBucket::Collection c;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	933 c.AddResource(f.release());
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	934
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	935 std::vector<std::string> p;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	936 Toolbox::SplitUriComponents(p, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	937 if (p.empty())
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	938 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	939 throw OrthancException(ErrorCode_InternalError);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	940 }
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	941
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	942 p.resize(p.size() - 1);
4246 6c3721ff284c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4233 diff changeset	943 c.Format(answer, Toolbox::FlattenUri(p));
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	944 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	945 else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	946 {
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	947 throw OrthancException(ErrorCode_InternalError);
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	948 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	949 }
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	950 else
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	951 {
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	952 output.SendStatus(HttpStatus_404_NotFound);
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	953 return true;
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	954 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	955
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	956 output.AddHeader("Content-Type", "application/xml; charset=UTF-8");
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	957 output.SendStatus(HttpStatus_207_MultiStatus, answer);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	958 return true;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	959 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	960
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	961
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	962 /**
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	963 * WebDAV - GET and HEAD
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	964 **/
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	965
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	966 else if (method == "GET" \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	967 method == "HEAD")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	968 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	969 MimeType mime;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	970 std::string content;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	971 boost::posix_time::ptime modificationTime;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	972
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	973 if (bucket->second->GetFileContent(mime, content, modificationTime, path))
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	974 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	975 output.AddHeader("Content-Type", EnumerationToString(mime));
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	976
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	977 // "Last-Modified" is necessary on Windows XP. The "Z"
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	978 // suffix is mandatory on Windows >= 7.
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	979 output.AddHeader("Last-Modified", boost::posix_time::to_iso_extended_string(modificationTime) + "Z");
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	980
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	981 if (method == "GET")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	982 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	983 output.Answer(content);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	984 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	985 else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	986 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	987 output.SendStatus(HttpStatus_200_Ok);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	988 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	989 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	990 else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	991 {
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	992 output.SendStatus(HttpStatus_404_NotFound);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	993 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	994
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	995 return true;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	996 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	997
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	998
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	999 /**
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1000 * WebDAV - PUT
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1001 **/
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1002
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1003 else if (method == "PUT")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1004 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1005 #if CIVETWEB_HAS_WEBDAV_WRITING == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1006 std::string body;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1007 if (ReadBodyToString(body, connection, headers) == PostDataStatus_Success)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1008 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1009 if (bucket->second->StoreFile(body, path))
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1010 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1011 //output.SendStatus(HttpStatus_200_Ok);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1012 output.SendStatus(HttpStatus_201_Created);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1013 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1014 else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1015 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1016 output.SendStatus(HttpStatus_403_Forbidden);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1017 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1018 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1019 else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1020 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1021 CLOG(ERROR, HTTP) << "Cannot read the content of a file to be stored in WebDAV";
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1022 output.SendStatus(HttpStatus_400_BadRequest);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1023 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1024 #else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1025 AnswerWebDavReadOnly(output, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1026 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1027
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1028 return true;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1029 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1030
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1031
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1032 /**
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1033 * WebDAV - DELETE
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1034 **/
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1035
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1036 else if (method == "DELETE")
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1037 {
4252 f047e2734655 fix webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4246 diff changeset	1038 if (bucket->second->DeleteItem(path))
4232 688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1039 {
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1040 output.SendStatus(HttpStatus_204_NoContent);
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1041 }
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1042 else
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1043 {
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1044 output.SendStatus(HttpStatus_403_Forbidden);
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1045 }
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1046 return true;
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1047 }
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1048
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1049
688435755466 added DELETE in WebDAV, first working virtual filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 4229 diff changeset	1050 /**
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1051 * WebDAV - MKCOL
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1052 **/
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1053
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1054 else if (method == "MKCOL")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1055 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1056 #if CIVETWEB_HAS_WEBDAV_WRITING == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1057 if (bucket->second->CreateFolder(path))
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1058 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1059 //output.SendStatus(HttpStatus_200_Ok);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1060 output.SendStatus(HttpStatus_201_Created);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1061 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1062 else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1063 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1064 output.SendStatus(HttpStatus_403_Forbidden);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1065 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1066 #else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1067 AnswerWebDavReadOnly(output, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1068 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1069
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1070 return true;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1071 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1072
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1073
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1074 /**
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1075 * WebDAV - Faking PROPPATCH, LOCK and UNLOCK
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1076 **/
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1077
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1078 else if (method == "PROPPATCH")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1079 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1080 #if CIVETWEB_HAS_WEBDAV_WRITING == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1081 IWebDavBucket::AnswerFakedProppatch(output, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1082 #else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1083 AnswerWebDavReadOnly(output, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1084 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1085 return true;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1086 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1087 else if (method == "LOCK")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1088 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1089 #if CIVETWEB_HAS_WEBDAV_WRITING == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1090 IWebDavBucket::AnswerFakedLock(output, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1091 #else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1092 AnswerWebDavReadOnly(output, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1093 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1094 return true;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1095 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1096 else if (method == "UNLOCK")
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1097 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1098 #if CIVETWEB_HAS_WEBDAV_WRITING == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1099 IWebDavBucket::AnswerFakedUnlock(output);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1100 #else
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1101 AnswerWebDavReadOnly(output, uri);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1102 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1103 return true;
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1104 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1105 else
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1106 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1107 throw OrthancException(ErrorCode_InternalError);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1108 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1109 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1110 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1111
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1112 return false;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1113 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1114 else
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1115 {
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1116 /**
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1117 * WebDAV - Unapplicable method (such as POST and DELETE)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1118 **/
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1119
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1120 return false;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1121 }
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1122 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1123 #endif /* ORTHANC_ENABLE_PUGIXML == 1 */
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1124
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1125
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1126 static void InternalCallback(HttpOutput& output /* out */,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1127 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	1128 HttpServer& server,
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1129 struct mg_connection *connection,
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1130 const struct mg_request_info *request)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1131 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1132 bool localhost;
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1133
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1134 #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	1135 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	1136 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	1137 #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	1138 // 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	1139 // 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	1140 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	1141 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1142 # error
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1143 #endif
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1144
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1145 // Check remote calls
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1146 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	1147 !localhost)
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1148 {
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1149 output.SendUnauthorized(server.GetRealm()); // 401 error
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1150 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1151 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1152
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1153
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1154 // Extract the HTTP headers
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	1155 HttpToolbox::Arguments headers;
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1156 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	1157 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1158 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	1159 std::string value = request->http_headers[i].value;
ad95331c526a trace log of http headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1963 diff changeset	1160
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1161 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	1162 headers.insert(std::make_pair(name, value));
4294 0923247e69f6 log categories: rest -> http + added lua & jobs Alain Mazy <alain@mazy.be> parents: 4273 diff changeset	1163 CLOG(TRACE, HTTP) << "HTTP header: [" << name << "]: [" << value << "]";
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1164 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1165
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1166 if (server.IsHttpCompressionEnabled())
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1167 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1168 ConfigureHttpCompression(output, headers);
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1169 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1170
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1171
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1172 // Extract the GET arguments
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	1173 HttpToolbox::GetArguments argumentsGET;
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1174 if (!strcmp(request->request_method, "GET"))
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1175 {
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	1176 HttpToolbox::ParseGetArguments(argumentsGET, request->query_string);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1177 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1178
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1179
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1180 AccessMode accessMode = IsAccessGranted(server, headers);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1181
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1182 // Authenticate this connection
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1183 if (server.IsAuthenticationEnabled() &&
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1184 accessMode == AccessMode_Forbidden)
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1185 {
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1186 output.SendUnauthorized(server.GetRealm()); // 401 error
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1187 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1188 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1189
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1190
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1191 #if ORTHANC_ENABLE_MONGOOSE == 1
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1192 // 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	1193 char remoteIp[24];
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	1194 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	1195 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	1196 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	1197 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	1198 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	1199
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1200 const char* requestUri = request->uri;
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1201
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1202 #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	1203 const char* remoteIp = request->remote_addr;
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1204 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	1205 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1206 # error
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1207 #endif
1571 3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	1208
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1209 if (requestUri == NULL)
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1210 {
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1211 requestUri = "";
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1212 }
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1213
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1214 // Decompose the URI into its components
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1215 UriComponents uri;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1216 try
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1217 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1218 Toolbox::SplitUriComponents(uri, requestUri);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1219 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1220 catch (OrthancException&)
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1221 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1222 output.SendStatus(HttpStatus_400_BadRequest);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1223 return;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1224 }
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1225
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1226
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1227 // Compute the HTTP method, taking method faking into consideration
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1228 method = HttpMethod_Get;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1229
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1230 #if ORTHANC_ENABLE_PUGIXML == 1
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1231 bool isWebDav = false;
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1232 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1233
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1234 HttpMethod filterMethod;
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1235
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1236
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1237 if (ExtractMethod(method, request, headers, argumentsGET))
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1238 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1239 CLOG(INFO, HTTP) << EnumerationToString(method) << " " << Toolbox::FlattenUri(uri);
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1240 filterMethod = method;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1241 }
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1242 #if ORTHANC_ENABLE_PUGIXML == 1
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1243 else if (!strcmp(request->request_method, "OPTIONS") \|\|
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1244 !strcmp(request->request_method, "PROPFIND") \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1245 !strcmp(request->request_method, "HEAD"))
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1246 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1247 CLOG(INFO, HTTP) << "Incoming read-only WebDAV request: "
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1248 << request->request_method << " " << requestUri;
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1249 filterMethod = HttpMethod_Get;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1250 isWebDav = true;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1251 }
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1252 else if (!strcmp(request->request_method, "PROPPATCH") \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1253 !strcmp(request->request_method, "LOCK") \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1254 !strcmp(request->request_method, "UNLOCK") \|\|
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1255 !strcmp(request->request_method, "MKCOL"))
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1256 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1257 CLOG(INFO, HTTP) << "Incoming read-write WebDAV request: "
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1258 << request->request_method << " " << requestUri;
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1259 filterMethod = HttpMethod_Put;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1260 isWebDav = true;
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1261 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1262 #endif /* ORTHANC_ENABLE_PUGIXML == 1 */
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1263 else
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1264 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1265 CLOG(INFO, HTTP) << "Unknown HTTP method: " << request->request_method;
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1266 output.SendStatus(HttpStatus_400_BadRequest);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1267 return;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1268 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1269
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1270
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1271 const std::string username = GetAuthenticatedUsername(headers);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1272
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1273 if (accessMode != AccessMode_AuthorizationToken)
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1274 {
4343 e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1275 // Check that this access is granted by the user's authorization
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1276 // filter. In the case of an authorization bearer token, grant
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1277 // full access to the API.
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1278
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1279 assert(accessMode == AccessMode_Forbidden \|\| // Could be the case if "!server.IsAuthenticationEnabled()"
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1280 accessMode == AccessMode_RegisteredUser);
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1281
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1282 IIncomingHttpRequestFilter *filter = server.GetIncomingHttpRequestFilter();
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1283 if (filter != NULL &&
e1e918e790e8 New function in the SDK: OrthancPluginGenerateRestApiAuthorizationToken() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	1284 !filter->IsAllowed(filterMethod, requestUri, remoteIp,
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1285 username.c_str(), headers, argumentsGET))
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1286 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1287 output.SendStatus(HttpStatus_403_Forbidden);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1288 return;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1289 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1290 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1291
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1292
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1293 #if ORTHANC_ENABLE_PUGIXML == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1294 if (HandleWebDav(output, server.GetWebDavBuckets(), request->request_method,
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1295 headers, requestUri, connection))
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1296 {
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1297 return;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1298 }
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1299 else if (isWebDav)
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1300 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1301 CLOG(INFO, HTTP) << "No WebDAV bucket is registered against URI: "
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1302 << request->request_method << " " << requestUri;
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1303 output.SendStatus(HttpStatus_404_NotFound);
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1304 return;
7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	1305 }
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1306 #endif
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1307
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1308
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1309 bool found = false;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1310
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1311 // Extract the body of the request for PUT and POST, or process
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1312 // the body as a stream
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1443 diff changeset	1313
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1314 std::string body;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1315 if (method == HttpMethod_Post \|\|
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1316 method == HttpMethod_Put)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1317 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1318 PostDataStatus status;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1319
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1320 bool isMultipartForm = false;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1321
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1322 std::string type, subType, boundary;
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4301 diff changeset	1323 HttpToolbox::Arguments::const_iterator ct = headers.find("content-type");
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1324 if (method == HttpMethod_Post &&
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1325 ct != headers.end() &&
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1326 MultipartStreamReader::ParseMultipartContentType(type, subType, boundary, ct->second) &&
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1327 type == "multipart/form-data")
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1328 {
3445 4944b03bb9c6 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1329 /**
4944b03bb9c6 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1330 * The user uses the "upload" form of Orthanc Explorer, for
4944b03bb9c6 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1331 * file uploads through a HTML form.
4944b03bb9c6 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1332 **/
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1333 isMultipartForm = true;
4454 f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1334
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1335 status = ReadBodyToString(body, connection, headers);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1336 if (status == PostDataStatus_Success)
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1337 {
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1338 server.ProcessMultipartFormData(remoteIp, username, uri, headers, body, boundary);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1339 output.SendStatus(HttpStatus_200_Ok);
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1340 return;
f20a7655fb1c Fix upload of multiple DICOM files using one single POST call to "multipart/form-data" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4449 diff changeset	1341 }
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1342 }
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1343
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1344 if (!isMultipartForm)
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1345 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3672 diff changeset	1346 std::unique_ptr<IHttpHandler::IChunkedRequestReader> stream;
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1347
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1348 if (server.HasHandler())
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1349 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1350 found = server.GetHandler().CreateChunkedRequestReader
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1351 (stream, RequestOrigin_RestApi, remoteIp, username.c_str(), method, uri, headers);
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1352 }
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1353
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1354 if (found)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1355 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1356 if (stream.get() == NULL)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1357 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1358 throw OrthancException(ErrorCode_InternalError);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1359 }
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1360
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1361 status = ReadBodyToStream(*stream, connection, headers);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1362
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1363 if (status == PostDataStatus_Success)
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1364 {
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1365 stream->Execute(output);
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1366 }
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1367 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1368 else
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1369 {
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1370 status = ReadBodyToString(body, connection, headers);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1371 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1372 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1373
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1374 switch (status)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1375 {
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1376 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	1377 output.SendStatus(HttpStatus_411_LengthRequired);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1378 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1379
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1380 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	1381 output.SendStatus(HttpStatus_400_BadRequest);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1382 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1383
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1384 case PostDataStatus_Pending:
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	1385 output.AnswerEmpty();
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1386 return;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1387
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1388 case PostDataStatus_Success:
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1389 break;
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1390
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1391 default:
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1392 throw OrthancException(ErrorCode_InternalError);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1393 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1394 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1395
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1396 if (!found &&
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3357 diff changeset	1397 server.HasHandler())
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1398 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1399 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	1400 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	1401 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1402
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1403 if (!found)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1404 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1405 throw OrthancException(ErrorCode_UnknownResource);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1406 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1407 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1408
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1409
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1410 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	1411 const struct mg_request_info *request)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1412 {
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1413 try
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1414 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1415 #if ORTHANC_ENABLE_MONGOOSE == 1
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1416 void *that = request->user_data;
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1417 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	1418 #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	1419 // 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	1420 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	1421 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	1422 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1423 # error
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1424 #endif
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1425
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1426 if (requestUri == NULL)
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1427 {
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1428 requestUri = "";
ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1429 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1430
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1431 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	1432
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1433 if (server == NULL)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1434 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1435 MongooseOutputStream stream(connection);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1436 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	1437 output.SendStatus(HttpStatus_500_InternalServerError);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1438 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1439 }
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1440
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1441 MongooseOutputStream stream(connection);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1442 HttpOutput output(stream, server->IsKeepAliveEnabled());
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1443 HttpMethod method = HttpMethod_Get;
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1568 diff changeset	1444
27774f6f84e4 improved error handling in http answers jodogne parents: 1568 diff changeset	1445 try
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	1446 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1447 try
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1448 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1449 InternalCallback(output, method, *server, connection, request);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1450 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1451 catch (OrthancException&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1452 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1453 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	1454 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1455 // Now convert native exceptions as OrthancException
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1456 catch (boost::bad_lexical_cast&)
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	1457 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1458 throw OrthancException(ErrorCode_BadParameterType,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1459 "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	1460 }
3672 ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1461 catch (boost::filesystem::filesystem_error& e)
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1462 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1463 throw OrthancException(ErrorCode_InternalError,
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1464 "Error while accessing the filesystem: " + e.path1().string());
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1465 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1466 catch (std::runtime_error&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1467 {
3672 ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1468 throw OrthancException(ErrorCode_BadRequest,
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1469 "Presumably an error while parsing the JSON body");
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1470 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1471 catch (std::bad_alloc&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1472 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1473 throw OrthancException(ErrorCode_NotEnoughMemory,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1474 "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	1475 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1476 catch (...)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1477 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1478 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1479 "An unhandled exception was generated inside the HTTP server");
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	1480 }
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	1481 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1482 catch (OrthancException& e)
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	1483 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1484 assert(server != NULL);
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1568 diff changeset	1485
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1486 // 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	1487 try
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1488 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1489 if (server->GetExceptionFormatter() == NULL)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1490 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1491 CLOG(ERROR, HTTP) << "Exception in the HTTP handler: " << e.What();
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1492 output.SendStatus(e.GetHttpStatus());
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1493 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1494 else
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1495 {
3068 ad37c21ec4db fix compatibility with civetweb 1.11 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1496 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	1497 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1498 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1499 catch (OrthancException&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1500 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1501 // 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	1502 // 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	1503 }
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	1504 }
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1505 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1506 catch (...)
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1507 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1508 // We should never arrive at this point, where it is even impossible to send an answer
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1509 CLOG(ERROR, HTTP) << "Catastrophic error inside the HTTP server, giving up";
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1510 }
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1511 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1512
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1513
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1514 #if MONGOOSE_USE_CALLBACKS == 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1515 static void* Callback(enum mg_event event,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1516 struct mg_connection *connection,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1517 const struct mg_request_info *request)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1518 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1519 if (event == MG_NEW_REQUEST)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1520 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1521 ProtectedCallback(connection, request);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1522
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1523 // Mark as processed
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1524 return (void*) "";
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1525 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1526 else
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1527 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1528 return NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1529 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1530 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1531
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1532 #elif MONGOOSE_USE_CALLBACKS == 1
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1533 static int Callback(struct mg_connection *connection)
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1534 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1535 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	1536
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1537 ProtectedCallback(connection, request);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1538
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1539 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	1540 }
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1541
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1542 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1543 # error Please set MONGOOSE_USE_CALLBACKS
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1544 #endif
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1545
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1546
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1547
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1548
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1549
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1550 bool HttpServer::IsRunning() const
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1551 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1552 return (pimpl_->context_ != NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1553 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1554
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1555
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1556 HttpServer::HttpServer() :
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1557 pimpl_(new PImpl),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1558 handler_(NULL),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1559 remoteAllowed_(false),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1560 authentication_(false),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1561 sslVerifyPeers_(false),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1562 ssl_(false),
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1563 sslMinimumVersion_(0), // Default to any of "SSL2+SSL3+TLS1.0+TLS1.1+TLS1.2"
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1564 sslHasCiphers_(false),
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1565 port_(8000),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1566 filter_(NULL),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1567 keepAlive_(false),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1568 httpCompression_(true),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1569 exceptionFormatter_(NULL),
2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1570 realm_(ORTHANC_REALM),
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1571 threadsCount_(50), // Default value in mongoose/civetweb
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	1572 tcpNoDelay_(true),
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1573 requestTimeout_(30) // Default value in mongoose/civetweb (30 seconds)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1574 {
3145 239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	1575 #if ORTHANC_ENABLE_MONGOOSE == 1
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1576 CLOG(INFO, HTTP) << "This Orthanc server uses Mongoose as its embedded HTTP server";
3145 239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	1577 #endif
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	1578
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	1579 #if ORTHANC_ENABLE_CIVETWEB == 1
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1580 CLOG(INFO, HTTP) << "This Orthanc server uses CivetWeb as its embedded HTTP server";
3145 239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	1581 #endif
239331e4ee0b log about what HTTP server is running Sebastien Jodogne <s.jodogne@gmail.com> parents: 3138 diff changeset	1582
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	1583 #if ORTHANC_ENABLE_SSL == 1
749 b8c49473be38 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	1584 // 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	1585 // 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	1586 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	1587 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	1588 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1589 CLOG(WARNING, HTTP) << "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	1590 }
de9763f63510 upgrade to openssl-1.0.1g because of heartbeat exploit Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1591 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1592 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1593
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1594
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1595 HttpServer::~HttpServer()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1596 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1597 Stop();
4226 7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1598
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1599 #if ORTHANC_ENABLE_PUGIXML == 1
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1600 for (WebDavBuckets::iterator it = webDavBuckets_.begin(); it != webDavBuckets_.end(); ++it)
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1601 {
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1602 assert(it->second != NULL);
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1603 delete it->second;
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1604 }
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	1605 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1606 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1607
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1608
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1609 void HttpServer::SetPortNumber(uint16_t port)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1610 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1611 Stop();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1612 port_ = port;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1613 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1614
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1615 uint16_t HttpServer::GetPortNumber() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1616 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1617 return port_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1618 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1619
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1620 void HttpServer::Start()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1621 {
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1622 #if ORTHANC_ENABLE_MONGOOSE == 1
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1623 CLOG(INFO, HTTP) << "Starting embedded Web server using Mongoose";
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1624 #elif ORTHANC_ENABLE_CIVETWEB == 1
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1625 CLOG(INFO, HTTP) << "Starting embedded Web server using Civetweb";
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1626 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1627 # error
2377 32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1628 #endif
32bea64e070b Experimental support of actively maintained Civetweb to replace Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1629
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1630 if (!IsRunning())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1631 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1632 std::string port = boost::lexical_cast<std::string>(port_);
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1633 std::string numThreads = boost::lexical_cast<std::string>(threadsCount_);
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	1634 std::string requestTimeoutMilliseconds = boost::lexical_cast<std::string>(requestTimeout_ * 1000);
4301 6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1635 std::string keepAliveTimeoutMilliseconds = boost::lexical_cast<std::string>(CIVETWEB_KEEP_ALIVE_TIMEOUT_SECONDS * 1000);
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1636 std::string sslMinimumVersion = boost::lexical_cast<std::string>(sslMinimumVersion_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1637
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1638 if (ssl_)
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1639 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1640 port += "s";
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1641 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1642
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1643 std::vector<const char*> options;
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1644
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1645 // Set the TCP port for the HTTP server
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1646 options.push_back("listening_ports");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1647 options.push_back(port.c_str());
1110 becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1648
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1649 // Optimization reported by Chris Hafey
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1650 // https://groups.google.com/d/msg/orthanc-users/CKueKX0pJ9E/_UCbl8T-VjIJ
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1651 options.push_back("enable_keep_alive");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1652 options.push_back(keepAlive_ ? "yes" : "no");
1110 becde5351e47 preparing to update mongoose Sebastien Jodogne <s.jodogne@gmail.com> parents: 1100 diff changeset	1653
2579 010577b52f5f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2577 diff changeset	1654 #if ORTHANC_ENABLE_CIVETWEB == 1
4301 6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1655 /**
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1656 * The "keep_alive_timeout_ms" cannot use milliseconds, as the
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1657 * value of "timeout" in the HTTP header "Keep-Alive" must be
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1658 * expressed in seconds (at least for the Java client).
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1659 * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Keep-Alive
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1660 * https://github.com/civetweb/civetweb/blob/master/docs/UserManual.md#enable_keep_alive-no
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1661 * https://github.com/civetweb/civetweb/blob/master/docs/UserManual.md#keep_alive_timeout_ms-500-or-0
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1662 **/
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1663 options.push_back("keep_alive_timeout_ms");
4301 6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	1664 options.push_back(keepAlive_ ? keepAliveTimeoutMilliseconds.c_str() : "0");
2577 6783a7c02990 keep_alive_timeout_ms for civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1665 #endif
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	1666
3136 f948deef53d9 using tcp_nodelay in civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3069 diff changeset	1667 #if ORTHANC_ENABLE_CIVETWEB == 1
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1668 // Disable TCP Nagle's algorithm to maximize speed (this
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1669 // option is not available in Mongoose).
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1670 // https://groups.google.com/d/topic/civetweb/35HBR9seFjU/discussion
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1671 // https://eklitzke.org/the-caveats-of-tcp-nodelay
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1672 options.push_back("tcp_nodelay");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1673 options.push_back(tcpNoDelay_ ? "1" : "0");
3136 f948deef53d9 using tcp_nodelay in civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3069 diff changeset	1674 #endif
f948deef53d9 using tcp_nodelay in civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3069 diff changeset	1675
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1676 // Set the number of threads
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1677 options.push_back("num_threads");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1678 options.push_back(numThreads.c_str());
2577 6783a7c02990 keep_alive_timeout_ms for civetweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1679
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1680 // Set the timeout for the HTTP server
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1681 options.push_back("request_timeout_ms");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1682 options.push_back(requestTimeoutMilliseconds.c_str());
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1683
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1684 // Set the client authentication
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1685 options.push_back("ssl_verify_peer");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1686 options.push_back(sslVerifyPeers_ ? "yes" : "no");
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	1687
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1688 if (sslVerifyPeers_)
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1689 {
4190 9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1690 // Set the trusted client certificates (for X509 mutual authentication)
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1691 options.push_back("ssl_ca_file");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1692 options.push_back(trustedClientCertificates_.c_str());
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1693 }
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1694
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1695 if (ssl_)
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1696 {
4381 df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1697 // Restrict minimum SSL/TLS protocol version
df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1698 options.push_back("ssl_protocol_version");
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1699 options.push_back(sslMinimumVersion.c_str());
4381 df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1700
df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1701 // Set the accepted ciphers list
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1702 if (sslHasCiphers_)
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1703 {
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1704 options.push_back("ssl_cipher_list");
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1705 options.push_back(sslCiphers_.c_str());
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1706 }
4381 df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1707
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1708 // Set the SSL certificate, if any
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1709 options.push_back("ssl_certificate");
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1710 options.push_back(certificate_.c_str());
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1711 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1712
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1713 assert(options.size() % 2 == 0);
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1714 options.push_back(NULL);
ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1715
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1716 #if MONGOOSE_USE_CALLBACKS == 0
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1717 pimpl_->context_ = mg_start(&Callback, this, &options[0]);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1718
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1719 #elif MONGOOSE_USE_CALLBACKS == 1
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1720 struct mg_callbacks callbacks;
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1721 memset(&callbacks, 0, sizeof(callbacks));
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1722 callbacks.begin_request = Callback;
4193 ff24a06b3474 fix HttpServer options if sslVerifyPeers_ == false and ssl_ == true Sebastien Jodogne <s.jodogne@gmail.com> parents: 4190 diff changeset	1723 pimpl_->context_ = mg_start(&callbacks, this, &options[0]);
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1724
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1725 #else
3069 3db9697a0a58 cosmetic Sebastien Jodogne <s.jodogne@gmail.com> parents: 3068 diff changeset	1726 # error Please set MONGOOSE_USE_CALLBACKS
1112 a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1727 #endif
a119f9ae3640 upgrade to Mongoose 3.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1110 diff changeset	1728
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1729 if (!pimpl_->context_)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1730 {
3801 9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1731 bool isSslError = false;
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1732
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1733 #if ORTHANC_ENABLE_SSL == 1
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1734 for (;;)
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1735 {
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1736 unsigned long code = ERR_get_error();
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1737 if (code == 0)
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1738 {
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1739 break;
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1740 }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1741 else
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1742 {
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1743 isSslError = true;
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1744 char message[1024];
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1745 ERR_error_string_n(code, message, sizeof(message) - 1);
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1746 CLOG(ERROR, HTTP) << "OpenSSL error: " << message;
3801 9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1747 }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1748 }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1749 #endif
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1750
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1751 if (isSslError)
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1752 {
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1753 throw OrthancException(ErrorCode_SslInitialization);
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1754 }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1755 else
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1756 {
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1757 throw OrthancException(ErrorCode_HttpPortInUse,
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1758 " (port = " + boost::lexical_cast<std::string>(port_) + ")");
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1759 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1760 }
2633 40c7926b75f8 log about remote access allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2579 diff changeset	1761
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1762 #if ORTHANC_ENABLE_PUGIXML == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1763 for (WebDavBuckets::iterator it = webDavBuckets_.begin(); it != webDavBuckets_.end(); ++it)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1764 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1765 assert(it->second != NULL);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1766 it->second->Start();
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1767 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1768 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1769
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1770 CLOG(WARNING, HTTP) << "HTTP server listening on port: " << GetPortNumber()
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1771 << " (HTTPS encryption is "
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1772 << (IsSslEnabled() ? "enabled" : "disabled")
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1773 << ", remote access is "
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1774 << (IsRemoteAccessAllowed() ? "" : "not ")
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1775 << "allowed)";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1776 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1777 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1778
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1779 void HttpServer::Stop()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1780 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1781 if (IsRunning())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1782 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1783 mg_stop(pimpl_->context_);
4228 c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1784
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1785 #if ORTHANC_ENABLE_PUGIXML == 1
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1786 for (WebDavBuckets::iterator it = webDavBuckets_.begin(); it != webDavBuckets_.end(); ++it)
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1787 {
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1788 assert(it->second != NULL);
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1789 it->second->Stop();
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1790 }
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1791 #endif
c8c0bbaaace3 write access to webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 4227 diff changeset	1792
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1793 pimpl_->context_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1794 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1795 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1796
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1797
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1798 void HttpServer::ClearUsers()
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1799 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1800 Stop();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1801 registeredUsers_.clear();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1802 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1803
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1804
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1805 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	1806 const char* password)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1807 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1808 Stop();
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	1809
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	1810 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	1811 std::string encoded;
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	1812 Toolbox::EncodeBase64(encoded, tag);
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 749 diff changeset	1813 registeredUsers_.insert(encoded);
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1814 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1815
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1816 bool HttpServer::IsAuthenticationEnabled() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1817 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1818 return authentication_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1819 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1820
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1821 void HttpServer::SetSslEnabled(bool enabled)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1822 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1823 Stop();
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1824
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	1825 #if ORTHANC_ENABLE_SSL == 0
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1826 if (enabled)
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1827 {
1674 4fc502d469f4 fix build if SSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	1828 throw OrthancException(ErrorCode_SslDisabled);
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1829 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1830 else
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1831 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1832 ssl_ = false;
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1833 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1834 #else
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1835 ssl_ = enabled;
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1836 #endif
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1837 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1838
4190 9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1839 void HttpServer::SetSslVerifyPeers(bool enabled)
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1840 {
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1841 Stop();
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1842
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1843 #if ORTHANC_ENABLE_SSL == 0
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1844 if (enabled)
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1845 {
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1846 throw OrthancException(ErrorCode_SslDisabled);
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1847 }
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1848 else
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1849 {
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1850 sslVerifyPeers_ = false;
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1851 }
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1852 #else
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1853 sslVerifyPeers_ = enabled;
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1854 #endif
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1855 }
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1856
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1857 void HttpServer::SetSslMinimumVersion(unsigned int version)
4381 df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1858 {
df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1859 Stop();
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1860 sslMinimumVersion_ = version;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1861
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1862 std::string info;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1863
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1864 switch (version)
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1865 {
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1866 case 0:
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1867 info = "SSL2+SSL3+TLS1.0+TLS1.1+TLS1.2";
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1868 break;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1869
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1870 case 1:
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1871 info = "SSL3+TLS1.0+TLS1.1+TLS1.2";
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1872 break;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1873
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1874 case 2:
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1875 info = "TLS1.0+TLS1.1+TLS1.2";
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1876 break;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1877
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1878 case 3:
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1879 info = "TLS1.1+TLS1.2";
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1880 break;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1881
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1882 case 4:
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1883 info = "TLS1.2";
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1884 break;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1885
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1886 default:
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1887 info = "Unknown value (" + boost::lexical_cast<std::string>(version) + ")";
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1888 break;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1889 }
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1890
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1891 CLOG(INFO, HTTP) << "Minimal accepted version of SSL/TLS protocol: " << info;
4381 df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1892 }
df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1893
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1894 void HttpServer::SetSslCiphers(const std::list<std::string>& ciphers)
4381 df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1895 {
df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1896 Stop();
4382 3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1897
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1898 sslHasCiphers_ = true;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1899 sslCiphers_.clear();
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1900
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1901 for (std::list<std::string>::const_iterator
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1902 it = ciphers.begin(); it != ciphers.end(); ++it)
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1903 {
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1904 if (it->empty())
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1905 {
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1906 throw OrthancException(ErrorCode_ParameterOutOfRange, "Empty name for a cipher");
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1907 }
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1908
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1909 if (!sslCiphers_.empty())
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1910 {
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1911 sslCiphers_ += ':';
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1912 }
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1913
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1914 sslCiphers_ += (*it);
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1915 }
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1916
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1917 CLOG(INFO, HTTP) << "List of accepted SSL ciphers: " << sslCiphers_;
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1918
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1919 if (sslCiphers_.empty())
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1920 {
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1921 CLOG(WARNING, HTTP) << "No cipher is accepted for SSL";
3aacd2bd8bbc review changeset 4381:df313e410f0c Sebastien Jodogne <s.jodogne@gmail.com> parents: 4381 diff changeset	1922 }
4381 df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1923 }
df313e410f0c Add support to configure minimimum accepted TLS version and cipher suite Andrew Wallis <andrew.wallis@varian.com>> parents: 4343 diff changeset	1924
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1925 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	1926 {
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1927 Stop();
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1928 keepAlive_ = enabled;
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1929 CLOG(INFO, HTTP) << "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	1930
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1931 #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	1932 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	1933 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1934 CLOG(WARNING, HTTP) << "You should disable HTTP keep alive, as you are using 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	1935 }
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	1936 #endif
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1937 }
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1938
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1939 const std::string &HttpServer::GetSslCertificate() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1940 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1941 return certificate_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1942 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1943
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	1944
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1945 void HttpServer::SetAuthenticationEnabled(bool enabled)
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1946 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1947 Stop();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1948 authentication_ = enabled;
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1949 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1950
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1951 bool HttpServer::IsSslEnabled() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1952 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1953 return ssl_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1954 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1955
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1956 void HttpServer::SetSslCertificate(const char* path)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1957 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1958 Stop();
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1959 certificate_ = path;
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1960 }
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	1961
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1962 bool HttpServer::IsRemoteAccessAllowed() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1963 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1964 return remoteAllowed_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1965 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1966
4190 9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1967 void HttpServer::SetSslTrustedClientCertificates(const char* path)
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1968 {
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1969 Stop();
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1970 trustedClientCertificates_ = path;
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1971 }
9ce5c89328f5 New configuration options to enable HTTP peers identification through certificates Alain Mazy <alain@mazy.be> parents: 4152 diff changeset	1972
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1973 bool HttpServer::IsKeepAliveEnabled() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1974 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1975 return keepAlive_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1976 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1977
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1978 void HttpServer::SetRemoteAccessAllowed(bool allowed)
34 96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1979 {
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1980 Stop();
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1981 remoteAllowed_ = allowed;
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1982 }
96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	1983
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1984 bool HttpServer::IsHttpCompressionEnabled() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1985 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1986 return httpCompression_;;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1987 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1988
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	1989 void HttpServer::SetHttpCompressionEnabled(bool enabled)
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1990 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1991 Stop();
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1992 httpCompression_ = enabled;
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	1993 CLOG(WARNING, HTTP) << "HTTP compression is " << (enabled ? "enabled" : "disabled");
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1994 }
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1995
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1996 IIncomingHttpRequestFilter *HttpServer::GetIncomingHttpRequestFilter() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1997 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1998 return filter_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	1999 }
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	2000
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	2001 void HttpServer::SetIncomingHttpRequestFilter(IIncomingHttpRequestFilter& filter)
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	2002 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	2003 Stop();
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	2004 filter_ = &filter;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	2005 }
34 96e57b863dd9 option to disallow remote access Sebastien Jodogne <s.jodogne@gmail.com> parents: 25 diff changeset	2006
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	2007
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	2008 void HttpServer::SetHttpExceptionFormatter(IHttpExceptionFormatter& formatter)
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	2009 {
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	2010 Stop();
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	2011 exceptionFormatter_ = &formatter;
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	2012 }
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	2013
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2014 IHttpExceptionFormatter *HttpServer::GetExceptionFormatter()
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2015 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2016 return exceptionFormatter_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2017 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2018
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2019 const std::string &HttpServer::GetRealm() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2020 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2021 return realm_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2022 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2023
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2024 void HttpServer::SetRealm(const std::string &realm)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2025 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2026 realm_ = realm;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2027 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2028
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	2029
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	2030 bool HttpServer::IsValidBasicHttpAuthentication(const std::string& basic) const
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	2031 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	2032 return registeredUsers_.find(basic) != registeredUsers_.end();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 24 diff changeset	2033 }
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2034
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2035
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	2036 void HttpServer::Register(IHttpHandler& handler)
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2037 {
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2038 Stop();
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2039 handler_ = &handler;
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2040 }
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2041
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2042 bool HttpServer::HasHandler() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2043 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2044 return handler_ != NULL;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2045 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2046
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2047
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	2048 IHttpHandler& HttpServer::GetHandler() const
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2049 {
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2050 if (handler_ == NULL)
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2051 {
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2052 throw OrthancException(ErrorCode_InternalError);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2053 }
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2054
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2055 return *handler_;
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	2056 }
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2057
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2058
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	2059 void HttpServer::SetThreadsCount(unsigned int threads)
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2060 {
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	2061 if (threads == 0)
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2062 {
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2063 throw OrthancException(ErrorCode_ParameterOutOfRange);
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2064 }
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2065
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2066 Stop();
1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2067 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	2068
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	2069 CLOG(INFO, HTTP) << "The embedded HTTP server will use " << threads << " threads";
2903 1153b1a128fe MongooseServer::SetThreadsCount() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	2070 }
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	2071
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2072 unsigned int HttpServer::GetThreadsCount() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2073 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2074 return threadsCount_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2075 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2076
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2077
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	2078 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	2079 {
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	2080 Stop();
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	2081 tcpNoDelay_ = tcpNoDelay;
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	2082 CLOG(INFO, HTTP) << "TCP_NODELAY for the HTTP sockets is set to "
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	2083 << (tcpNoDelay ? "true" : "false");
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3136 diff changeset	2084 }
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2085
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2086 bool HttpServer::IsTcpNoDelay() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2087 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2088 return tcpNoDelay_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2089 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2090
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2091
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2092 void HttpServer::SetRequestTimeout(unsigned int seconds)
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2093 {
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4193 diff changeset	2094 if (seconds == 0)
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2095 {
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2096 throw OrthancException(ErrorCode_ParameterOutOfRange,
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2097 "Request timeout must be a stricly positive integer");
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2098 }
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2099
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2100 Stop();
9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2101 requestTimeout_ = seconds;
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	2102 CLOG(INFO, HTTP) << "Request timeout in the HTTP server is set to " << seconds << " seconds";
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3445 diff changeset	2103 }
4226 7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2104
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2105 unsigned int HttpServer::GetRequestTimeout() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2106 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2107 return requestTimeout_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2108 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2109
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2110
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2111 #if ORTHANC_ENABLE_PUGIXML == 1
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2112 HttpServer::WebDavBuckets& HttpServer::GetWebDavBuckets()
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2113 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2114 return webDavBuckets_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2115 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2116 #endif
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4295 diff changeset	2117
4226 7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2118
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2119 #if ORTHANC_ENABLE_PUGIXML == 1
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2120 void HttpServer::Register(const std::vector<std::string>& root,
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2121 IWebDavBucket* bucket)
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2122 {
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2123 std::unique_ptr<IWebDavBucket> protection(bucket);
4229 013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2124
4226 7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2125 if (bucket == NULL)
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2126 {
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2127 throw OrthancException(ErrorCode_NullPointer);
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2128 }
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2129
4229 013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2130 Stop();
013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2131
013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2132 #if CIVETWEB_HAS_WEBDAV_WRITING == 0
013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2133 if (webDavBuckets_.size() == 0)
013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2134 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	2135 CLOG(WARNING, HTTP) << "Your version of the Orthanc framework was compiled "
90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	2136 << "without support for writing into WebDAV collections";
4229 013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2137 }
013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2138 #endif
013d6c6b2387 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 4228 diff changeset	2139
4227 7fff7e683d65 basic implementation of WebDAV handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4226 diff changeset	2140 const std::string s = Toolbox::FlattenUri(root);
4226 7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2141
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2142 if (webDavBuckets_.find(s) != webDavBuckets_.end())
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2143 {
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2144 throw OrthancException(ErrorCode_ParameterOutOfRange,
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2145 "Cannot register two WebDAV buckets at the same root: " + s);
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2146 }
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2147 else
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2148 {
4295 90f91b78d708 applied log categories Alain Mazy <alain@mazy.be> parents: 4294 diff changeset	2149 CLOG(INFO, HTTP) << "Branching WebDAV bucket at: " << s;
4226 7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2150 webDavBuckets_[s] = protection.release();
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2151 }
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2152 }
7bd5eab3ba25 prototyping IWebDavBucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	2153 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2154 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/HttpServer/HttpServer.cpp @ 4831:7053502fbf97