Mercurial > hg > orthanc-stone
annotate Resources/Orthanc/Core/WebServiceParameters.cpp @ 200:03afbee0cc7b
integration of Orthanc core into Stone
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 23 Mar 2018 11:04:03 +0100 |
parents | |
children |
rev | line source |
---|---|
200
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * License, or (at your option) any later version. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * program give permission to link the code of its release with the |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 * in the program, then also delete it here. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 * General Public License for more details. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 * |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 **/ |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 #include "PrecompiledHeaders.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 #include "WebServiceParameters.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 #include "../Core/Logging.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
38 #include "../Core/OrthancException.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 #if ORTHANC_SANDBOXED == 0 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 # include "../Core/SystemToolbox.h" |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 #endif |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
44 #include <cassert> |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
45 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 namespace Orthanc |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
47 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
48 WebServiceParameters::WebServiceParameters() : |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 advancedFormat_(false), |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 url_("http://127.0.0.1:8042/"), |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
51 pkcs11Enabled_(false) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
52 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
53 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
54 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
55 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
56 void WebServiceParameters::ClearClientCertificate() |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
57 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
58 certificateFile_.clear(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
59 certificateKeyFile_.clear(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
60 certificateKeyPassword_.clear(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
61 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
62 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
63 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
64 #if ORTHANC_SANDBOXED == 0 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 void WebServiceParameters::SetClientCertificate(const std::string& certificateFile, |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
66 const std::string& certificateKeyFile, |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
67 const std::string& certificateKeyPassword) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
68 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
69 if (certificateFile.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
70 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
71 throw OrthancException(ErrorCode_ParameterOutOfRange); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
72 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
73 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
74 if (!SystemToolbox::IsRegularFile(certificateFile)) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
75 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
76 LOG(ERROR) << "Cannot open certificate file: " << certificateFile; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
77 throw OrthancException(ErrorCode_InexistentFile); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
78 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
79 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
80 if (!certificateKeyFile.empty() && |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
81 !SystemToolbox::IsRegularFile(certificateKeyFile)) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
82 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
83 LOG(ERROR) << "Cannot open key file: " << certificateKeyFile; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
84 throw OrthancException(ErrorCode_InexistentFile); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
85 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
86 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
87 advancedFormat_ = true; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
88 certificateFile_ = certificateFile; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
89 certificateKeyFile_ = certificateKeyFile; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
90 certificateKeyPassword_ = certificateKeyPassword; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
91 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
92 #endif |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
93 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
94 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
95 static void AddTrailingSlash(std::string& url) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
96 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
97 if (url.size() != 0 && |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
98 url[url.size() - 1] != '/') |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
99 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
100 url += '/'; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
101 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
102 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
103 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
104 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
105 void WebServiceParameters::FromJsonArray(const Json::Value& peer) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
106 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
107 assert(peer.isArray()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
108 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
109 advancedFormat_ = false; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
110 pkcs11Enabled_ = false; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
111 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
112 if (peer.size() != 1 && |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
113 peer.size() != 3) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
114 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
115 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
116 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
117 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
118 std::string url = peer.get(0u, "").asString(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
119 if (url.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
121 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
123 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
124 AddTrailingSlash(url); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
125 SetUrl(url); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
126 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
127 if (peer.size() == 1) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
128 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
129 SetUsername(""); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
130 SetPassword(""); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
131 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
132 else if (peer.size() == 3) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
133 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
134 SetUsername(peer.get(1u, "").asString()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
135 SetPassword(peer.get(2u, "").asString()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
136 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
137 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
138 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
139 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
140 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
141 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
142 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
143 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
144 static std::string GetStringMember(const Json::Value& peer, |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
145 const std::string& key, |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
146 const std::string& defaultValue) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
147 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
148 if (!peer.isMember(key)) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
149 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
150 return defaultValue; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
151 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
152 else if (peer[key].type() != Json::stringValue) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
153 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
154 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
155 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
156 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
157 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
158 return peer[key].asString(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
159 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
160 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
161 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
162 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
163 void WebServiceParameters::FromJsonObject(const Json::Value& peer) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
164 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
165 assert(peer.isObject()); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
166 advancedFormat_ = true; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
167 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
168 std::string url = GetStringMember(peer, "Url", ""); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
169 if (url.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
170 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
171 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
172 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
173 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
174 AddTrailingSlash(url); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
175 SetUrl(url); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
176 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
177 SetUsername(GetStringMember(peer, "Username", "")); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
178 SetPassword(GetStringMember(peer, "Password", "")); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
179 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
180 #if ORTHANC_SANDBOXED == 0 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
181 if (peer.isMember("CertificateFile")) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
182 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
183 SetClientCertificate(GetStringMember(peer, "CertificateFile", ""), |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
184 GetStringMember(peer, "CertificateKeyFile", ""), |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
185 GetStringMember(peer, "CertificateKeyPassword", "")); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
186 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
187 #endif |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
188 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
189 if (peer.isMember("Pkcs11")) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
190 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
191 if (peer["Pkcs11"].type() == Json::booleanValue) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
192 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
193 pkcs11Enabled_ = peer["Pkcs11"].asBool(); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
194 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
195 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
196 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
197 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
198 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
199 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
200 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
201 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
202 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
203 void WebServiceParameters::FromJson(const Json::Value& peer) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
204 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
205 try |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
206 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
207 if (peer.isArray()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
208 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
209 FromJsonArray(peer); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
210 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
211 else if (peer.isObject()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
212 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
213 FromJsonObject(peer); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
214 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
215 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
216 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
217 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
218 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
219 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
220 catch (OrthancException&) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
221 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
222 throw; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
223 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
224 catch (...) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
225 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
226 throw OrthancException(ErrorCode_BadFileFormat); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
227 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
228 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
229 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
230 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
231 void WebServiceParameters::ToJson(Json::Value& value) const |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
232 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
233 if (advancedFormat_) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
234 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
235 value = Json::objectValue; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
236 value["Url"] = url_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
237 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
238 if (!username_.empty() || |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
239 !password_.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
240 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
241 value["Username"] = username_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
242 value["Password"] = password_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
243 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
244 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
245 if (!certificateFile_.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
246 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
247 value["CertificateFile"] = certificateFile_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
248 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
249 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
250 if (!certificateKeyFile_.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
251 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
252 value["CertificateKeyFile"] = certificateKeyFile_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
253 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
254 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
255 if (!certificateKeyPassword_.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
256 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
257 value["CertificateKeyPassword"] = certificateKeyPassword_; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
258 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
259 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
260 else |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
261 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
262 value = Json::arrayValue; |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
263 value.append(url_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
264 |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
265 if (!username_.empty() || |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
266 !password_.empty()) |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
267 { |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
268 value.append(username_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
269 value.append(password_); |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
270 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
271 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
272 } |
03afbee0cc7b
integration of Orthanc core into Stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
273 } |