Mercurial > hg > orthanc-authorization

annotate Plugin/DefaultAuthorizationParser.cpp @ 112:572955904411

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added tools/labels + removed forbidden_labels
author Alain Mazy <am@osimis.io>
date Thu, 31 Aug 2023 16:51:15 +0200
parents 7381a7674b36
children 0eed78c1e177
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Advanced authorization plugin for Orthanc
68
1a13c4fbc9a1 copyrights
Alain Mazy <am@osimis.io>
parents: 57
diff changeset
3 * Copyright (C) 2017-2023 Osimis S.A., Belgium
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 * This program is free software: you can redistribute it and/or
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * modify it under the terms of the GNU Affero General Public License
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * as published by the Free Software Foundation, either version 3 of
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * the License, or (at your option) any later version.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful, but
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * WITHOUT ANY WARRANTY; without even the implied warranty of
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * Affero General Public License for more details.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * You should have received a copy of the GNU Affero General Public License
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 **/
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 #include "DefaultAuthorizationParser.h"
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
32
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
21 #include <OrthancException.h>
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
22 #include <HttpServer/HttpToolbox.h>
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 namespace OrthancPlugins
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 {
29
bc0431cb6b8f fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
26 DefaultAuthorizationParser::DefaultAuthorizationParser(ICacheFactory& factory,
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 const std::string& dicomWebRoot) :
29
bc0431cb6b8f fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
28 AuthorizationParserBase(factory),
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 resourcesPattern_("^/(patients|studies|series|instances)/([a-f0-9-]+)(|/.*)$"),
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 seriesPattern_("^/(web-viewer/series|web-viewer/is-stable-series|wsi/pyramids|wsi/tiles)/([a-f0-9-]+)(|/.*)$"),
11
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
31 instancesPattern_("^/web-viewer/instances/[a-z0-9]+-([a-f0-9-]+)_[0-9]+$"),
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
32 osimisViewerSeries_("^/osimis-viewer/series/([a-f0-9-]+)(|/.*)$"),
28
ae19947abf68 Added support for Osimis Web Viewer new route (osimis-viewer/custom-command/)
am@osimis.io
parents: 22
diff changeset
33 osimisViewerImages_("^/osimis-viewer/(images|custom-command)/([a-f0-9-]+)(|/.*)$"),
11
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
34 osimisViewerStudies_("^/osimis-viewer/studies/([a-f0-9-]+)(|/.*)$")
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 std::string tmp = dicomWebRoot;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 while (!tmp.empty() &&
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 tmp[tmp.size() - 1] == '/')
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 tmp = tmp.substr(0, tmp.size() - 1);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 dicomWebStudies_ = boost::regex(
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 "^" + tmp + "/studies/([.0-9]+)(|/series)(|/)$");
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 dicomWebSeries_ = boost::regex(
80
0ffad746a16b fix DicomWEB routes
Alain Mazy <am@osimis.io>
parents: 77
diff changeset
47 "^" + tmp + "/studies/([.0-9]+)/series/([.0-9]+)(|/instances|/rendered|/metadata)(|/)$");
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 dicomWebInstances_ = boost::regex(
98
c82f0c7d2c6a Fix parsing of dicom-web/studies/../series/../instances/../bulk/.. routes
Alain Mazy <am@osimis.io>
parents: 92
diff changeset
50 "^" + tmp + "/studies/([.0-9]+)/series/([.0-9]+)/instances/([.0-9]+)(|/|/frames/.*|/rendered|/metadata|/bulk/.*)(|/)$");
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
51
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
52 dicomWebQidoRsFind_ = boost::regex(
80
0ffad746a16b fix DicomWEB routes
Alain Mazy <am@osimis.io>
parents: 77
diff changeset
53 "^" + tmp + "/(studies|series|instances)(|/)$");
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 bool DefaultAuthorizationParser::Parse(AccessedResources& target,
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
58 const std::string& uri,
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
59 const std::map<std::string, std::string>& getArguments)
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 // The mutex below should not be necessary, but we prefer to
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 // ensure thread safety in boost::regex
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 boost::mutex::scoped_lock lock(mutex_);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 boost::smatch what;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 if (boost::regex_match(uri, what, resourcesPattern_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 AccessLevel level = StringToAccessLevel(what[1]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 switch (level)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 case AccessLevel_Instance:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 AddOrthancInstance(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 break;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 case AccessLevel_Series:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 AddOrthancSeries(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 break;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 case AccessLevel_Study:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 AddOrthancStudy(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 break;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 case AccessLevel_Patient:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 AddOrthancPatient(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 break;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 default:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 else if (boost::regex_match(uri, what, seriesPattern_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 AddOrthancSeries(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 else if (boost::regex_match(uri, what, instancesPattern_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 AddOrthancInstance(target, what[1]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 else if (boost::regex_match(uri, what, dicomWebStudies_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 AddDicomStudy(target, what[1]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 else if (boost::regex_match(uri, what, dicomWebSeries_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 AddDicomSeries(target, what[1], what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 else if (boost::regex_match(uri, what, dicomWebInstances_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 AddDicomInstance(target, what[1], what[2], what[3]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 }
11
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
120 else if (boost::regex_match(uri, what, osimisViewerSeries_))
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
121 {
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
122 AddOrthancSeries(target, what[1]);
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
123 return true;
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
124 }
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
125 else if (boost::regex_match(uri, what, osimisViewerStudies_))
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
126 {
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
127 AddOrthancStudy(target, what[1]);
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
128 return true;
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
129 }
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
130 else if (boost::regex_match(uri, what, osimisViewerImages_))
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
131 {
50
9ed19ec11f48 fix osimis-viewer route
Alain Mazy <am@osimis.io>
parents: 46
diff changeset
132 AddOrthancInstance(target, what[2]);
11
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
133 return true;
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
134 }
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
135 else if (boost::regex_match(uri, what, dicomWebQidoRsFind_))
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
136 {
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
137 std::string studyInstanceUid, seriesInstanceUid, sopInstanceUid, patientId;
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
138
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
139 studyInstanceUid = Orthanc::HttpToolbox::GetArgument(getArguments, "0020000D", "");
92
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
140 if (studyInstanceUid.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
141 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
142 studyInstanceUid = Orthanc::HttpToolbox::GetArgument(getArguments, "StudyInstanceUID", "");
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
143 }
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
144
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
145 seriesInstanceUid = Orthanc::HttpToolbox::GetArgument(getArguments, "0020000E", "");
92
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
146 if (seriesInstanceUid.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
147 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
148 seriesInstanceUid = Orthanc::HttpToolbox::GetArgument(getArguments, "SeriesInstanceUID", "");
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
149 }
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
150
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
151 sopInstanceUid = Orthanc::HttpToolbox::GetArgument(getArguments, "00080018", "");
92
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
152 if (sopInstanceUid.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
153 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
154 sopInstanceUid = Orthanc::HttpToolbox::GetArgument(getArguments, "SOPInstanceUID", "");
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
155 }
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
156
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
157 patientId = Orthanc::HttpToolbox::GetArgument(getArguments, "00100010", "");
92
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
158 if (patientId.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
159 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
160 patientId = Orthanc::HttpToolbox::GetArgument(getArguments, "PatientID", "");
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
161 }
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
162
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
163 if (!sopInstanceUid.empty() && !seriesInstanceUid.empty() && !studyInstanceUid.empty())
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
164 {
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
165 AddDicomInstance(target, studyInstanceUid, seriesInstanceUid, sopInstanceUid);
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
166 return true;
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
167 }
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
168 else if (!seriesInstanceUid.empty() && !studyInstanceUid.empty())
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
169 {
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
170 AddDicomSeries(target, studyInstanceUid, seriesInstanceUid);
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
171 return true;
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
172 }
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
173 else if (!studyInstanceUid.empty())
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
174 {
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
175 AddDicomStudy(target, studyInstanceUid);
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
176 return true;
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
177 }
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
178 else if (!patientId.empty())
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
179 {
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
180 AddDicomPatient(target, patientId);
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
181 return true;
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
182 }
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
183 }
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
184
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
185 // Unknown type of resource: Consider it as a system access
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
187 // Remove the trailing slashes if need be
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
188 std::string s = uri;
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
189 while (!s.empty() &&
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
190 s[s.length() - 1] == '/')
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
191 {
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
192 s = s.substr(0, s.length() - 1);
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
193 }
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
194
109
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 98
diff changeset
195 std::set<std::string> labels;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 98
diff changeset
196
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 98
diff changeset
197 target.push_back(AccessedResource(AccessLevel_System, s, "", labels));
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
198 return true;
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 }