orthanc: Core/HttpClient.cpp annotate

annotate Core/HttpClient.cpp @ 3605:05872838ebf3 storage-commitment

DicomUserConnection: Opening of a connection for N-EVENT-REPORT

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 16 Jan 2020 18:26:47 +0100
parents	19d88138c30f
children	1fe74e7d9646 94f4a18a79cc

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
60 77aec9be0a51 renaming of cppclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1273 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
493 ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	7 * This program is free software: you can redistribute it and/or
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	8 * modify it under the terms of the GNU General Public License as
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	9 * published by the Free Software Foundation, either version 3 of the
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	10 * License, or (at your option) any later version.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
493 ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	12 * In addition, as a special exception, the copyright holders of this
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	13 * program give permission to link the code of its release with the
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	16 * the linked executables. You must obey the GNU General Public License
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	20 * you do not wish to do so, delete this exception statement from your
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	21 * version. If you delete this exception statement from all source files
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	22 * in the program, then also delete it here.
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	23 *
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	24 * This program is distributed in the hope that it will be useful, but
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	27 * General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
493 ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	29 * You should have received a copy of the GNU General Public License
ff34c51cd3dd fix licensing terms Sebastien Jodogne <s.jodogne@gmail.com> parents: 477 diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	34 #include "PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "HttpClient.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
1404 8a330b258491 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	37 #include "Toolbox.h"
8a330b258491 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	38 #include "OrthancException.h"
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	39 #include "Logging.h"
2040 6ea2e264ca50 retrieval of HTTP headers in answers within HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 2025 diff changeset	40 #include "ChunkedBuffer.h"
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	41 #include "SystemToolbox.h"
475 72cca077abf8 removal of HttpException Sebastien Jodogne <s.jodogne@gmail.com> parents: 473 diff changeset	42
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include <string.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include <curl/curl.h>
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	45 #include <boost/algorithm/string/predicate.hpp>
1989 f3339c4f8bf4 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	46 #include <boost/thread/mutex.hpp>
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	47
3428 6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	48 // Default timeout = 60 seconds (in Orthanc <= 1.5.6, it was 10 seconds)
6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	49 static const unsigned int DEFAULT_HTTP_TIMEOUT = 60;
6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	50
6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	51
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	52 #if ORTHANC_ENABLE_PKCS11 == 1
2025 e7e1858d9504 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2024 diff changeset	53 # include "Pkcs11.h"
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	54 #endif
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	55
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	56
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	57 extern "C"
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	58 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	59 static CURLcode GetHttpStatus(CURLcode code, CURL* curl, long* status)
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	60 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	61 if (code == CURLE_OK)
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	62 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	63 code = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, status);
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	64 return code;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	65 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	66 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	67 {
3122 df4f977c2f88 trying to reproduce isse 32 in C++ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3114 diff changeset	68 LOG(ERROR) << "Error code " << static_cast<int>(code)
df4f977c2f88 trying to reproduce isse 32 in C++ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3114 diff changeset	69 << " in libcurl: " << curl_easy_strerror(code);
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	70 *status = 0;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	71 return code;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	72 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	73 }
3379 974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	74 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	75
3379 974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	76 // This is a dummy wrapper function to suppress any OpenSSL-related
974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	77 // problem in valgrind. Inlining is prevented.
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	78 #if defined(__GNUC__) \|\| defined(__clang__)
3379 974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	79 __attribute__((noinline))
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	80 #endif
3379 974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	81 static CURLcode OrthancHttpClientPerformSSL(CURL* curl, long* status)
974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	82 {
2473 0f463989f7e3 warning if no SSL support Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	83 #if ORTHANC_ENABLE_SSL == 1
3379 974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	84 return GetHttpStatus(curl_easy_perform(curl), curl, status);
2473 0f463989f7e3 warning if no SSL support Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	85 #else
3379 974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	86 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError,
974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	87 "Orthanc was compiled without SSL support, "
974e12006b7d Removed extern "C" qualifier around function that is internally linked Benjamin Golinvaux <bgo@osimis.io> parents: 3360 diff changeset	88 "cannot make HTTPS request");
2473 0f463989f7e3 warning if no SSL support Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	89 #endif
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	90 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	91
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93
60 77aec9be0a51 renaming of cppclient Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	94 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 {
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	96 static CURLcode CheckCode(CURLcode code)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	97 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	98 if (code == CURLE_NOT_BUILT_IN)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	99 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	100 throw OrthancException(ErrorCode_InternalError,
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	101 "Your libcurl does not contain a required feature, "
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	102 "please recompile Orthanc with -DUSE_SYSTEM_CURL=OFF");
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	103 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	104
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	105 if (code != CURLE_OK)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	106 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	107 throw OrthancException(ErrorCode_NetworkProtocol,
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	108 "libCURL error: " + std::string(curl_easy_strerror(code)));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	109 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	110
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	111 return code;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	112 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	113
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	114
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	115 // RAII pattern around a "curl_slist"
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	116 class HttpClient::CurlHeaders : public boost::noncopyable
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	117 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	118 private:
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	119 struct curl_slist *content_;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	120 bool isChunkedTransfer_;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	121 bool hasExpect_;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	122
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	123 public:
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	124 CurlHeaders() :
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	125 content_(NULL),
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	126 isChunkedTransfer_(false),
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	127 hasExpect_(false)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	128 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	129 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	130
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	131 CurlHeaders(const HttpClient::HttpHeaders& headers)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	132 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	133 for (HttpClient::HttpHeaders::const_iterator
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	134 it = headers.begin(); it != headers.end(); ++it)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	135 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	136 AddHeader(it->first, it->second);
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	137 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	138 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	139
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	140 ~CurlHeaders()
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	141 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	142 Clear();
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	143 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	144
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	145 bool IsEmpty() const
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	146 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	147 return content_ == NULL;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	148 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	149
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	150 void Clear()
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	151 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	152 if (content_ != NULL)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	153 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	154 curl_slist_free_all(content_);
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	155 content_ = NULL;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	156 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	157
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	158 isChunkedTransfer_ = false;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	159 hasExpect_ = false;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	160 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	161
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	162 void AddHeader(const std::string& key,
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	163 const std::string& value)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	164 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	165 if (boost::iequals(key, "Expect"))
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	166 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	167 hasExpect_ = true;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	168 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	169
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	170 if (boost::iequals(key, "Transfer-Encoding") &&
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	171 value == "chunked")
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	172 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	173 isChunkedTransfer_ = true;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	174 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	175
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	176 std::string item = key + ": " + value;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	177
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	178 struct curl_slist *tmp = curl_slist_append(content_, item.c_str());
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	179
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	180 if (tmp == NULL)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	181 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	182 throw OrthancException(ErrorCode_NotEnoughMemory);
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	183 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	184 else
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	185 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	186 content_ = tmp;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	187 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	188 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	189
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	190 void Assign(CURL* curl) const
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	191 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	192 CheckCode(curl_easy_setopt(curl, CURLOPT_HTTPHEADER, content_));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	193 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	194
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	195 bool HasExpect() const
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	196 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	197 return hasExpect_;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	198 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	199
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	200 bool IsChunkedTransfer() const
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	201 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	202 return isChunkedTransfer_;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	203 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	204 };
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	205
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	206
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	207 class HttpClient::CurlRequestBody : public boost::noncopyable
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	208 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	209 private:
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	210 HttpClient::IRequestBody* body_;
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	211 std::string sourceBuffer_;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	212 size_t sourceBufferTransmittedSize_;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	213
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	214 size_t CallbackInternal(char* curlBuffer,
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	215 size_t curlBufferSize)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	216 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	217 if (body_ == NULL)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	218 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	219 throw OrthancException(ErrorCode_BadSequenceOfCalls);
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	220 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	221
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	222 if (curlBufferSize == 0)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	223 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	224 throw OrthancException(ErrorCode_InternalError);
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	225 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	226
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	227 // Read chunks from the body stream so as to fill the target buffer
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	228 size_t curlBufferFilledSize = 0;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	229 size_t sourceRemainingSize = sourceBuffer_.size() - sourceBufferTransmittedSize_;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	230 bool hasMore = true;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	231
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	232 while (sourceRemainingSize < curlBufferSize && hasMore)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	233 {
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	234 if (sourceRemainingSize > 0)
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	235 {
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	236 // transmit the end of current source buffer
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	237 memcpy(curlBuffer + curlBufferFilledSize, sourceBuffer_.data() + sourceBufferTransmittedSize_, sourceRemainingSize);
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	238
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	239 curlBufferFilledSize += sourceRemainingSize;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	240 }
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	241
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	242 // start filling a new source buffer
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	243 sourceBufferTransmittedSize_ = 0;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	244 sourceBuffer_.clear();
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	245
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	246 hasMore = body_->ReadNextChunk(sourceBuffer_);
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	247
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	248 sourceRemainingSize = sourceBuffer_.size();
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	249 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	250
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	251 if (sourceRemainingSize > 0 && (curlBufferSize - curlBufferFilledSize) > 0)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	252 {
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	253 size_t s = std::min(sourceRemainingSize, curlBufferSize - curlBufferFilledSize);
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	254
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	255 memcpy(curlBuffer + curlBufferFilledSize, sourceBuffer_.data() + sourceBufferTransmittedSize_, s);
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	256
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	257 sourceBufferTransmittedSize_ += s;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	258 curlBufferFilledSize += s;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	259 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	260
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	261 return curlBufferFilledSize;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	262 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	263
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	264 public:
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	265 CurlRequestBody() :
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	266 body_(NULL),
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	267 sourceBufferTransmittedSize_(0)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	268 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	269 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	270
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	271 void SetBody(HttpClient::IRequestBody& body)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	272 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	273 body_ = &body;
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	274 sourceBufferTransmittedSize_ = 0;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	275 sourceBuffer_.clear();
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	276 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	277
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	278 void Clear()
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	279 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	280 body_ = NULL;
3590 d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	281 sourceBufferTransmittedSize_ = 0;
d5740d3b1d67 fix for issue 156: Chunked Dicom-web transfer uses 100% CPU Alain Mazy <alain@mazy.be> parents: 3516 diff changeset	282 sourceBuffer_.clear();
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	283 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	284
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	285 bool IsValid() const
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	286 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	287 return body_ != NULL;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	288 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	289
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	290 static size_t Callback(char buffer, size_t size, size_t nitems, void userdata)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	291 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	292 try
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	293 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	294 assert(userdata != NULL);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	295 return reinterpret_cast<HttpClient::CurlRequestBody*>(userdata)->
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	296 CallbackInternal(buffer, size * nitems);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	297 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	298 catch (OrthancException& e)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	299 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	300 LOG(ERROR) << "Exception while streaming HTTP body: " << e.What();
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	301 return CURL_READFUNC_ABORT;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	302 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	303 catch (...)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	304 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	305 LOG(ERROR) << "Native exception while streaming HTTP body";
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	306 return CURL_READFUNC_ABORT;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	307 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	308 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	309 };
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	310
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	311
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	312 class HttpClient::CurlAnswer : public boost::noncopyable
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	313 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	314 private:
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	315 HttpClient::IAnswer& answer_;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	316 bool headersLowerCase_;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	317
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	318 public:
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	319 CurlAnswer(HttpClient::IAnswer& answer,
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	320 bool headersLowerCase) :
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	321 answer_(answer),
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	322 headersLowerCase_(headersLowerCase)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	323 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	324 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	325
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	326 static size_t HeaderCallback(void buffer, size_t size, size_t nmemb, void userdata)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	327 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	328 try
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	329 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	330 assert(userdata != NULL);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	331 CurlAnswer& that = (static_cast<CurlAnswer>(userdata));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	332
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	333 size_t length = size * nmemb;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	334 if (length == 0)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	335 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	336 return 0;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	337 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	338 else
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	339 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	340 std::string s(reinterpret_cast<const char*>(buffer), length);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	341 std::size_t colon = s.find(':');
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	342 std::size_t eol = s.find("\r\n");
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	343 if (colon != std::string::npos &&
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	344 eol != std::string::npos)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	345 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	346 std::string tmp(s.substr(0, colon));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	347
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	348 if (that.headersLowerCase_)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	349 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	350 Toolbox::ToLowerCase(tmp);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	351 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	352
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	353 std::string key = Toolbox::StripSpaces(tmp);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	354
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	355 if (!key.empty())
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	356 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	357 std::string value = Toolbox::StripSpaces(s.substr(colon + 1, eol));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	358 that.answer_.AddHeader(key, value);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	359 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	360 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	361
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	362 return length;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	363 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	364 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	365 catch (OrthancException& e)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	366 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	367 LOG(ERROR) << "Exception while streaming HTTP body: " << e.What();
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	368 return CURL_READFUNC_ABORT;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	369 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	370 catch (...)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	371 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	372 LOG(ERROR) << "Native exception while streaming HTTP body";
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	373 return CURL_READFUNC_ABORT;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	374 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	375 }
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	376
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	377 static size_t BodyCallback(void buffer, size_t size, size_t nmemb, void userdata)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	378 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	379 try
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	380 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	381 assert(userdata != NULL);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	382 CurlAnswer& that = (static_cast<CurlAnswer>(userdata));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	383
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	384 size_t length = size * nmemb;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	385 if (length == 0)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	386 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	387 return 0;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	388 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	389 else
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	390 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	391 that.answer_.AddChunk(buffer, length);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	392 return length;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	393 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	394 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	395 catch (OrthancException& e)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	396 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	397 LOG(ERROR) << "Exception while streaming HTTP body: " << e.What();
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	398 return CURL_READFUNC_ABORT;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	399 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	400 catch (...)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	401 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	402 LOG(ERROR) << "Native exception while streaming HTTP body";
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	403 return CURL_READFUNC_ABORT;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	404 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	405 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	406 };
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	407
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	408
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	409 class HttpClient::DefaultAnswer : public HttpClient::IAnswer
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	410 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	411 private:
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	412 ChunkedBuffer answer_;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	413 HttpHeaders* headers_;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	414
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	415 public:
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	416 DefaultAnswer() : headers_(NULL)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	417 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	418 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	419
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	420 void SetHeaders(HttpHeaders& headers)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	421 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	422 headers_ = &headers;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	423 headers_->clear();
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	424 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	425
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	426 void FlattenBody(std::string& target)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	427 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	428 answer_.Flatten(target);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	429 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	430
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	431 virtual void AddHeader(const std::string& key,
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	432 const std::string& value)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	433 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	434 if (headers_ != NULL)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	435 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	436 (*headers_) [key] = value;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	437 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	438 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	439
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	440 virtual void AddChunk(const void* data,
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	441 size_t size)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	442 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	443 answer_.AddChunk(data, size);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	444 }
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	445 };
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	446
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	447
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	448 class HttpClient::GlobalParameters
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	449 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	450 private:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	451 boost::mutex mutex_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	452 bool httpsVerifyPeers_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	453 std::string httpsCACertificates_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	454 std::string proxy_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	455 long timeout_;
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	456 bool verbose_;
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	457
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	458 GlobalParameters() :
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	459 httpsVerifyPeers_(true),
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	460 timeout_(0),
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	461 verbose_(false)
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	462 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	463 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	464
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	465 public:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	466 // Singleton pattern
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	467 static GlobalParameters& GetInstance()
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	468 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	469 static GlobalParameters parameters;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	470 return parameters;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	471 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	472
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	473 void ConfigureSsl(bool httpsVerifyPeers,
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	474 const std::string& httpsCACertificates)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	475 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	476 boost::mutex::scoped_lock lock(mutex_);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	477 httpsVerifyPeers_ = httpsVerifyPeers;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	478 httpsCACertificates_ = httpsCACertificates;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	479 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	480
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	481 void GetSslConfiguration(bool& httpsVerifyPeers,
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	482 std::string& httpsCACertificates)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	483 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	484 boost::mutex::scoped_lock lock(mutex_);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	485 httpsVerifyPeers = httpsVerifyPeers_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	486 httpsCACertificates = httpsCACertificates_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	487 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	488
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	489 void SetDefaultProxy(const std::string& proxy)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	490 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	491 LOG(INFO) << "Setting the default proxy for HTTP client connections: " << proxy;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	492
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	493 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	494 boost::mutex::scoped_lock lock(mutex_);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	495 proxy_ = proxy;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	496 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	497 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	498
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	499 void GetDefaultProxy(std::string& target)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	500 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	501 boost::mutex::scoped_lock lock(mutex_);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	502 target = proxy_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	503 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	504
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	505 void SetDefaultTimeout(long seconds)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	506 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	507 LOG(INFO) << "Setting the default timeout for HTTP client connections: " << seconds << " seconds";
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	508
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	509 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	510 boost::mutex::scoped_lock lock(mutex_);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	511 timeout_ = seconds;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	512 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	513 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	514
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	515 long GetDefaultTimeout()
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	516 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	517 boost::mutex::scoped_lock lock(mutex_);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	518 return timeout_;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	519 }
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	520
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	521 #if ORTHANC_ENABLE_PKCS11 == 1
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	522 bool IsPkcs11Initialized()
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	523 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	524 boost::mutex::scoped_lock lock(mutex_);
2025 e7e1858d9504 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2024 diff changeset	525 return Pkcs11::IsInitialized();
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	526 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	527
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	528 void InitializePkcs11(const std::string& module,
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	529 const std::string& pin,
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	530 bool verbose)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	531 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	532 boost::mutex::scoped_lock lock(mutex_);
2025 e7e1858d9504 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2024 diff changeset	533 Pkcs11::Initialize(module, pin, verbose);
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	534 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	535 #endif
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	536
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	537 bool IsDefaultVerbose() const
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	538 {
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	539 return verbose_;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	540 }
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	541
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	542 void SetDefaultVerbose(bool verbose)
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	543 {
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	544 verbose_ = verbose;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	545 }
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	546 };
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	547
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	548
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 struct HttpClient::PImpl
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 CURL* curl_;
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	552 CurlHeaders defaultPostHeaders_;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	553 CurlHeaders defaultChunkedHeaders_;
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	554 CurlHeaders userHeaders_;
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	555 CurlRequestBody requestBody_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558
2787 ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	559 void HttpClient::ThrowException(HttpStatus status)
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	560 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	561 switch (status)
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	562 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	563 case HttpStatus_400_BadRequest:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	564 throw OrthancException(ErrorCode_BadRequest);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	565
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	566 case HttpStatus_401_Unauthorized:
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	567 case HttpStatus_403_Forbidden:
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	568 throw OrthancException(ErrorCode_Unauthorized);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	569
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	570 case HttpStatus_404_NotFound:
2044 0f35383dd6cc doc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2041 diff changeset	571 throw OrthancException(ErrorCode_UnknownResource);
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	572
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	573 default:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	574 throw OrthancException(ErrorCode_NetworkProtocol);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	575 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	576 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	577
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	578
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	579 /static int CurlDebugCallback(CURL handle,
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	580 curl_infotype type,
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	581 char *data,
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	582 size_t size,
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	583 void *userptr)
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	584 {
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	585 switch (type)
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	586 {
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	587 case CURLINFO_TEXT:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	588 case CURLINFO_HEADER_IN:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	589 case CURLINFO_HEADER_OUT:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	590 case CURLINFO_SSL_DATA_IN:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	591 case CURLINFO_SSL_DATA_OUT:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	592 case CURLINFO_END:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	593 case CURLINFO_DATA_IN:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	594 case CURLINFO_DATA_OUT:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	595 {
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	596 std::string s(data, size);
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	597 LOG(INFO) << "libcurl: " << s;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	598 break;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	599 }
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	600
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	601 default:
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	602 break;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	603 }
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	604
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	605 return 0;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	606 }*/
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	607
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	608
469 a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	609 void HttpClient::Setup()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 {
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	611 pimpl_->defaultPostHeaders_.AddHeader("Expect", "");
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	612 pimpl_->defaultChunkedHeaders_.AddHeader("Expect", "");
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	613 pimpl_->defaultChunkedHeaders_.AddHeader("Transfer-Encoding", "chunked");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 pimpl_->curl_ = curl_easy_init();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	617 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_HEADERFUNCTION, &CurlAnswer::HeaderCallback));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	618 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_WRITEFUNCTION, &CurlAnswer::BodyCallback));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_HEADER, 0));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_FOLLOWLOCATION, 1));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621
456 511efa5c84dd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 400 diff changeset	622 // This fixes the "longjmp causes uninitialized stack frame" crash
511efa5c84dd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 400 diff changeset	623 // that happens on modern Linux versions.
511efa5c84dd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 400 diff changeset	624 // http://stackoverflow.com/questions/9191668/error-longjmp-causes-uninitialized-stack-frame
511efa5c84dd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 400 diff changeset	625 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_NOSIGNAL, 1));
511efa5c84dd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 400 diff changeset	626
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627 url_ = "";
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 469 diff changeset	628 method_ = HttpMethod_Get;
3360 7569d3dc1c20 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3122 diff changeset	629 lastStatus_ = HttpStatus_None;
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	630 SetVerbose(GlobalParameters::GetInstance().IsDefaultVerbose());
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	631 timeout_ = GlobalParameters::GetInstance().GetDefaultTimeout();
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	632 GlobalParameters::GetInstance().GetDefaultProxy(proxy_);
2219 262fcab24024 fix for HttpsCACertificates Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	633 GlobalParameters::GetInstance().GetSslConfiguration(verifyPeers_, caCertificates_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	637 HttpClient::HttpClient() :
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	638 pimpl_(new PImpl),
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	639 verifyPeers_(true),
2045 21a8ca9ad928 HttpClient::SetConvertHeadersToLowerCase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2044 diff changeset	640 pkcs11Enabled_(false),
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2104 diff changeset	641 headersToLowerCase_(true),
88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2104 diff changeset	642 redirectionFollowed_(true)
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	643 {
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	644 Setup();
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	645 }
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	646
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	647
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	648 HttpClient::HttpClient(const WebServiceParameters& service,
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	649 const std::string& uri) :
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	650 pimpl_(new PImpl),
2049 b89da14b3e8d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2045 diff changeset	651 verifyPeers_(true),
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2104 diff changeset	652 headersToLowerCase_(true),
88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2104 diff changeset	653 redirectionFollowed_(true)
469 a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	654 {
a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	655 Setup();
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	656
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	657 if (service.GetUsername().size() != 0 &&
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	658 service.GetPassword().size() != 0)
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	659 {
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	660 SetCredentials(service.GetUsername().c_str(),
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	661 service.GetPassword().c_str());
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	662 }
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	663
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	664 if (!service.GetCertificateFile().empty())
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	665 {
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	666 SetClientCertificate(service.GetCertificateFile(),
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	667 service.GetCertificateKeyFile(),
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	668 service.GetCertificateKeyPassword());
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	669 }
a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	670
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	671 SetPkcs11Enabled(service.IsPkcs11Enabled());
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	672
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	673 SetUrl(service.GetUrl() + uri);
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	674
2823 807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	675 for (WebServiceParameters::Dictionary::const_iterator
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	676 it = service.GetHttpHeaders().begin();
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	677 it != service.GetHttpHeaders().end(); ++it)
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	678 {
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	679 AddHeader(it->first, it->second);
dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	680 }
469 a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	681 }
a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	682
a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	683
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 HttpClient::~HttpClient()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 curl_easy_cleanup(pimpl_->curl_);
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	687 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	688
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	689
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	690 void HttpClient::SetBody(const std::string& data)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	691 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	692 body_ = data;
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	693 pimpl_->requestBody_.Clear();
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	694 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	695
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	696
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	697 void HttpClient::SetBody(IRequestBody& body)
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	698 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	699 body_.clear();
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	700 pimpl_->requestBody_.SetBody(body);
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	701 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	702
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	703
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	704 void HttpClient::ClearBody()
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	705 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3386 diff changeset	706 body_.clear();
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	707 pimpl_->requestBody_.Clear();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 void HttpClient::SetVerbose(bool isVerbose)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	713 isVerbose_ = isVerbose;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 if (isVerbose_)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	717 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_VERBOSE, 1));
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	718 //CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_DEBUGFUNCTION, &CurlDebugCallback));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	721 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_VERBOSE, 0));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726
1986 99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	727 void HttpClient::AddHeader(const std::string& key,
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	728 const std::string& value)
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	729 {
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	730 if (key.empty())
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	731 {
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	732 throw OrthancException(ErrorCode_ParameterOutOfRange);
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	733 }
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	734 else
1986 99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	735 {
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	736 pimpl_->userHeaders_.AddHeader(key, value);
1986 99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	737 }
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	738 }
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	739
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	740
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	741 void HttpClient::ClearHeaders()
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	742 {
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	743 pimpl_->userHeaders_.Clear();
1986 99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	744 }
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	745
99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	746
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	747 bool HttpClient::ApplyInternal(CurlAnswer& answer)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_URL, url_.c_str()));
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	750 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_HEADERDATA, &answer));
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	751
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	752 #if ORTHANC_ENABLE_SSL == 1
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	753 // Setup HTTPS-related options
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	754
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	755 if (verifyPeers_)
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	756 {
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	757 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_CAINFO, caCertificates_.c_str()));
1973 7bd4cb780feb Option "HttpsVerifyPeers" can be used to connect against self-signed HTTPS certificates Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	758 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSL_VERIFYHOST, 2)); // libcurl default is strict verifyhost
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	759 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSL_VERIFYPEER, 1));
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	760 }
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	761 else
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	762 {
1973 7bd4cb780feb Option "HttpsVerifyPeers" can be used to connect against self-signed HTTPS certificates Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	763 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSL_VERIFYHOST, 0));
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	764 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSL_VERIFYPEER, 0));
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	765 }
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	766 #endif
95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	767
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	768 // Setup the HTTPS client certificate
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	769 if (!clientCertificateFile_.empty() &&
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	770 pkcs11Enabled_)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	771 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	772 throw OrthancException(ErrorCode_ParameterOutOfRange,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	773 "Cannot enable both client certificates and PKCS#11 authentication");
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	774 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	775
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	776 if (pkcs11Enabled_)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	777 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	778 #if ORTHANC_ENABLE_PKCS11 == 1
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	779 if (GlobalParameters::GetInstance().IsPkcs11Initialized())
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	780 {
2025 e7e1858d9504 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2024 diff changeset	781 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLENGINE, Pkcs11::GetEngineIdentifier()));
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	782 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLKEYTYPE, "ENG"));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	783 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLCERTTYPE, "ENG"));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	784 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	785 else
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	786 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	787 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	788 "Cannot use PKCS#11 for a HTTPS request, "
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	789 "because it has not been initialized");
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	790 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	791 #else
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	792 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	793 "This version of Orthanc is compiled without support for PKCS#11");
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	794 #endif
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	795 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	796 else if (!clientCertificateFile_.empty())
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	797 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	798 #if ORTHANC_ENABLE_SSL == 1
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	799 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLCERTTYPE, "PEM"));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	800 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLCERT, clientCertificateFile_.c_str()));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	801
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	802 if (!clientCertificateKeyPassword_.empty())
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	803 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	804 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_KEYPASSWD, clientCertificateKeyPassword_.c_str()));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	805 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	806
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	807 // NB: If no "clientKeyFile_" is provided, the key must be
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	808 // prepended to the certificate file
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	809 if (!clientCertificateKeyFile_.empty())
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	810 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	811 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLKEYTYPE, "PEM"));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	812 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLKEY, clientCertificateKeyFile_.c_str()));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	813 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	814 #else
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	815 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	816 "This version of Orthanc is compiled without OpenSSL support, "
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	817 "cannot use HTTPS client authentication");
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	818 #endif
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	819 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	820
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	821 // Reset the parameters from previous calls to Apply()
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	822 pimpl_->userHeaders_.Assign(pimpl_->curl_);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	823 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_HTTPGET, 0L));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	824 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POST, 0L));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	825 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_NOBODY, 0L));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	826 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_CUSTOMREQUEST, NULL));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	827 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POSTFIELDS, NULL));
2104 58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	828 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POSTFIELDSIZE, 0L));
1273 88010d8e12cf Support of HTTP proxy Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	829 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_PROXY, NULL));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830
2104 58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	831 if (redirectionFollowed_)
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	832 {
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	833 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_FOLLOWLOCATION, 1L));
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	834 }
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	835 else
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	836 {
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	837 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_FOLLOWLOCATION, 0L));
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	838 }
58a0ee0b4be1 HttpClient::SetRedirectionFollowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	839
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	840 // Set timeouts
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	841 if (timeout_ <= 0)
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	842 {
3428 6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	843 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_TIMEOUT, DEFAULT_HTTP_TIMEOUT));
6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	844 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_CONNECTTIMEOUT, DEFAULT_HTTP_TIMEOUT));
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	845 }
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	846 else
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	847 {
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	848 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_TIMEOUT, timeout_));
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	849 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_CONNECTTIMEOUT, timeout_));
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	850 }
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	851
469 a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	852 if (credentials_.size() != 0)
a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	853 {
a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	854 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_USERPWD, credentials_.c_str()));
a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	855 }
a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	856
1273 88010d8e12cf Support of HTTP proxy Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	857 if (proxy_.size() != 0)
88010d8e12cf Support of HTTP proxy Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	858 {
88010d8e12cf Support of HTTP proxy Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	859 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_PROXY, proxy_.c_str()));
88010d8e12cf Support of HTTP proxy Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	860 }
88010d8e12cf Support of HTTP proxy Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	861
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862 switch (method_)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 469 diff changeset	864 case HttpMethod_Get:
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_HTTPGET, 1L));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 break;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 469 diff changeset	868 case HttpMethod_Post:
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POST, 1L));
1986 99b249867052 HTTP headers in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 1973 diff changeset	870
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	871 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	873 case HttpMethod_Delete:
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	874 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_NOBODY, 1L));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	875 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_CUSTOMREQUEST, "DELETE"));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	876 break;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	877
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	878 case HttpMethod_Put:
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	879 // http://stackoverflow.com/a/7570281/881731: Don't use
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	880 // CURLOPT_PUT if there is a body
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	881
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	882 // CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_PUT, 1L));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	883
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	884 curl_easy_setopt(pimpl_->curl_, CURLOPT_CUSTOMREQUEST, "PUT"); /* !!! */
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	885 break;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	886
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	887 default:
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	888 throw OrthancException(ErrorCode_InternalError);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	889 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	890
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	891 if (method_ == HttpMethod_Post \|\|
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	892 method_ == HttpMethod_Put)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	893 {
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	894 if (!pimpl_->userHeaders_.IsEmpty() &&
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	895 !pimpl_->userHeaders_.HasExpect())
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	896 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	897 LOG(INFO) << "For performance, the HTTP header \"Expect\" should be set to empty string in POST/PUT requests";
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	898 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	899
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	900 if (pimpl_->requestBody_.IsValid())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	902 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_READFUNCTION, CurlRequestBody::Callback));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	903 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_READDATA, &pimpl_->requestBody_));
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	904 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POST, 1L));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	905 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POSTFIELDSIZE, -1L));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	906
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	907 if (pimpl_->userHeaders_.IsEmpty())
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	908 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	909 pimpl_->defaultChunkedHeaders_.Assign(pimpl_->curl_);
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	910 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	911 else if (!pimpl_->userHeaders_.IsChunkedTransfer())
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	912 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	913 LOG(WARNING) << "The HTTP header \"Transfer-Encoding\" must be set to \"chunked\" "
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	914 << "if streaming a chunked body in POST/PUT requests";
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	915 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	917 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918 {
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	919 // Disable possible previous stream transfers
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	920 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_READFUNCTION, NULL));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	921 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_UPLOAD, 0));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	922
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	923 if (pimpl_->userHeaders_.IsChunkedTransfer())
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	924 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	925 LOG(WARNING) << "The HTTP header \"Transfer-Encoding\" must only be set "
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	926 << "if streaming a chunked body in POST/PUT requests";
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	927 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	928
3386 af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	929 if (pimpl_->userHeaders_.IsEmpty())
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	930 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	931 pimpl_->defaultPostHeaders_.Assign(pimpl_->curl_);
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	932 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	933
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	934 if (body_.size() > 0)
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	935 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	936 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POSTFIELDS, body_.c_str()));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	937 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POSTFIELDSIZE, body_.size()));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	938 }
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	939 else
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	940 {
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	941 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POSTFIELDS, NULL));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	942 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_POSTFIELDSIZE, 0));
af9432e46c07 HttpClient::IBodyStream Sebastien Jodogne <s.jodogne@gmail.com> parents: 3379 diff changeset	943 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 }
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	945 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	946
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 // Do the actual request
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	949 CURLcode code;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	950 long status = 0;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	952 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_WRITEDATA, &answer));
2040 6ea2e264ca50 retrieval of HTTP headers in answers within HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 2025 diff changeset	953
3516 96780208dbd7 reporting timings in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3428 diff changeset	954 const boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
96780208dbd7 reporting timings in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3428 diff changeset	955
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	956 if (boost::starts_with(url_, "https://"))
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	957 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	958 code = OrthancHttpClientPerformSSL(pimpl_->curl_, &status);
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	959 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	960 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	961 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	962 code = GetHttpStatus(curl_easy_perform(pimpl_->curl_), pimpl_->curl_, &status);
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	963 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	964
3516 96780208dbd7 reporting timings in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3428 diff changeset	965 const boost::posix_time::ptime end = boost::posix_time::microsec_clock::universal_time();
96780208dbd7 reporting timings in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3428 diff changeset	966
96780208dbd7 reporting timings in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3428 diff changeset	967 LOG(INFO) << "HTTP status code " << status << " in "
96780208dbd7 reporting timings in HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3428 diff changeset	968 << ((end - start).total_milliseconds()) << " ms after "
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	969 << EnumerationToString(method_) << " request on: " << url_;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	970
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	971 if (isVerbose_)
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	972 {
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	973 LOG(INFO) << "cURL status code: " << code;
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	974 }
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	975
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	976 CheckCode(code);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978 if (status == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	979 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	980 // This corresponds to a call to an inexistent host
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 469 diff changeset	981 lastStatus_ = HttpStatus_500_InternalServerError;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	982 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	983 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	984 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 469 diff changeset	985 lastStatus_ = static_cast<HttpStatus>(status);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	986 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	987
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	988 if (status >= 200 && status < 300)
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	989 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	990 return true; // Success
2040 6ea2e264ca50 retrieval of HTTP headers in answers within HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 2025 diff changeset	991 }
6ea2e264ca50 retrieval of HTTP headers in answers within HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 2025 diff changeset	992 else
6ea2e264ca50 retrieval of HTTP headers in answers within HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 2025 diff changeset	993 {
3122 df4f977c2f88 trying to reproduce isse 32 in C++ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3114 diff changeset	994 LOG(ERROR) << "Error in HTTP request, received HTTP status " << status
df4f977c2f88 trying to reproduce isse 32 in C++ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3114 diff changeset	995 << " (" << EnumerationToString(lastStatus_) << ")";
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	996 return false;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	997 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	998 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	999
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1000
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1001 bool HttpClient::ApplyInternal(std::string& answerBody,
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1002 HttpHeaders* answerHeaders)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1003 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1004 answerBody.clear();
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1005
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1006 DefaultAnswer answer;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1007
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1008 if (answerHeaders != NULL)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1009 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1010 answer.SetHeaders(*answerHeaders);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1011 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1012
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1013 CurlAnswer wrapper(answer, headersToLowerCase_);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1014
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1015 if (ApplyInternal(wrapper))
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1016 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1017 answer.FlattenBody(answerBody);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1018 return true;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1019 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1020 else
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1021 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1022 return false;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1023 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1027 bool HttpClient::ApplyInternal(Json::Value& answerBody,
2040 6ea2e264ca50 retrieval of HTTP headers in answers within HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 2025 diff changeset	1028 HttpClient::HttpHeaders* answerHeaders)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030 std::string s;
2040 6ea2e264ca50 retrieval of HTTP headers in answers within HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 2025 diff changeset	1031 if (ApplyInternal(s, answerHeaders))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 Json::Reader reader;
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1034 return reader.parse(s, answerBody);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1036 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1037 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1038 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1039 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1040 }
144 aa6c8a942952 http client password Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	1041
aa6c8a942952 http client password Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	1042
468 456b9d2e9af4 rename methods for clarity Sebastien Jodogne <s.jodogne@gmail.com> parents: 457 diff changeset	1043 void HttpClient::SetCredentials(const char* username,
456b9d2e9af4 rename methods for clarity Sebastien Jodogne <s.jodogne@gmail.com> parents: 457 diff changeset	1044 const char* password)
144 aa6c8a942952 http client password Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	1045 {
469 a6fe16a31615 transmitting credentials by copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 468 diff changeset	1046 credentials_ = std::string(username) + ":" + std::string(password);
144 aa6c8a942952 http client password Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	1047 }
457 997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 456 diff changeset	1048
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1049
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1050 void HttpClient::ConfigureSsl(bool httpsVerifyPeers,
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1051 const std::string& httpsVerifyCertificates)
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	1052 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	1053 #if ORTHANC_ENABLE_SSL == 1
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1054 if (httpsVerifyPeers)
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1055 {
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1056 if (httpsVerifyCertificates.empty())
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1057 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1058 LOG(WARNING) << "No certificates are provided to validate peers, "
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	1059 << "set \"HttpsCACertificates\" if you need to do HTTPS requests";
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1060 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1061 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1062 {
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1063 LOG(WARNING) << "HTTPS will use the CA certificates from this file: " << httpsVerifyCertificates;
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1064 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1065 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1066 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1067 {
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1068 LOG(WARNING) << "The verification of the peers in HTTPS requests is disabled";
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1069 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1070 #endif
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1071
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1072 GlobalParameters::GetInstance().ConfigureSsl(httpsVerifyPeers, httpsVerifyCertificates);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1073 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1074
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1075
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1076 void HttpClient::GlobalInitialize()
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1077 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	1078 #if ORTHANC_ENABLE_SSL == 1
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1079 CheckCode(curl_global_init(CURL_GLOBAL_ALL));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1080 #else
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1081 CheckCode(curl_global_init(CURL_GLOBAL_ALL & ~CURL_GLOBAL_SSL));
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1082 #endif
457 997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 456 diff changeset	1083 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1404 diff changeset	1084
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1085
457 997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 456 diff changeset	1086 void HttpClient::GlobalFinalize()
997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 456 diff changeset	1087 {
997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 456 diff changeset	1088 curl_global_cleanup();
2025 e7e1858d9504 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2024 diff changeset	1089
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	1090 #if ORTHANC_ENABLE_PKCS11 == 1
2025 e7e1858d9504 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2024 diff changeset	1091 Pkcs11::Finalize();
e7e1858d9504 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2024 diff changeset	1092 #endif
457 997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 456 diff changeset	1093 }
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1094
1590 ba0226474e22 New configuration option: "HttpTimeout" to set the default timeout for HTTP requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1534 diff changeset	1095
2788 959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1096 void HttpClient::SetDefaultVerbose(bool verbose)
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1097 {
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1098 GlobalParameters::GetInstance().SetDefaultVerbose(verbose);
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1099 }
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1100
959bd8857eb5 New configuration option: "HttpVerbose" to debug outgoing HTTP connections Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1101
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1102 void HttpClient::SetDefaultProxy(const std::string& proxy)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1103 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1104 GlobalParameters::GetInstance().SetDefaultProxy(proxy);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1105 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1106
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1107
1590 ba0226474e22 New configuration option: "HttpTimeout" to set the default timeout for HTTP requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1534 diff changeset	1108 void HttpClient::SetDefaultTimeout(long timeout)
ba0226474e22 New configuration option: "HttpTimeout" to set the default timeout for HTTP requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1534 diff changeset	1109 {
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1986 diff changeset	1110 GlobalParameters::GetInstance().SetDefaultTimeout(timeout);
1590 ba0226474e22 New configuration option: "HttpTimeout" to set the default timeout for HTTP requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1534 diff changeset	1111 }
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1112
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1113
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1114 bool HttpClient::Apply(IAnswer& answer)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1115 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1116 CurlAnswer wrapper(answer, headersToLowerCase_);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1117 return ApplyInternal(wrapper);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1118 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1119
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1120
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1121 void HttpClient::ApplyAndThrowException(IAnswer& answer)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1122 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1123 CurlAnswer wrapper(answer, headersToLowerCase_);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1124
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1125 if (!ApplyInternal(wrapper))
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1126 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1127 ThrowException(GetLastStatus());
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1128 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1129 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1130
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1131
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1132 void HttpClient::ApplyAndThrowException(std::string& answerBody)
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1133 {
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1134 if (!Apply(answerBody))
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1135 {
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1136 ThrowException(GetLastStatus());
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1137 }
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1138 }
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1139
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1140
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1141 void HttpClient::ApplyAndThrowException(Json::Value& answerBody)
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1142 {
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1143 if (!Apply(answerBody))
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1144 {
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1145 ThrowException(GetLastStatus());
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1146 }
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1147 }
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1148
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1149
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1150 void HttpClient::ApplyAndThrowException(std::string& answerBody,
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1151 HttpHeaders& answerHeaders)
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1152 {
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1153 if (!Apply(answerBody, answerHeaders))
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1154 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1155 ThrowException(GetLastStatus());
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1156 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1157 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1158
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1159
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1160 void HttpClient::ApplyAndThrowException(Json::Value& answerBody,
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1161 HttpHeaders& answerHeaders)
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1162 {
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2040 diff changeset	1163 if (!Apply(answerBody, answerHeaders))
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1164 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1165 ThrowException(GetLastStatus());
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1166 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1590 diff changeset	1167 }
2019 9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1168
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1169
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1170 void HttpClient::SetClientCertificate(const std::string& certificateFile,
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1171 const std::string& certificateKeyFile,
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1172 const std::string& certificateKeyPassword)
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1173 {
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1174 if (certificateFile.empty())
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1175 {
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1176 throw OrthancException(ErrorCode_ParameterOutOfRange);
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1177 }
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1178
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	1179 if (!SystemToolbox::IsRegularFile(certificateFile))
2019 9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1180 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	1181 throw OrthancException(ErrorCode_InexistentFile,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	1182 "Cannot open certificate file: " + certificateFile);
2019 9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1183 }
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1184
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1185 if (!certificateKeyFile.empty() &&
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	1186 !SystemToolbox::IsRegularFile(certificateKeyFile))
2019 9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1187 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	1188 throw OrthancException(ErrorCode_InexistentFile,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	1189 "Cannot open key file: " + certificateKeyFile);
2019 9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1190 }
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1191
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1192 clientCertificateFile_ = certificateFile;
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1193 clientCertificateKeyFile_ = certificateKeyFile;
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1194 clientCertificateKeyPassword_ = certificateKeyPassword;
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2016 diff changeset	1195 }
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1196
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1197
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1198 void HttpClient::InitializePkcs11(const std::string& module,
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1199 const std::string& pin,
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1200 bool verbose)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1201 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	1202 #if ORTHANC_ENABLE_PKCS11 == 1
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1203 LOG(INFO) << "Initializing PKCS#11 using " << module
2024 944b255035a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2023 diff changeset	1204 << (pin.empty() ? " (no PIN provided)" : " (PIN is provided)");
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1205 GlobalParameters::GetInstance().InitializePkcs11(module, pin, verbose);
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1206 #else
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	1207 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	1208 "This version of Orthanc is compiled without support for PKCS#11");
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1209 #endif
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1210 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1211 }

Mercurial > hg > orthanc

annotate Core/HttpClient.cpp @ 3605:05872838ebf3 storage-commitment