Mercurial > hg > orthanc-authorization

annotate Plugin/DefaultAuthorizationParser.cpp @ 155:6673a963ddf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 22 Mar 2024 15:08:48 +0100
parents 9f686ee4b158
children c4b908970ae4
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
150
Alain Mazy <am@osimis.io>
parents: 149
diff changeset
4 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU Affero General Public License
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * as published by the Free Software Foundation, either version 3 of
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * the License, or (at your option) any later version.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * 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
12 * WITHOUT ANY WARRANTY; without even the implied warranty of
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * Affero General Public License for more details.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * 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
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
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
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 #include "DefaultAuthorizationParser.h"
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
32
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
22 #include <OrthancException.h>
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
23 #include <HttpServer/HttpToolbox.h>
128
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
24 #include <Logging.h>
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 namespace OrthancPlugins
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 {
29
bc0431cb6b8f fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
28 DefaultAuthorizationParser::DefaultAuthorizationParser(ICacheFactory& factory,
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 const std::string& dicomWebRoot) :
29
bc0431cb6b8f fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
30 AuthorizationParserBase(factory),
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 resourcesPattern_("^/(patients|studies|series|instances)/([a-f0-9-]+)(|/.*)$"),
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 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
33 instancesPattern_("^/web-viewer/instances/[a-z0-9]+-([a-f0-9-]+)_[0-9]+$"),
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
34 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
35 osimisViewerImages_("^/osimis-viewer/(images|custom-command)/([a-f0-9-]+)(|/.*)$"),
115
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
36 osimisViewerStudies_("^/osimis-viewer/studies/([a-f0-9-]+)(|/.*)$"),
138
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
37 listOfResourcesPattern_("^/(patients|studies|series|instances)(|/)$"),
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
38 createBulkPattern_("^/tools/(create-archive|create-media|create-media-extended)(|/)$")
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 std::string tmp = dicomWebRoot;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 while (!tmp.empty() &&
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 tmp[tmp.size() - 1] == '/')
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 tmp = tmp.substr(0, tmp.size() - 1);
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
148
20c638fa8b07 new permissions for QIDO-RS & WADO-RS
Alain Mazy <am@osimis.io>
parents: 138
diff changeset
47 // note: if you add new DICOMWeb routes here, add them in the DefaultConfiguration.json too
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 dicomWebStudies_ = boost::regex(
152
9f686ee4b158 Added missing parsing of /dicom-web/studies/.../instances
Alain Mazy <am@osimis.io>
parents: 150
diff changeset
49 "^" + tmp + "/studies/([.0-9]+)(|/series|/metadata|/instances)(|/)$");
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 dicomWebSeries_ = boost::regex(
80
0ffad746a16b fix DicomWEB routes
Alain Mazy <am@osimis.io>
parents: 77
diff changeset
52 "^" + tmp + "/studies/([.0-9]+)/series/([.0-9]+)(|/instances|/rendered|/metadata)(|/)$");
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 dicomWebInstances_ = boost::regex(
98
c82f0c7d2c6a Fix parsing of dicom-web/studies/../series/../instances/../bulk/.. routes
Alain Mazy <am@osimis.io>
parents: 92
diff changeset
55 "^" + 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
56
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
57 dicomWebQidoRsFind_ = boost::regex(
80
0ffad746a16b fix DicomWEB routes
Alain Mazy <am@osimis.io>
parents: 77
diff changeset
58 "^" + tmp + "/(studies|series|instances)(|/)$");
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60
149
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
61 void DefaultAuthorizationParser::GetSingleResourcePatterns(std::vector<boost::regex>& patterns) const
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
62 {
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
63 patterns.push_back(resourcesPattern_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
64 patterns.push_back(seriesPattern_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
65 patterns.push_back(instancesPattern_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
66 patterns.push_back(osimisViewerSeries_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
67 patterns.push_back(osimisViewerImages_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
68 patterns.push_back(osimisViewerStudies_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
69 patterns.push_back(dicomWebStudies_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
70 patterns.push_back(dicomWebSeries_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
71 patterns.push_back(dicomWebInstances_);
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
72 }
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
73
423531fb1200 SINGLE_RESOURCE_PATTERNS to facilitate api-key support
Alain Mazy <am@osimis.io>
parents: 148
diff changeset
74 bool DefaultAuthorizationParser::IsListOfResources(const std::string& uri) const
115
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
75 {
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
76 if (boost::regex_match(uri, listOfResourcesPattern_))
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
77 {
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
78 return true;
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
79 }
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
80
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
81 return false;
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
82 }
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
83
0eed78c1e177 cache the UserProfile + updated http filter logic
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
84
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 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
87 const std::string& uri,
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
88 const std::map<std::string, std::string>& getArguments)
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 // The mutex below should not be necessary, but we prefer to
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 // ensure thread safety in boost::regex
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 boost::mutex::scoped_lock lock(mutex_);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 boost::smatch what;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 if (boost::regex_match(uri, what, resourcesPattern_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 AccessLevel level = StringToAccessLevel(what[1]);
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 switch (level)
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 case AccessLevel_Instance:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 AddOrthancInstance(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 break;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 case AccessLevel_Series:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 AddOrthancSeries(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 break;
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 case AccessLevel_Study:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 AddOrthancStudy(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 break;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 case AccessLevel_Patient:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 AddOrthancPatient(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 break;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 default:
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 else if (boost::regex_match(uri, what, seriesPattern_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 AddOrthancSeries(target, what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 else if (boost::regex_match(uri, what, instancesPattern_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 AddOrthancInstance(target, what[1]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 else if (boost::regex_match(uri, what, dicomWebStudies_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 AddDicomStudy(target, what[1]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 else if (boost::regex_match(uri, what, dicomWebSeries_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 AddDicomSeries(target, what[1], what[2]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 else if (boost::regex_match(uri, what, dicomWebInstances_))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 AddDicomInstance(target, what[1], what[2], what[3]);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 }
11
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
149 else if (boost::regex_match(uri, what, osimisViewerSeries_))
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
150 {
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
151 AddOrthancSeries(target, what[1]);
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
152 return true;
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
153 }
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
154 else if (boost::regex_match(uri, what, osimisViewerStudies_))
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
155 {
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
156 AddOrthancStudy(target, what[1]);
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
157 return true;
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
158 }
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
159 else if (boost::regex_match(uri, what, osimisViewerImages_))
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
160 {
50
9ed19ec11f48 fix osimis-viewer route
Alain Mazy <am@osimis.io>
parents: 46
diff changeset
161 AddOrthancInstance(target, what[2]);
11
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
162 return true;
544732bbd87b added support for Osimis Web Viewer
amazy
parents: 1
diff changeset
163 }
138
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
164 else if (boost::regex_match(uri, what, createBulkPattern_))
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
165 {
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
166 std::string resourcesIdsString = Orthanc::HttpToolbox::GetArgument(getArguments, "resources", "");
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
167 std::set<std::string> resourcesIds;
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
168 Orthanc::Toolbox::SplitString(resourcesIds, resourcesIdsString, ',');
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
169
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
170 for (std::set<std::string>::const_iterator it = resourcesIds.begin(); it != resourcesIds.end(); ++it)
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
171 {
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
172 AddOrthancUnknownResource(target, *it);
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
173 }
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
174
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
175 return true;
f448e8626f1a Now handling new GET /tools/create-archive and sibling routes
Alain Mazy <am@osimis.io>
parents: 128
diff changeset
176 }
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
177 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
178 {
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
179 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
180
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
181 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
182 if (studyInstanceUid.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
183 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
184 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
185 }
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
186
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
187 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
188 if (seriesInstanceUid.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
189 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
190 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
191 }
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
192
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
193 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
194 if (sopInstanceUid.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
195 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
196 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
197 }
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
198
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
199 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
200 if (patientId.empty())
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
201 {
8dc22bc353de QIDO-RS now supports named tags in get arguments
Alain Mazy <am@osimis.io>
parents: 80
diff changeset
202 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
203 }
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
204
128
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
205 if (!sopInstanceUid.empty() && sopInstanceUid.find('*') != std::string::npos)
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
206 {
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
207 LOG(WARNING) << "Authorization plugin: unable to handle wildcards in SOPInstanceUID";
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
208 sopInstanceUid = ""; // remove the constrain, it will be considered as a 'system' access
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
209 }
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
210
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
211 if (!seriesInstanceUid.empty() && seriesInstanceUid.find('*') != std::string::npos)
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
212 {
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
213 LOG(WARNING) << "Authorization plugin: unable to handle wildcards in SeriesInstanceUID";
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
214 seriesInstanceUid = ""; // remove the constrain, it will be considered as a 'system' access
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
215 }
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
216
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
217 if (!studyInstanceUid.empty() && studyInstanceUid.find('*') != std::string::npos)
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
218 {
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
219 LOG(WARNING) << "Authorization plugin: unable to handle wildcards in StudyInstanceUID";
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
220 studyInstanceUid = ""; // remove the constrain, it will be considered as a 'system' access
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
221 }
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
222
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
223 if (!patientId.empty() && patientId.find('*') != std::string::npos)
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
224 {
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
225 LOG(WARNING) << "Authorization plugin: unable to handle wildcards in PatientID";
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
226 patientId = ""; // remove the constrain, it will be considered as a 'system' access
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
227 }
0205e9efaca8 detect wildcards in query args like '/dicom-web/studies?PatientID=*' and consider these routes as system routes
Alain Mazy <am@osimis.io>
parents: 116
diff changeset
228
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
229 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
230 {
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
231 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
232 return true;
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
233 }
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
234 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
235 {
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
236 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
237 return true;
57
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
238 }
55539d564f4f added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents: 56
diff changeset
239 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
240 {
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
241 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
242 return true;
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
243 }
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
244 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
245 {
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
246 AddDicomPatient(target, patientId);
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
247 return true;
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
248 }
56
c02f0646297d added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents: 50
diff changeset
249 }
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
250
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
251 // Unknown type of resource: Consider it as a system access
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
253 // 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
254 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
255 while (!s.empty() &&
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
256 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
257 {
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
258 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
259 }
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
260
109
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 98
diff changeset
261 std::set<std::string> labels;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 98
diff changeset
262
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 98
diff changeset
263 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
264 return true;
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 }