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

annotate OrthancFramework/Sources/HttpServer/HttpServer.cpp @ 5676:b744a2cf408a find-refactoring tip

shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 06 Jul 2024 15:04:28 +0200
parents	f7adfb22e20e
children

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

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/HttpServer/HttpServer.cpp @ 5676:b744a2cf408a find-refactoring tip