Mercurial > hg > orthanc-wsi
annotate Applications/ApplicationToolbox.cpp @ 164:c74b83b7e4fe
fix link
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 31 Jan 2019 19:22:01 +0100 |
| parents | 6b8ccfc02051 |
| children | e3cbf890b588 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 157 | 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "ApplicationToolbox.h" | |
| 23 | |
| 24 #include "../Framework/Inputs/OpenSlideLibrary.h" | |
| 151 | 25 #include "../Framework/MultiThreading/BagOfTasksProcessor.h" |
|
140
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
128
diff
changeset
|
26 |
|
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
128
diff
changeset
|
27 #include <Core/DicomParsing/FromDcmtkBridge.h> |
|
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
128
diff
changeset
|
28 #include <Core/HttpClient.h> |
|
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
128
diff
changeset
|
29 #include <Core/Logging.h> |
|
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
128
diff
changeset
|
30 #include <Core/OrthancException.h> |
|
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
128
diff
changeset
|
31 #include <Core/SystemToolbox.h> |
| 151 | 32 #include <Core/Toolbox.h> |
| 0 | 33 |
|
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
34 #include <boost/filesystem.hpp> |
| 0 | 35 #include <boost/lexical_cast.hpp> |
| 36 #include <boost/regex.hpp> | |
|
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
37 #include <boost/date_time/posix_time/posix_time.hpp> |
| 87 | 38 #include <cassert> |
| 39 | |
| 40 | |
|
128
788dd04b87f5
cleaning up options in DicomToTiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
41 static const char* OPTION_CA_CERTIFICATES = "ca-certificates"; |
|
788dd04b87f5
cleaning up options in DicomToTiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
42 static const char* OPTION_PASSWORD = "password"; |
|
788dd04b87f5
cleaning up options in DicomToTiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
43 static const char* OPTION_PROXY = "proxy"; |
|
788dd04b87f5
cleaning up options in DicomToTiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
44 static const char* OPTION_TIMEOUT = "timeout"; |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
45 static const char* OPTION_URL = "orthanc"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
46 static const char* OPTION_USERNAME = "username"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
47 static const char* OPTION_VERIFY_PEERS = "verify-peers"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
48 |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
49 |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
50 |
| 87 | 51 static bool DisplayPerformanceWarning() |
| 52 { | |
| 53 (void) DisplayPerformanceWarning; // Disable warning about unused function | |
| 54 LOG(WARNING) << "Performance warning in whole-slide imaging: " | |
| 55 << "Non-release build, runtime debug assertions are turned on"; | |
| 56 return true; | |
| 57 } | |
| 58 | |
| 0 | 59 |
| 60 namespace OrthancWSI | |
| 61 { | |
| 62 namespace ApplicationToolbox | |
| 63 { | |
| 64 void GlobalInitialize() | |
| 65 { | |
| 66 Orthanc::Logging::Initialize(); | |
| 151 | 67 Orthanc::Toolbox::InitializeOpenSsl(); |
| 0 | 68 Orthanc::HttpClient::GlobalInitialize(); |
| 51 | 69 Orthanc::FromDcmtkBridge::InitializeDictionary(false /* don't load private dictionary */); |
| 87 | 70 assert(DisplayPerformanceWarning()); |
| 0 | 71 } |
| 72 | |
| 73 | |
| 74 void GlobalFinalize() | |
| 75 { | |
| 76 OrthancWSI::OpenSlideLibrary::Finalize(); | |
| 77 Orthanc::HttpClient::GlobalFinalize(); | |
| 151 | 78 Orthanc::Toolbox::FinalizeOpenSsl(); |
| 0 | 79 } |
| 80 | |
| 81 | |
| 82 static void PrintProgress(Orthanc::BagOfTasksProcessor::Handle* handle, | |
| 83 bool* done) | |
| 84 { | |
| 85 unsigned int previous = 0; | |
| 86 | |
| 87 while (!*done) | |
| 88 { | |
| 89 unsigned int progress = static_cast<unsigned int>(100.0f * handle->GetProgress()); | |
| 90 if (previous != progress) | |
| 91 { | |
| 92 LOG(WARNING) << "Progress: " << progress << "%"; | |
| 93 previous = progress; | |
| 94 } | |
| 95 | |
| 96 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); | |
| 97 } | |
| 98 } | |
| 99 | |
| 100 | |
| 101 void Execute(Orthanc::BagOfTasks& tasks, | |
| 102 unsigned int threadsCount) | |
| 103 { | |
| 104 if (threadsCount > 1) | |
| 105 { | |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
106 // Submit the tasks to a newly-created processor |
| 0 | 107 LOG(WARNING) << "Running " << tasks.GetSize() << " tasks"; |
| 108 LOG(WARNING) << "Using " << threadsCount << " threads for the computation"; | |
| 109 Orthanc::BagOfTasksProcessor processor(threadsCount); | |
| 110 std::auto_ptr<Orthanc::BagOfTasksProcessor::Handle> handle(processor.Submit(tasks)); | |
| 111 | |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
112 // Start a thread to display the progress |
| 0 | 113 bool done = false; |
| 114 boost::thread progress(PrintProgress, handle.get(), &done); | |
| 115 | |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
116 // Wait for the completion of the tasks |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
117 bool success = handle->Join(); |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
118 |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
119 // Stop the progress-printing thread |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
120 done = true; |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
121 |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
122 if (progress.joinable()) |
| 0 | 123 { |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
124 progress.join(); |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
125 } |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
126 |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
127 if (success) |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
128 { |
| 0 | 129 LOG(WARNING) << "All tasks have finished"; |
| 130 } | |
| 131 else | |
| 132 { | |
| 133 LOG(ERROR) << "Error has occurred, aborting"; | |
| 134 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 135 } | |
| 136 } | |
| 137 else | |
| 138 { | |
| 139 LOG(WARNING) << "Running " << tasks.GetSize() << " tasks without multithreading"; | |
| 140 | |
| 141 unsigned int previous = 0; | |
| 142 unsigned int size = tasks.GetSize(); | |
| 143 | |
| 144 // No multithreading | |
| 145 while (!tasks.IsEmpty()) | |
| 146 { | |
| 147 std::auto_ptr<Orthanc::ICommand> task(tasks.Pop()); | |
| 148 if (task->Execute()) | |
| 149 { | |
| 150 unsigned int progress = static_cast<unsigned int>(100.0f * | |
| 151 static_cast<float>((size - tasks.GetSize())) / | |
| 152 static_cast<float>(size)); | |
| 153 if (progress != previous) | |
| 154 { | |
| 155 LOG(WARNING) << "Progress: " << progress << "%"; | |
| 156 previous = progress; | |
| 157 } | |
| 158 } | |
| 159 else | |
| 160 { | |
| 161 LOG(ERROR) << "Error has occurred, aborting"; | |
| 162 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 163 } | |
| 164 } | |
| 165 } | |
| 166 } | |
| 167 | |
| 168 | |
| 169 void ParseColor(uint8_t& red, | |
| 170 uint8_t& green, | |
| 171 uint8_t& blue, | |
| 172 const std::string& color) | |
| 173 { | |
| 174 boost::regex pattern("([0-9]*),([0-9]*),([0-9]*)"); | |
| 175 | |
| 176 bool ok = false; | |
| 177 boost::cmatch what; | |
| 178 | |
|
106
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
179 // Set white as the default color to avoid compiler warnings |
|
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
180 red = 255; |
|
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
181 green = 255; |
|
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
182 blue = 255; |
|
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
183 |
| 0 | 184 try |
| 185 { | |
| 186 if (regex_match(color.c_str(), what, pattern)) | |
| 187 { | |
| 188 int r = boost::lexical_cast<int>(what[1]); | |
| 189 int g = boost::lexical_cast<int>(what[2]); | |
| 190 int b = boost::lexical_cast<int>(what[3]); | |
| 191 | |
| 192 if (r >= 0 && r <= 255 && | |
| 193 g >= 0 && g <= 255 && | |
| 194 b >= 0 && b <= 255) | |
| 195 { | |
| 196 red = static_cast<uint8_t>(r); | |
| 197 green = static_cast<uint8_t>(g); | |
| 198 blue = static_cast<uint8_t>(b); | |
| 199 ok = true; | |
| 200 } | |
| 201 } | |
| 202 } | |
| 203 catch (boost::bad_lexical_cast&) | |
| 204 { | |
| 205 } | |
| 206 | |
| 207 if (!ok) | |
| 208 { | |
| 209 LOG(ERROR) << "Bad color specification: " << color; | |
| 210 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 211 } | |
| 212 } | |
|
8
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
213 |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
214 |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
215 void PrintVersion(const char* path) |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
216 { |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
217 std::cout |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
218 << path << " " << ORTHANC_WSI_VERSION << std::endl |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
219 << "Copyright (C) 2012-2016 Sebastien Jodogne, " |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
220 << "Medical Physics Department, University Hospital of Liege (Belgium)" << std::endl |
| 157 | 221 << "Copyright (C) 2017-2019 Osimis S.A. (Belgium)" << std::endl |
| 31 | 222 << "Licensing AGPL: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl.html>." << std::endl |
|
8
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
223 << "This is free software: you are free to change and redistribute it." << std::endl |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
224 << "There is NO WARRANTY, to the extent permitted by law." << std::endl |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
225 << std::endl |
| 157 | 226 << "Written by Sebastien Jodogne <s.jodogne@orthanc-labs.com>" << std::endl; |
|
8
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
227 } |
|
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
228 |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
229 |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
230 void ShowVersionInLog(const char* path) |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
231 { |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
232 std::string version(ORTHANC_WSI_VERSION); |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
233 |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
234 if (version == "mainline") |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
235 { |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
236 try |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
237 { |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
238 boost::filesystem::path exe(Orthanc::SystemToolbox::GetPathToExecutable()); |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
239 std::time_t creation = boost::filesystem::last_write_time(exe); |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
240 boost::posix_time::ptime converted(boost::posix_time::from_time_t(creation)); |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
241 version += " (" + boost::posix_time::to_iso_string(converted) + ")"; |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
242 } |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
243 catch (...) |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
244 { |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
245 } |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
246 } |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
247 |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
248 LOG(WARNING) << "Orthanc WSI version: " << version; |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
249 } |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
250 |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
251 |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
252 |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
253 void AddRestApiOptions(boost::program_options::options_description& section) |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
254 { |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
255 section.add_options() |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
256 (OPTION_USERNAME, boost::program_options::value<std::string>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
257 "Username for the target Orthanc server") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
258 (OPTION_PASSWORD, boost::program_options::value<std::string>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
259 "Password for the target Orthanc server") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
260 (OPTION_PROXY, boost::program_options::value<std::string>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
261 "HTTP proxy to be used") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
262 (OPTION_TIMEOUT, boost::program_options::value<int>()->default_value(0), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
263 "HTTP timeout (in seconds, 0 means no timeout)") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
264 (OPTION_VERIFY_PEERS, boost::program_options::value<bool>()->default_value(true), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
265 "Enable the verification of the peers during HTTPS requests") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
266 (OPTION_CA_CERTIFICATES, boost::program_options::value<std::string>()->default_value(""), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
267 "Path to the CA (certification authority) certificates to validate peers in HTTPS requests") |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
268 ; |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
269 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
270 |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
271 |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
272 void SetupRestApi(Orthanc::WebServiceParameters& parameters, |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
273 const boost::program_options::variables_map& options) |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
274 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
275 if (options.count(OPTION_URL)) |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
276 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
277 parameters.SetUrl(options[OPTION_URL].as<std::string>()); |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
278 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
279 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
280 if (options.count(OPTION_USERNAME) && |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
281 options.count(OPTION_PASSWORD)) |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
282 { |
| 152 | 283 parameters.SetCredentials(options[OPTION_USERNAME].as<std::string>(), |
| 284 options[OPTION_PASSWORD].as<std::string>()); | |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
285 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
286 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
287 if (options.count(OPTION_TIMEOUT)) |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
288 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
289 int timeout = options[OPTION_TIMEOUT].as<int>(); |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
290 if (timeout < 0) |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
291 { |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
292 LOG(ERROR) << "Timeouts cannot be negative: " << timeout; |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
293 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
294 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
295 else |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
296 { |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
297 Orthanc::HttpClient::SetDefaultTimeout(timeout); |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
298 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
299 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
300 if (options.count(OPTION_PROXY)) |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
301 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
302 Orthanc::HttpClient::SetDefaultProxy(options[OPTION_PROXY].as<std::string>()); |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
303 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
304 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
305 |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
306 #if ORTHANC_ENABLE_SSL == 1 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
307 if (options.count(OPTION_VERIFY_PEERS) || |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
308 options.count(OPTION_CA_CERTIFICATES)) |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
309 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
310 Orthanc::HttpClient::ConfigureSsl(options[OPTION_VERIFY_PEERS].as<bool>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
311 options[OPTION_CA_CERTIFICATES].as<std::string>()); |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
312 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
313 #endif |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
314 } |
| 0 | 315 } |
| 316 } |