Mercurial > hg > orthanc-wsi
annotate Applications/ApplicationToolbox.cpp @ 127:2cb9fabb529e
cleaning up options
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 02 Feb 2018 17:50:42 +0100 |
| parents | 7a3f4d580625 |
| children | 788dd04b87f5 |
| 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 | |
|
115
a51dee6a1515
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
106
diff
changeset
|
5 * Copyright (C) 2017-2018 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" | |
| 123 | 25 #include "../Resources/Orthanc/Core/DicomParsing/FromDcmtkBridge.h" |
|
59
7a3853d51c45
Move "Framework/Orthanc/" as "Resources/Orthanc/"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
26 #include "../Resources/Orthanc/Core/HttpClient.h" |
|
7a3853d51c45
Move "Framework/Orthanc/" as "Resources/Orthanc/"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
27 #include "../Resources/Orthanc/Core/Logging.h" |
|
7a3853d51c45
Move "Framework/Orthanc/" as "Resources/Orthanc/"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
28 #include "../Resources/Orthanc/Core/MultiThreading/BagOfTasksProcessor.h" |
| 123 | 29 #include "../Resources/Orthanc/Core/OrthancException.h" |
|
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
30 #include "../Resources/Orthanc/Core/SystemToolbox.h" |
| 0 | 31 |
|
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
32 #include <boost/filesystem.hpp> |
| 0 | 33 #include <boost/lexical_cast.hpp> |
| 34 #include <boost/regex.hpp> | |
|
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
35 #include <boost/date_time/posix_time/posix_time.hpp> |
| 87 | 36 #include <cassert> |
| 37 | |
| 38 | |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
39 static const char* OPTION_URL = "orthanc"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
40 static const char* OPTION_USERNAME = "username"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
41 static const char* OPTION_PASSWORD = "password"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
42 static const char* OPTION_TIMEOUT = "timeout"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
43 static const char* OPTION_PROXY = "proxy"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
44 static const char* OPTION_VERIFY_PEERS = "verify-peers"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
45 static const char* OPTION_CA_CERTIFICATES = "ca-certificates"; |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
46 |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
47 |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
48 |
| 87 | 49 static bool DisplayPerformanceWarning() |
| 50 { | |
| 51 (void) DisplayPerformanceWarning; // Disable warning about unused function | |
| 52 LOG(WARNING) << "Performance warning in whole-slide imaging: " | |
| 53 << "Non-release build, runtime debug assertions are turned on"; | |
| 54 return true; | |
| 55 } | |
| 56 | |
| 0 | 57 |
| 58 namespace OrthancWSI | |
| 59 { | |
| 60 namespace ApplicationToolbox | |
| 61 { | |
| 62 void GlobalInitialize() | |
| 63 { | |
| 64 Orthanc::Logging::Initialize(); | |
| 65 Orthanc::HttpClient::InitializeOpenSsl(); | |
| 66 Orthanc::HttpClient::GlobalInitialize(); | |
| 51 | 67 Orthanc::FromDcmtkBridge::InitializeDictionary(false /* don't load private dictionary */); |
| 87 | 68 assert(DisplayPerformanceWarning()); |
| 0 | 69 } |
| 70 | |
| 71 | |
| 72 void GlobalFinalize() | |
| 73 { | |
| 74 OrthancWSI::OpenSlideLibrary::Finalize(); | |
| 75 Orthanc::HttpClient::GlobalFinalize(); | |
| 76 Orthanc::HttpClient::FinalizeOpenSsl(); | |
| 77 } | |
| 78 | |
| 79 | |
| 80 static void PrintProgress(Orthanc::BagOfTasksProcessor::Handle* handle, | |
| 81 bool* done) | |
| 82 { | |
| 83 unsigned int previous = 0; | |
| 84 | |
| 85 while (!*done) | |
| 86 { | |
| 87 unsigned int progress = static_cast<unsigned int>(100.0f * handle->GetProgress()); | |
| 88 if (previous != progress) | |
| 89 { | |
| 90 LOG(WARNING) << "Progress: " << progress << "%"; | |
| 91 previous = progress; | |
| 92 } | |
| 93 | |
| 94 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); | |
| 95 } | |
| 96 } | |
| 97 | |
| 98 | |
| 99 void Execute(Orthanc::BagOfTasks& tasks, | |
| 100 unsigned int threadsCount) | |
| 101 { | |
| 102 if (threadsCount > 1) | |
| 103 { | |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
104 // Submit the tasks to a newly-created processor |
| 0 | 105 LOG(WARNING) << "Running " << tasks.GetSize() << " tasks"; |
| 106 LOG(WARNING) << "Using " << threadsCount << " threads for the computation"; | |
| 107 Orthanc::BagOfTasksProcessor processor(threadsCount); | |
| 108 std::auto_ptr<Orthanc::BagOfTasksProcessor::Handle> handle(processor.Submit(tasks)); | |
| 109 | |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
110 // Start a thread to display the progress |
| 0 | 111 bool done = false; |
| 112 boost::thread progress(PrintProgress, handle.get(), &done); | |
| 113 | |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
114 // 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
|
115 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
|
116 |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
117 // 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
|
118 done = true; |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
119 |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
120 if (progress.joinable()) |
| 0 | 121 { |
|
7
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
122 progress.join(); |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
123 } |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
124 |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
125 if (success) |
|
bc3ca410b765
Fix freeze if the target Orthanc is not accepting images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
126 { |
| 0 | 127 LOG(WARNING) << "All tasks have finished"; |
| 128 } | |
| 129 else | |
| 130 { | |
| 131 LOG(ERROR) << "Error has occurred, aborting"; | |
| 132 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 133 } | |
| 134 } | |
| 135 else | |
| 136 { | |
| 137 LOG(WARNING) << "Running " << tasks.GetSize() << " tasks without multithreading"; | |
| 138 | |
| 139 unsigned int previous = 0; | |
| 140 unsigned int size = tasks.GetSize(); | |
| 141 | |
| 142 // No multithreading | |
| 143 while (!tasks.IsEmpty()) | |
| 144 { | |
| 145 std::auto_ptr<Orthanc::ICommand> task(tasks.Pop()); | |
| 146 if (task->Execute()) | |
| 147 { | |
| 148 unsigned int progress = static_cast<unsigned int>(100.0f * | |
| 149 static_cast<float>((size - tasks.GetSize())) / | |
| 150 static_cast<float>(size)); | |
| 151 if (progress != previous) | |
| 152 { | |
| 153 LOG(WARNING) << "Progress: " << progress << "%"; | |
| 154 previous = progress; | |
| 155 } | |
| 156 } | |
| 157 else | |
| 158 { | |
| 159 LOG(ERROR) << "Error has occurred, aborting"; | |
| 160 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 161 } | |
| 162 } | |
| 163 } | |
| 164 } | |
| 165 | |
| 166 | |
| 167 void ParseColor(uint8_t& red, | |
| 168 uint8_t& green, | |
| 169 uint8_t& blue, | |
| 170 const std::string& color) | |
| 171 { | |
| 172 boost::regex pattern("([0-9]*),([0-9]*),([0-9]*)"); | |
| 173 | |
| 174 bool ok = false; | |
| 175 boost::cmatch what; | |
| 176 | |
|
106
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
177 // 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
|
178 red = 255; |
|
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
179 green = 255; |
|
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
180 blue = 255; |
|
18e9a5429cc4
clarification about --max-size option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
181 |
| 0 | 182 try |
| 183 { | |
| 184 if (regex_match(color.c_str(), what, pattern)) | |
| 185 { | |
| 186 int r = boost::lexical_cast<int>(what[1]); | |
| 187 int g = boost::lexical_cast<int>(what[2]); | |
| 188 int b = boost::lexical_cast<int>(what[3]); | |
| 189 | |
| 190 if (r >= 0 && r <= 255 && | |
| 191 g >= 0 && g <= 255 && | |
| 192 b >= 0 && b <= 255) | |
| 193 { | |
| 194 red = static_cast<uint8_t>(r); | |
| 195 green = static_cast<uint8_t>(g); | |
| 196 blue = static_cast<uint8_t>(b); | |
| 197 ok = true; | |
| 198 } | |
| 199 } | |
| 200 } | |
| 201 catch (boost::bad_lexical_cast&) | |
| 202 { | |
| 203 } | |
| 204 | |
| 205 if (!ok) | |
| 206 { | |
| 207 LOG(ERROR) << "Bad color specification: " << color; | |
| 208 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 209 } | |
| 210 } | |
|
8
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
211 |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
212 |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
213 void PrintVersion(const char* path) |
|
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 std::cout |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
216 << path << " " << ORTHANC_WSI_VERSION << std::endl |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
217 << "Copyright (C) 2012-2016 Sebastien Jodogne, " |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
218 << "Medical Physics Department, University Hospital of Liege (Belgium)" << std::endl |
|
115
a51dee6a1515
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
106
diff
changeset
|
219 << "Copyright (C) 2017-2018 Osimis S.A. (Belgium)" << std::endl |
| 31 | 220 << "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
|
221 << "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
|
222 << "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
|
223 << std::endl |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
224 << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl; |
|
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
225 } |
|
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
226 |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
227 |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
228 void ShowVersionInLog(const char* path) |
|
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 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
|
231 |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
232 if (version == "mainline") |
|
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 try |
|
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 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
|
237 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
|
238 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
|
239 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
|
240 } |
|
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
241 catch (...) |
|
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 } |
|
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 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
|
247 } |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
248 |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
249 |
|
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 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
|
252 { |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
253 section.add_options() |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
254 (OPTION_USERNAME, boost::program_options::value<std::string>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
255 "Username for the target Orthanc server") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
256 (OPTION_PASSWORD, boost::program_options::value<std::string>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
257 "Password for the target Orthanc server") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
258 (OPTION_PROXY, boost::program_options::value<std::string>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
259 "HTTP proxy to be used") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
260 (OPTION_TIMEOUT, boost::program_options::value<int>()->default_value(0), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
261 "HTTP timeout (in seconds, 0 means no timeout)") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
262 (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
|
263 "Enable the verification of the peers during HTTPS requests") |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
264 (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
|
265 "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
|
266 ; |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
267 } |
|
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 void SetupRestApi(Orthanc::WebServiceParameters& parameters, |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
271 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
|
272 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
273 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
|
274 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
275 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
|
276 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
277 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
278 if (options.count(OPTION_USERNAME) && |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
279 options.count(OPTION_PASSWORD)) |
|
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
280 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
281 parameters.SetUsername(options[OPTION_USERNAME].as<std::string>()); |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
282 parameters.SetPassword(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
|
283 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
284 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
285 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
|
286 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
287 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
|
288 if (timeout < 0) |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
289 { |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
290 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
|
291 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
|
292 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
293 else |
|
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 Orthanc::HttpClient::SetDefaultTimeout(timeout); |
|
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 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
298 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
|
299 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
300 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
|
301 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
302 } |
|
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 #if ORTHANC_ENABLE_SSL == 1 |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
305 if (options.count(OPTION_VERIFY_PEERS) || |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
306 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
|
307 { |
|
127
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
308 Orthanc::HttpClient::ConfigureSsl(options[OPTION_VERIFY_PEERS].as<bool>(), |
|
2cb9fabb529e
cleaning up options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
309 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
|
310 } |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
311 #endif |
|
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
312 } |
| 0 | 313 } |
| 314 } |