Mercurial > hg > orthanc
annotate OrthancServer/QueryRetrieveHandler.cpp @ 2193:6ac6193a7935
fix a vulnerability in dcmtk 3.6.0
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 02 Dec 2016 16:04:00 +0100 |
parents | 8e67325eaa3f |
children | e3fd5bc429a2 |
rev | line source |
---|---|
1368 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
1368 | 4 * Department, University Hospital of Liege, Belgium |
5 * | |
6 * This program is free software: you can redistribute it and/or | |
7 * modify it under the terms of the GNU General Public License as | |
8 * published by the Free Software Foundation, either version 3 of the | |
9 * License, or (at your option) any later version. | |
10 * | |
11 * In addition, as a special exception, the copyright holders of this | |
12 * program give permission to link the code of its release with the | |
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
14 * that use the same license as the "OpenSSL" library), and distribute | |
15 * the linked executables. You must obey the GNU General Public License | |
16 * in all respects for all of the code used other than "OpenSSL". If you | |
17 * modify file(s) with this exception, you may extend this exception to | |
18 * your version of the file(s), but you are not obligated to do so. If | |
19 * you do not wish to do so, delete this exception statement from your | |
20 * version. If you delete this exception statement from all source files | |
21 * in the program, then also delete it here. | |
22 * | |
23 * This program is distributed in the hope that it will be useful, but | |
24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
26 * General Public License for more details. | |
27 * | |
28 * You should have received a copy of the GNU General Public License | |
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
30 **/ | |
31 | |
32 | |
33 #include "PrecompiledHeadersServer.h" | |
34 #include "QueryRetrieveHandler.h" | |
35 | |
36 #include "OrthancInitialization.h" | |
37 | |
38 | |
39 namespace Orthanc | |
40 { | |
41 void QueryRetrieveHandler::Invalidate() | |
42 { | |
43 done_ = false; | |
44 answers_.Clear(); | |
45 } | |
46 | |
47 | |
48 void QueryRetrieveHandler::Run() | |
49 { | |
50 if (!done_) | |
51 { | |
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
52 ReusableDicomUserConnection::Locker locker(context_.GetReusableDicomUserConnection(), localAet_, modality_); |
1368 | 53 locker.GetConnection().Find(answers_, level_, query_); |
54 done_ = true; | |
55 } | |
56 } | |
57 | |
58 | |
59 QueryRetrieveHandler::QueryRetrieveHandler(ServerContext& context) : | |
60 context_(context), | |
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
61 localAet_(context.GetDefaultLocalApplicationEntityTitle()), |
1368 | 62 done_(false), |
2059 | 63 level_(ResourceType_Study), |
64 answers_(false) | |
1368 | 65 { |
66 } | |
67 | |
68 | |
69 void QueryRetrieveHandler::SetModality(const std::string& symbolicName) | |
70 { | |
71 Invalidate(); | |
72 modalityName_ = symbolicName; | |
73 Configuration::GetDicomModalityUsingSymbolicName(modality_, symbolicName); | |
74 } | |
75 | |
76 | |
77 void QueryRetrieveHandler::SetLevel(ResourceType level) | |
78 { | |
79 Invalidate(); | |
80 level_ = level; | |
81 } | |
82 | |
83 | |
84 void QueryRetrieveHandler::SetQuery(const DicomTag& tag, | |
85 const std::string& value) | |
86 { | |
87 Invalidate(); | |
2007
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
88 query_.SetValue(tag, value, false); |
1368 | 89 } |
90 | |
91 | |
92 size_t QueryRetrieveHandler::GetAnswerCount() | |
93 { | |
94 Run(); | |
95 return answers_.GetSize(); | |
96 } | |
97 | |
98 | |
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
99 void QueryRetrieveHandler::GetAnswer(DicomMap& target, |
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
100 size_t i) |
1368 | 101 { |
102 Run(); | |
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
103 answers_.GetAnswer(i).Convert(target); |
1368 | 104 } |
105 | |
106 | |
107 void QueryRetrieveHandler::Retrieve(const std::string& target, | |
108 size_t i) | |
109 { | |
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
110 DicomMap map; |
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
111 GetAnswer(map, i); |
1368 | 112 |
113 { | |
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
114 ReusableDicomUserConnection::Locker locker(context_.GetReusableDicomUserConnection(), localAet_, modality_); |
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
115 locker.GetConnection().Move(target, map); |
1368 | 116 } |
117 } | |
118 | |
119 | |
120 void QueryRetrieveHandler::Retrieve(const std::string& target) | |
121 { | |
122 for (size_t i = 0; i < GetAnswerCount(); i++) | |
123 { | |
124 Retrieve(target, i); | |
125 } | |
126 } | |
127 } |