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