Mercurial > hg > orthanc-authorization
annotate Plugin/Plugin.cpp @ 114:546aea509427
fix + Forbidden error code
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 06 Sep 2023 17:02:41 +0200 |
| parents | 43154740ea2e |
| children | 0eed78c1e177 |
| rev | line source |
|---|---|
| 1 | 1 /** |
| 2 * Advanced authorization plugin for Orthanc | |
| 68 | 3 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
| 1 | 4 * |
| 5 * This program is free software: you can redistribute it and/or | |
| 6 * modify it under the terms of the GNU Affero General Public License | |
| 7 * as published by the Free Software Foundation, either version 3 of | |
| 8 * the License, or (at your option) any later version. | |
| 9 * | |
| 10 * This program is distributed in the hope that it will be useful, but | |
| 11 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 * Affero General Public License for more details. | |
| 14 * | |
| 15 * You should have received a copy of the GNU Affero General Public License | |
| 16 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 17 **/ | |
| 18 | |
| 19 #include "AssociativeArray.h" | |
| 20 #include "DefaultAuthorizationParser.h" | |
| 21 #include "CachedAuthorizationService.h" | |
| 22 #include "AuthorizationWebService.h" | |
| 71 | 23 #include "PermissionParser.h" |
| 1 | 24 #include "MemoryCache.h" |
| 34 | 25 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" |
| 26 | |
|
36
8ada1b669194
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
35
diff
changeset
|
27 #include <Compatibility.h> // For std::unique_ptr<> |
| 32 | 28 #include <Logging.h> |
| 29 #include <Toolbox.h> | |
| 111 | 30 #include <SerializationToolbox.h> |
| 71 | 31 #include <EmbeddedResources.h> |
| 1 | 32 |
| 33 | |
| 34 // Configuration of the authorization plugin | |
|
36
8ada1b669194
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
35
diff
changeset
|
35 static std::unique_ptr<OrthancPlugins::IAuthorizationParser> authorizationParser_; |
|
8ada1b669194
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
35
diff
changeset
|
36 static std::unique_ptr<OrthancPlugins::IAuthorizationService> authorizationService_; |
| 71 | 37 static std::unique_ptr<OrthancPlugins::PermissionParser> permissionParser_; |
| 1 | 38 static std::set<std::string> uncheckedResources_; |
| 39 static std::list<std::string> uncheckedFolders_; | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
40 static std::set<OrthancPlugins::Token> tokens_; |
| 1 | 41 static std::set<OrthancPlugins::AccessLevel> uncheckedLevels_; |
| 42 | |
| 43 | |
| 71 | 44 static std::string JoinStrings(const std::set<std::string>& values) |
| 45 { | |
| 46 std::string out; | |
| 47 std::set<std::string> copy = values; // TODO: remove after upgrading to OrthancFramework 1.11.3+ | |
| 48 Orthanc::Toolbox::JoinStrings(out, copy, "|"); | |
| 49 return out; | |
| 50 } | |
| 51 | |
| 86 | 52 class TokenAndValue |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
53 { |
| 86 | 54 private: |
| 55 OrthancPlugins::Token token_; | |
| 56 std::string value_; | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
57 |
| 86 | 58 public: |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
59 TokenAndValue(const OrthancPlugins::Token& token, const std::string& value) : |
| 86 | 60 token_(token), |
| 61 value_(value) | |
| 62 { | |
| 63 } | |
| 64 | |
| 65 const OrthancPlugins::Token& GetToken() const | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
66 { |
| 86 | 67 return token_; |
| 68 } | |
| 69 | |
| 70 const std::string& GetValue() const | |
| 71 { | |
| 72 return value_; | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
73 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
74 }; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
75 |
| 113 | 76 bool HasAccessToAllLabels(const OrthancPlugins::IAuthorizationService::UserProfile& profile) |
| 77 { | |
| 78 return (profile.authorizedLabels.find("*") != profile.authorizedLabels.end()); | |
| 79 } | |
| 80 | |
| 81 bool HasAccessToSomeLabels(const OrthancPlugins::IAuthorizationService::UserProfile& profile) | |
| 82 { | |
| 83 return (profile.authorizedLabels.size() > 0); | |
| 84 } | |
| 85 | |
| 86 | |
| 87 static bool CheckAuthorizedLabelsForResource(const std::string& uri, | |
| 88 const OrthancPlugins::AssociativeArray& getArguments, | |
| 89 const OrthancPlugins::IAuthorizationService::UserProfile& profile) | |
| 90 { | |
| 91 if (HasAccessToAllLabels(profile)) | |
| 92 { | |
| 93 return true; | |
| 94 } | |
| 95 | |
| 96 if (authorizationParser_.get() != NULL && | |
| 97 authorizationService_.get() != NULL) | |
| 98 { | |
| 99 // Parse the resources that are accessed through this URI | |
| 100 OrthancPlugins::IAuthorizationParser::AccessedResources accesses; | |
| 101 | |
| 102 if (!authorizationParser_->Parse(accesses, uri, getArguments.GetMap())) | |
| 103 { | |
| 104 return false; // Unable to parse this URI | |
| 105 } | |
| 106 | |
| 107 // Loop over all the accessed resources to ensure access is | |
| 108 // granted to each of them | |
| 109 for (OrthancPlugins::IAuthorizationParser::AccessedResources::const_iterator | |
| 110 access = accesses.begin(); access != accesses.end(); ++access) | |
| 111 { | |
| 112 // Ignored the access levels that are unchecked | |
| 113 // (cf. "UncheckedLevels" option) | |
| 114 if (uncheckedLevels_.find(access->GetLevel()) == uncheckedLevels_.end()) | |
| 115 { | |
| 116 std::string msg = std::string("Testing whether access to ") + OrthancPlugins::EnumerationToString(access->GetLevel()) + " \"" + access->GetOrthancId() + "\" is allowed wrt Labels for User '" + profile.name + "'"; | |
| 117 const std::set<std::string>& resourceLabels = access->GetLabels(); | |
| 118 std::set<std::string> authorizedResourceLabels; | |
| 119 | |
| 120 Orthanc::Toolbox::GetIntersection(authorizedResourceLabels, resourceLabels, profile.authorizedLabels); | |
| 121 | |
| 122 if (authorizedResourceLabels.size() == 0) | |
| 123 { | |
| 124 LOG(INFO) << msg << " -> not granted, no authorized labels"; | |
| 125 return false; | |
| 126 } | |
| 127 else | |
| 128 { | |
| 129 LOG(INFO) << msg << " -> granted, at least one authorized labels"; | |
| 130 return true; | |
| 131 } | |
| 132 } | |
| 133 } | |
| 134 | |
| 135 // Access is granted to all the resources that are 'unchecked' | |
| 136 return true; | |
| 137 } | |
| 138 | |
| 139 return false; // TODO or true ??? | |
| 140 } | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
141 |
| 1 | 142 static int32_t FilterHttpRequests(OrthancPluginHttpMethod method, |
| 143 const char *uri, | |
| 144 const char *ip, | |
| 145 uint32_t headersCount, | |
| 146 const char *const *headersKeys, | |
| 147 const char *const *headersValues, | |
| 148 uint32_t getArgumentsCount, | |
| 149 const char *const *getArgumentsKeys, | |
| 150 const char *const *getArgumentsValues) | |
| 151 { | |
| 152 try | |
| 153 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
154 unsigned int validity; // ignored |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
155 |
| 109 | 156 // Allow GET accesses to unchecked resources/folders (usually static resources) |
| 157 //////////////////////////////////////////////////////////////// | |
| 158 | |
| 1 | 159 if (method == OrthancPluginHttpMethod_Get) |
| 160 { | |
| 161 if (uncheckedResources_.find(uri) != uncheckedResources_.end()) | |
| 162 { | |
| 163 return 1; | |
| 164 } | |
| 165 | |
| 166 for (std::list<std::string>::const_iterator | |
| 167 it = uncheckedFolders_.begin(); it != uncheckedFolders_.end(); ++it) | |
| 168 { | |
| 169 if (Orthanc::Toolbox::StartsWith(uri, *it)) | |
| 170 { | |
| 171 return 1; | |
| 172 } | |
| 173 } | |
| 174 } | |
| 175 | |
| 109 | 176 // Extract auth tokens from headers and url get arguments |
| 177 //////////////////////////////////////////////////////////////// | |
| 178 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
179 OrthancPlugins::AssociativeArray headers(headersCount, headersKeys, headersValues, false); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
180 OrthancPlugins::AssociativeArray getArguments(getArgumentsCount, getArgumentsKeys, getArgumentsValues, true); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
181 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
182 std::vector<TokenAndValue> authTokens; // the tokens that are set in this request |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
183 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
184 for (std::set<OrthancPlugins::Token>::const_iterator token = tokens_.begin(); token != tokens_.end(); ++token) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
185 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
186 std::string value; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
187 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
188 bool hasValue = false; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
189 switch (token->GetType()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
190 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
191 case OrthancPlugins::TokenType_HttpHeader: |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
192 hasValue = headers.GetValue(value, token->GetKey()); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
193 break; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
194 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
195 case OrthancPlugins::TokenType_GetArgument: |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
196 hasValue = getArguments.GetValue(value, token->GetKey()); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
197 break; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
198 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
199 default: |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
200 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
201 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
202 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
203 if (hasValue) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
204 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
205 authTokens.push_back(TokenAndValue(*token, value)); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
206 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
207 } |
| 71 | 208 |
| 109 | 209 // Based on the tokens, check if the user has access based on its permissions and the mapping between urls and permissions |
| 210 //////////////////////////////////////////////////////////////// | |
| 211 | |
| 71 | 212 if (permissionParser_.get() != NULL && |
| 213 authorizationService_.get() != NULL) | |
| 214 { | |
| 215 std::set<std::string> requiredPermissions; | |
| 216 std::string matchedPattern; | |
| 217 if (permissionParser_->Parse(requiredPermissions, matchedPattern, method, uri)) | |
| 218 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
219 if (authTokens.empty()) |
| 71 | 220 { |
| 103 | 221 std::string msg = std::string("Testing whether anonymous user has any of the required permissions '") + JoinStrings(requiredPermissions) + "'"; |
| 113 | 222 |
| 223 // TODO: how to handle anonymous user ? | |
| 224 | |
| 225 // LOG(INFO) << msg; | |
| 226 // if (authorizationService_->HasAnonymousUserPermission(validity, requiredPermissions)) | |
| 227 // { | |
| 228 // // TODO: check labels permissions | |
| 229 // LOG(INFO) << msg << " -> granted"; | |
| 230 | |
| 231 // if (CheckAuthorizedLabelsForResource(uri, getArguments, profile)) | |
| 232 // { | |
| 233 // return 1; | |
| 234 // } | |
| 235 // } | |
| 236 // else | |
| 237 // { | |
| 238 // LOG(INFO) << msg << " -> not granted"; | |
| 239 // } | |
| 240 LOG(INFO) << msg << " -> not granted, TODO ????"; | |
| 241 return 0; | |
| 71 | 242 } |
| 243 else | |
| 244 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
245 for (size_t i = 0; i < authTokens.size(); ++i) |
| 71 | 246 { |
| 103 | 247 std::string msg = std::string("Testing whether user has the required permissions '") + JoinStrings(requiredPermissions) + "' based on the HTTP header '" + authTokens[i].GetToken().GetKey() + "' required to match '" + matchedPattern + "'"; |
| 248 | |
| 249 LOG(INFO) << msg; | |
| 113 | 250 |
| 251 OrthancPlugins::IAuthorizationService::UserProfile profile; | |
| 252 unsigned int validityNotUsed; | |
| 253 authorizationService_->GetUserProfile(validityNotUsed, profile, authTokens[i].GetToken(), authTokens[i].GetValue()); | |
| 254 | |
| 255 if (authorizationService_->HasUserPermission(validity, requiredPermissions, profile)) | |
| 71 | 256 { |
| 103 | 257 LOG(INFO) << msg << " -> granted"; |
| 113 | 258 |
| 259 // check labels permissions | |
| 260 if (CheckAuthorizedLabelsForResource(uri, getArguments, profile)) | |
| 261 { | |
| 262 return 1; | |
| 263 } | |
| 264 // not granted, but continue and check if a resource tokens grant access | |
| 71 | 265 } |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
266 else |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
267 { |
| 113 | 268 LOG(INFO) << msg << " -> not granted"; // but continue and check if a resource tokens grant access |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
269 } |
| 71 | 270 } |
| 271 } | |
| 272 } | |
| 273 } | |
| 109 | 274 |
| 275 | |
| 276 // | |
| 277 | |
| 1 | 278 if (authorizationParser_.get() != NULL && |
| 279 authorizationService_.get() != NULL) | |
| 280 { | |
| 281 // Parse the resources that are accessed through this URI | |
| 282 OrthancPlugins::IAuthorizationParser::AccessedResources accesses; | |
|
56
c02f0646297d
added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
283 |
|
57
55539d564f4f
added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents:
56
diff
changeset
|
284 if (!authorizationParser_->Parse(accesses, uri, getArguments.GetMap())) |
| 1 | 285 { |
| 286 return 0; // Unable to parse this URI | |
| 287 } | |
| 288 | |
| 289 // Loop over all the accessed resources to ensure access is | |
| 290 // granted to each of them | |
| 291 for (OrthancPlugins::IAuthorizationParser::AccessedResources::const_iterator | |
| 292 access = accesses.begin(); access != accesses.end(); ++access) | |
| 293 { | |
| 294 // Ignored the access levels that are unchecked | |
| 295 // (cf. "UncheckedLevels" option) | |
| 296 if (uncheckedLevels_.find(access->GetLevel()) == uncheckedLevels_.end()) | |
| 297 { | |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
298 std::string msg = std::string("Testing whether access to ") + OrthancPlugins::EnumerationToString(access->GetLevel()) + " \"" + access->GetOrthancId() + "\" is allowed with a resource token"; |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
299 LOG(INFO) << msg; |
| 1 | 300 |
| 301 bool granted = false; | |
| 302 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
303 if (authTokens.empty()) |
| 1 | 304 { |
| 71 | 305 granted = authorizationService_->IsGrantedToAnonymousUser(validity, method, *access); |
| 1 | 306 } |
| 307 else | |
| 308 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
309 // Loop over all the authorization tokens in the request until finding one that is granted |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
310 for (size_t i = 0; i < authTokens.size(); ++i) |
| 1 | 311 { |
| 86 | 312 if (authorizationService_->IsGranted(validity, method, *access, authTokens[i].GetToken(), authTokens[i].GetValue())) |
| 1 | 313 { |
| 314 granted = true; | |
| 315 break; | |
| 316 } | |
| 317 } | |
| 318 } | |
| 319 | |
| 320 if (!granted) | |
| 321 { | |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
322 LOG(INFO) << msg << " -> not granted"; |
| 1 | 323 return 0; |
| 324 } | |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
325 else |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
326 { |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
327 LOG(INFO) << msg << " -> granted"; |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
328 } |
| 1 | 329 } |
| 330 } | |
| 331 | |
| 332 // Access is granted to all the resources | |
| 333 return 1; | |
| 334 } | |
| 335 | |
| 336 // By default, forbid access to all the resources | |
| 337 return 0; | |
| 338 } | |
| 339 catch (std::runtime_error& e) | |
| 340 { | |
| 341 LOG(ERROR) << e.what(); | |
| 342 return OrthancPluginErrorCode_Success; // Ignore error | |
| 343 } | |
| 344 catch (Orthanc::OrthancException& e) | |
| 345 { | |
| 346 LOG(ERROR) << e.What(); | |
| 347 return OrthancPluginErrorCode_Success; // Ignore error | |
| 348 } | |
| 349 catch (...) | |
| 350 { | |
| 351 LOG(ERROR) << "Unhandled internal exception"; | |
| 352 return OrthancPluginErrorCode_Success; // Ignore error | |
| 353 } | |
| 354 } | |
| 355 | |
| 356 | |
| 357 #if !ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 2, 1) | |
| 358 static int32_t FilterHttpRequestsFallback(OrthancPluginHttpMethod method, | |
| 359 const char *uri, | |
| 360 const char *ip, | |
| 361 uint32_t headersCount, | |
| 362 const char *const *headersKeys, | |
| 363 const char *const *headersValues) | |
| 364 { | |
| 365 // Fallback wrapper function for Orthanc <= 1.2.0, where the GET | |
| 366 // arguments were not available in the HTTP filters | |
| 367 return FilterHttpRequests(method, uri, ip, | |
| 368 headersCount, headersKeys, headersValues, | |
| 369 0, NULL, NULL); | |
| 370 } | |
| 371 #endif | |
| 372 | |
| 373 | |
| 374 static OrthancPluginErrorCode OnChangeCallback(OrthancPluginChangeType changeType, | |
| 375 OrthancPluginResourceType resourceType, | |
| 376 const char* resourceId) | |
| 377 { | |
| 378 try | |
| 379 { | |
| 380 if (authorizationParser_.get() == NULL) | |
| 381 { | |
| 71 | 382 return OrthancPluginErrorCode_Success; |
| 1 | 383 } |
| 384 | |
| 385 if (changeType == OrthancPluginChangeType_Deleted) | |
| 386 { | |
| 387 switch (resourceType) | |
| 388 { | |
| 389 case OrthancPluginResourceType_Patient: | |
| 390 authorizationParser_->Invalidate(Orthanc::ResourceType_Patient, resourceId); | |
| 391 break; | |
| 392 | |
| 393 case OrthancPluginResourceType_Study: | |
| 394 authorizationParser_->Invalidate(Orthanc::ResourceType_Study, resourceId); | |
| 395 break; | |
| 396 | |
| 397 case OrthancPluginResourceType_Series: | |
| 398 authorizationParser_->Invalidate(Orthanc::ResourceType_Series, resourceId); | |
| 399 break; | |
| 400 | |
| 401 case OrthancPluginResourceType_Instance: | |
| 402 authorizationParser_->Invalidate(Orthanc::ResourceType_Instance, resourceId); | |
| 403 break; | |
| 404 | |
| 405 default: | |
| 406 break; | |
| 407 } | |
| 408 } | |
| 409 | |
| 410 return OrthancPluginErrorCode_Success; | |
| 411 } | |
| 412 catch (std::runtime_error& e) | |
| 413 { | |
| 414 LOG(ERROR) << e.what(); | |
| 415 return OrthancPluginErrorCode_Success; // Ignore error | |
| 416 } | |
| 417 catch (Orthanc::OrthancException& e) | |
| 418 { | |
| 419 LOG(ERROR) << e.What(); | |
| 420 return OrthancPluginErrorCode_Success; // Ignore error | |
| 421 } | |
| 422 catch (...) | |
| 423 { | |
| 424 LOG(ERROR) << "Unhandled internal exception"; | |
| 425 return OrthancPluginErrorCode_Success; // Ignore error | |
| 426 } | |
| 427 } | |
| 428 | |
| 111 | 429 |
| 430 bool GetUserProfileInternal(OrthancPlugins::IAuthorizationService::UserProfile& profile, const OrthancPluginHttpRequest* request) | |
| 431 { | |
| 432 OrthancPlugins::AssociativeArray headers | |
| 433 (request->headersCount, request->headersKeys, request->headersValues, false); | |
| 434 | |
| 435 OrthancPlugins::AssociativeArray getArguments | |
| 436 (request->getCount, request->getKeys, request->getValues, true); | |
| 437 | |
| 438 // Loop over all the authorization tokens stored in the HTTP | |
| 439 // headers, until finding one that is granted | |
| 440 for (std::set<OrthancPlugins::Token>::const_iterator | |
| 441 token = tokens_.begin(); token != tokens_.end(); ++token) | |
| 442 { | |
| 443 OrthancPlugins::IAuthorizationService::UserProfile tryProfile; | |
| 444 | |
| 445 std::string value; | |
| 446 | |
| 447 bool hasValue = false; | |
| 448 switch (token->GetType()) | |
| 449 { | |
| 450 case OrthancPlugins::TokenType_HttpHeader: | |
| 451 hasValue = headers.GetValue(value, token->GetKey()); | |
| 452 break; | |
| 453 | |
| 454 case OrthancPlugins::TokenType_GetArgument: | |
| 455 hasValue = getArguments.GetValue(value, token->GetKey()); | |
| 456 break; | |
| 457 | |
| 458 default: | |
| 459 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 460 } | |
| 461 | |
| 462 if (hasValue) | |
| 463 { | |
| 464 unsigned int validity; // not used | |
| 465 if (authorizationService_->GetUserProfile(validity, tryProfile, *token, value)) | |
| 466 { | |
| 467 profile = tryProfile; | |
| 468 return true; | |
| 469 } | |
| 470 } | |
| 471 } | |
| 472 | |
| 473 return false; | |
| 474 } | |
| 475 | |
| 476 void AdjustToolsFindQueryLabels(Json::Value& query, const OrthancPlugins::IAuthorizationService::UserProfile& profile) | |
| 477 { | |
| 478 std::set<std::string> labelsToFind; | |
| 479 std::string labelsConstraint = "Invalid"; | |
| 480 | |
| 481 if (query.isMember("Labels") && query.isMember("LabelsConstraint")) | |
| 482 { | |
| 483 Orthanc::SerializationToolbox::ReadSetOfStrings(labelsToFind, query, "Labels"); | |
| 484 labelsConstraint = Orthanc::SerializationToolbox::ReadString(query, "LabelsConstraint"); | |
| 485 } | |
| 486 else if (query.isMember("Labels") || query.isMember("LabelsConstraint")) | |
| 487 { | |
| 114 | 488 throw Orthanc::OrthancException(Orthanc::ErrorCode_ForbiddenAccess, "Auth plugin: unable to transform tools/find query, both 'Labels' and 'LabelsConstraint' must be defined together if one of them is defined."); |
| 111 | 489 } |
| 490 | |
|
112
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
491 if (!HasAccessToSomeLabels(profile)) |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
492 { |
| 114 | 493 throw Orthanc::OrthancException(Orthanc::ErrorCode_ForbiddenAccess, "Auth plugin: unable to call tools/find when the user does not have access to any labels."); |
|
112
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
494 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
495 else if (profile.authorizedLabels.size() > 0) |
| 111 | 496 { |
| 497 // if the user has access to all labels: no need to transform the tools/find body, we keep it as is | |
|
112
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
498 if (!HasAccessToAllLabels(profile)) |
| 111 | 499 { // the user does not have access to all labels -> transform the tools/find body |
| 500 | |
| 501 if (labelsToFind.size() == 0) | |
| 502 { | |
| 503 if (profile.authorizedLabels.size() > 0) | |
| 504 { | |
| 114 | 505 query.removeMember("Labels"); |
| 111 | 506 Orthanc::SerializationToolbox::WriteSetOfStrings(query, profile.authorizedLabels, "Labels"); |
| 507 query["LabelsConstraint"] = "Any"; | |
| 508 } | |
| 509 } | |
| 510 else if (labelsConstraint == "All") | |
| 511 { | |
| 512 if (profile.authorizedLabels.size() > 0) | |
| 513 { | |
| 514 if (!Orthanc::Toolbox::IsSetInSet(labelsToFind, profile.authorizedLabels)) | |
| 515 { | |
| 114 | 516 throw Orthanc::OrthancException(Orthanc::ErrorCode_ForbiddenAccess, "Auth plugin: unable to transform tools/find query with 'All' labels constraint when the user does not have access to all listed labels."); |
| 111 | 517 } |
| 518 } | |
| 519 } | |
| 520 else if (labelsConstraint == "Any") | |
| 521 { | |
| 522 if (profile.authorizedLabels.size() > 0) | |
| 523 { | |
| 524 std::set<std::string> newLabelsToFind; | |
|
112
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
525 Orthanc::Toolbox::GetIntersection(newLabelsToFind, labelsToFind, profile.authorizedLabels); |
| 111 | 526 |
| 527 if (newLabelsToFind.size() == 0) | |
| 528 { | |
| 114 | 529 throw Orthanc::OrthancException(Orthanc::ErrorCode_ForbiddenAccess, "Auth plugin: unable to transform tools/find query with 'All' labels constraint when none of the labels to find is authorized for the user."); |
| 111 | 530 } |
| 531 | |
| 532 query.removeMember("Labels"); | |
| 533 Orthanc::SerializationToolbox::WriteSetOfStrings(query, newLabelsToFind, "Labels"); | |
| 534 } | |
| 535 } | |
| 536 else if (labelsConstraint == "None") | |
| 537 { | |
| 538 if (profile.authorizedLabels.size() > 0) | |
| 539 { | |
| 114 | 540 throw Orthanc::OrthancException(Orthanc::ErrorCode_ForbiddenAccess, "Auth plugin: unable to transform tools/find query with 'None' labels constraint when the user only has authorized_labels."); |
| 111 | 541 } |
| 542 } | |
| 543 } | |
| 544 } | |
| 545 } | |
| 546 | |
| 547 void ToolsFind(OrthancPluginRestOutput* output, | |
| 548 const char* /*url*/, | |
| 549 const OrthancPluginHttpRequest* request) | |
| 550 { | |
| 551 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); | |
| 552 | |
| 553 if (request->method != OrthancPluginHttpMethod_Post) | |
| 554 { | |
| 555 OrthancPluginSendMethodNotAllowed(context, output, "POST"); | |
| 556 } | |
| 557 else | |
| 558 { | |
| 559 // The filtering to this route is performed by this plugin as it is done for any other route before we get here. | |
| 560 | |
| 561 Json::Value body; | |
| 562 if (!OrthancPlugins::ReadJson(body, request->body, request->bodySize)) | |
| 563 { | |
| 564 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "A JSON payload was expected"); | |
| 565 } | |
| 566 | |
| 567 // If the logged in user has restrictions on the labels he can access, modify the tools/find payload before reposting it to Orthanc | |
| 568 OrthancPlugins::IAuthorizationService::UserProfile profile; | |
| 569 if (GetUserProfileInternal(profile, request)) | |
| 570 { | |
| 571 AdjustToolsFindQueryLabels(body, profile); | |
| 572 | |
| 573 Json::Value result; | |
| 574 if (OrthancPlugins::RestApiPost(result, "/tools/find", body, false)) | |
| 575 { | |
| 576 OrthancPlugins::AnswerJson(result, output); | |
| 577 } | |
| 578 | |
| 579 } | |
| 580 else | |
| 581 { | |
| 114 | 582 throw Orthanc::OrthancException(Orthanc::ErrorCode_ForbiddenAccess, "Auth plugin: no user profile found, access to tools/find is forbidden."); |
| 111 | 583 } |
|
112
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
584 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
585 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
586 |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
587 void ToolsLabels(OrthancPluginRestOutput* output, |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
588 const char* /*url*/, |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
589 const OrthancPluginHttpRequest* request) |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
590 { |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
591 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
592 |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
593 if (request->method != OrthancPluginHttpMethod_Get) |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
594 { |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
595 OrthancPluginSendMethodNotAllowed(context, output, "GET"); |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
596 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
597 else |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
598 { |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
599 // The filtering to this route is performed by this plugin as it is done for any other route before we get here. |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
600 |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
601 // If the logged in user has restrictions on the labels he can access, modify the tools/labels response before answering |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
602 OrthancPlugins::IAuthorizationService::UserProfile profile; |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
603 if (GetUserProfileInternal(profile, request)) |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
604 { |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
605 if (!HasAccessToSomeLabels(profile)) |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
606 { |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
607 Json::Value emptyLabels; |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
608 OrthancPlugins::AnswerJson(emptyLabels, output); |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
609 return; |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
610 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
611 |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
612 Json::Value jsonLabels; |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
613 if (OrthancPlugins::RestApiGet(jsonLabels, "/tools/labels", false)) |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
614 { |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
615 std::set<std::string> allLabels; |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
616 Orthanc::SerializationToolbox::ReadSetOfStrings(allLabels, jsonLabels); |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
617 |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
618 if (!HasAccessToAllLabels(profile)) |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
619 { |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
620 std::set<std::string> authorizedLabels; |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
621 |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
622 Orthanc::Toolbox::GetIntersection(authorizedLabels, allLabels, profile.authorizedLabels); |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
623 Orthanc::SerializationToolbox::WriteSetOfStrings(jsonLabels, authorizedLabels); |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
624 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
625 OrthancPlugins::AnswerJson(jsonLabels, output); |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
626 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
627 |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
628 } |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
629 else |
|
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
630 { |
| 114 | 631 throw Orthanc::OrthancException(Orthanc::ErrorCode_ForbiddenAccess, "Auth plugin: no user profile found, access to tools/labels is forbidden."); |
|
112
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
632 } |
| 111 | 633 } |
| 634 } | |
| 635 | |
| 636 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
637 void CreateToken(OrthancPluginRestOutput* output, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
638 const char* /*url*/, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
639 const OrthancPluginHttpRequest* request) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
640 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
641 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
642 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
643 if (request->method != OrthancPluginHttpMethod_Put) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
644 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
645 OrthancPluginSendMethodNotAllowed(context, output, "PUT"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
646 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
647 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
648 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
649 // The filtering to this route is performed by this plugin as it is done for any other route before we get here. |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
650 // Since the route contains the tokenType, we can allow/forbid creating them based on the url |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
651 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
652 // simply forward the request to the auth-service |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
653 std::string tokenType; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
654 if (request->groupsCount == 1) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
655 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
656 tokenType = request->groups[0]; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
657 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
658 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
659 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
660 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
661 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
662 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
663 // convert from Orthanc flavored API to WebService API |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
664 Json::Value body; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
665 if (!OrthancPlugins::ReadJson(body, request->body, request->bodySize)) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
666 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
667 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "A JSON payload was expected"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
668 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
669 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
670 std::string id; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
671 std::vector<OrthancPlugins::IAuthorizationService::OrthancResource> resources; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
672 std::string expirationDateString; |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
673 uint64_t validityDuration; |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
674 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
675 if (body.isMember("ID")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
676 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
677 id = body["ID"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
678 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
679 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
680 for (Json::ArrayIndex i = 0; i < body["Resources"].size(); ++i) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
681 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
682 const Json::Value& jsonResource = body["Resources"][i]; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
683 OrthancPlugins::IAuthorizationService::OrthancResource resource; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
684 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
685 if (jsonResource.isMember("DicomUid")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
686 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
687 resource.dicomUid = jsonResource["DicomUid"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
688 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
689 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
690 if (jsonResource.isMember("OrthancId")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
691 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
692 resource.orthancId = jsonResource["OrthancId"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
693 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
694 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
695 if (jsonResource.isMember("Url")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
696 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
697 resource.url = jsonResource["Url"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
698 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
699 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
700 resource.level = jsonResource["Level"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
701 resources.push_back(resource); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
702 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
703 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
704 if (body.isMember("ExpirationDate")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
705 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
706 expirationDateString = body["ExpirationDate"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
707 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
708 |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
709 if (body.isMember("ValidityDuration")) |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
710 { |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
711 validityDuration = body["ValidityDuration"].asUInt64(); |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
712 } |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
713 |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
714 OrthancPlugins::IAuthorizationService::CreatedToken createdToken; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
715 if (authorizationService_->CreateToken(createdToken, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
716 tokenType, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
717 id, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
718 resources, |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
719 expirationDateString, |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
720 validityDuration)) |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
721 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
722 Json::Value createdJsonToken; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
723 createdJsonToken["Token"] = createdToken.token; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
724 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
725 if (!createdToken.url.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
726 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
727 createdJsonToken["Url"] = createdToken.url; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
728 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
729 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
730 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
731 createdJsonToken["Url"] = Json::nullValue; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
732 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
733 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
734 OrthancPlugins::AnswerJson(createdJsonToken, output); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
735 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
736 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
737 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
738 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
739 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
740 |
| 74 | 741 void DecodeToken(OrthancPluginRestOutput* output, |
| 742 const char* /*url*/, | |
| 743 const OrthancPluginHttpRequest* request) | |
| 744 { | |
| 745 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); | |
| 746 | |
| 747 if (request->method != OrthancPluginHttpMethod_Post) | |
| 748 { | |
| 749 OrthancPluginSendMethodNotAllowed(context, output, "POST"); | |
| 750 } | |
| 751 else | |
| 752 { | |
| 753 // convert from Orthanc flavored API to WebService API | |
| 754 Json::Value body; | |
| 755 if (!OrthancPlugins::ReadJson(body, request->body, request->bodySize)) | |
| 756 { | |
| 757 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "A JSON payload was expected"); | |
| 758 } | |
| 759 | |
| 760 Json::Value authPayload; | |
| 761 | |
| 762 authPayload["token-key"] = body["TokenKey"].asString(); | |
| 763 authPayload["token-value"] = body["TokenValue"].asString(); | |
| 764 | |
| 765 OrthancPlugins::IAuthorizationService::DecodedToken decodedToken; | |
| 766 if (authorizationService_->DecodeToken(decodedToken, | |
| 767 body["TokenKey"].asString(), | |
| 768 body["TokenValue"].asString())) | |
| 769 { | |
| 770 Json::Value decodedJsonToken; | |
| 771 | |
| 772 if (!decodedToken.redirectUrl.empty()) | |
| 773 { | |
| 774 decodedJsonToken["RedirectUrl"] = decodedToken.redirectUrl; | |
| 775 } | |
| 776 | |
| 777 if (!decodedToken.errorCode.empty()) | |
| 778 { | |
| 779 decodedJsonToken["ErrorCode"] = decodedToken.errorCode; | |
| 780 } | |
| 781 | |
| 782 if (!decodedToken.tokenType.empty()) | |
| 783 { | |
| 784 decodedJsonToken["TokenType"] = decodedToken.tokenType; | |
| 785 } | |
| 786 | |
| 787 OrthancPlugins::AnswerJson(decodedJsonToken, output); | |
| 788 } | |
| 789 } | |
| 790 } | |
| 791 | |
| 111 | 792 |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
793 void GetUserProfile(OrthancPluginRestOutput* output, |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
794 const char* /*url*/, |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
795 const OrthancPluginHttpRequest* request) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
796 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
797 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
798 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
799 if (request->method != OrthancPluginHttpMethod_Get) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
800 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
801 OrthancPluginSendMethodNotAllowed(context, output, "GET"); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
802 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
803 else |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
804 { |
| 111 | 805 OrthancPlugins::IAuthorizationService::UserProfile profile; |
| 806 if (GetUserProfileInternal(profile, request)) | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
807 { |
| 111 | 808 Json::Value jsonProfile; |
| 809 jsonProfile["name"] = profile.name; | |
| 810 jsonProfile["permissions"] = Json::arrayValue; | |
| 811 for (std::set<std::string>::const_iterator it = profile.permissions.begin(); it != profile.permissions.end(); ++it) | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
812 { |
| 111 | 813 jsonProfile["permissions"].append(*it); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
814 } |
| 111 | 815 for (std::set<std::string>::const_iterator it = profile.authorizedLabels.begin(); it != profile.authorizedLabels.end(); ++it) |
| 816 { | |
| 817 jsonProfile["authorized-labels"].append(*it); | |
| 818 } | |
| 109 | 819 |
| 111 | 820 OrthancPlugins::AnswerJson(jsonProfile, output); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
821 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
822 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
823 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
824 |
| 71 | 825 void MergeJson(Json::Value &a, const Json::Value &b) { |
| 826 | |
| 827 if (!a.isObject() || !b.isObject()) | |
| 828 { | |
| 829 return; | |
| 830 } | |
| 831 | |
| 832 Json::Value::Members members = b.getMemberNames(); | |
| 833 | |
| 834 for (size_t i = 0; i < members.size(); i++) | |
| 835 { | |
| 836 std::string key = members[i]; | |
| 837 | |
| 838 if (!a[key].isNull() && a[key].type() == Json::objectValue && b[key].type() == Json::objectValue) | |
| 839 { | |
| 840 MergeJson(a[key], b[key]); | |
| 841 } | |
| 842 else | |
| 843 { | |
| 844 a[key] = b[key]; | |
| 845 } | |
| 846 } | |
| 847 } | |
| 848 | |
| 1 | 849 |
| 850 extern "C" | |
| 851 { | |
| 852 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context) | |
| 853 { | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
854 OrthancPlugins::SetGlobalContext(context); |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
855 OrthancPluginLogWarning(context, "Initializing the authorization plugin"); |
| 1 | 856 |
| 857 /* Check the version of the Orthanc core */ | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
858 if (OrthancPluginCheckVersion(context) == 0) |
| 1 | 859 { |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
860 OrthancPlugins::ReportMinimalOrthancVersion(ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER, |
| 1 | 861 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER, |
| 862 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER); | |
| 863 return -1; | |
| 864 } | |
| 865 | |
| 41 | 866 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 7, 2) |
| 32 | 867 Orthanc::Logging::InitializePluginContext(context); |
|
33
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
868 #else |
|
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
869 Orthanc::Logging::Initialize(context); |
|
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
870 #endif |
|
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
871 |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
872 OrthancPluginSetDescription(context, "Advanced authorization plugin for Orthanc."); |
| 1 | 873 |
| 874 try | |
| 875 { | |
| 71 | 876 static const char* PLUGIN_SECTION = "Authorization"; |
| 877 | |
| 878 OrthancPlugins::OrthancConfiguration orthancFullConfiguration; | |
| 879 | |
| 880 // read default configuration | |
| 881 std::string defaultConfigurationFileContent; | |
| 882 Orthanc::EmbeddedResources::GetFileResource(defaultConfigurationFileContent, Orthanc::EmbeddedResources::DEFAULT_CONFIGURATION); | |
| 883 Json::Value pluginJsonDefaultConfiguration; | |
| 884 OrthancPlugins::ReadJsonWithoutComments(pluginJsonDefaultConfiguration, defaultConfigurationFileContent); | |
| 885 Json::Value pluginJsonConfiguration = pluginJsonDefaultConfiguration[PLUGIN_SECTION]; | |
| 1 | 886 |
| 71 | 887 OrthancPlugins::OrthancConfiguration pluginProvidedConfiguration; |
| 888 | |
| 889 if (orthancFullConfiguration.IsSection(PLUGIN_SECTION)) | |
| 1 | 890 { |
| 71 | 891 // get the configuration provided by the user |
| 892 orthancFullConfiguration.GetSection(pluginProvidedConfiguration, PLUGIN_SECTION); | |
| 893 | |
| 894 // merge it with the default configuration. This is a way to apply the all default values in a single step | |
| 895 MergeJson(pluginJsonConfiguration, pluginProvidedConfiguration.GetJson()); | |
| 896 | |
| 897 // recreate a OrthancConfiguration object from the merged configuration | |
| 898 OrthancPlugins::OrthancConfiguration pluginConfiguration(pluginJsonConfiguration, PLUGIN_SECTION); | |
| 1 | 899 |
| 900 // TODO - The size of the caches is set to 10,000 items. Maybe add a configuration option? | |
| 901 OrthancPlugins::MemoryCache::Factory factory(10000); | |
| 902 | |
| 71 | 903 std::string dicomWebRoot = "/dicom-web/"; |
| 904 std::string oe2Root = "/ui/"; | |
| 1 | 905 |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
906 bool hasBasicAuthEnabled = orthancFullConfiguration.GetBooleanValue("AuthenticationEnabled", "true"); |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
907 |
| 71 | 908 if (orthancFullConfiguration.IsSection("DicomWeb")) |
| 909 { | |
| 910 OrthancPlugins::OrthancConfiguration dicomWeb; | |
| 911 dicomWeb.GetSection(orthancFullConfiguration, "DicomWeb"); | |
| 912 dicomWebRoot = dicomWeb.GetStringValue("Root", "/dicom-web/"); | |
| 913 } | |
| 1 | 914 |
| 71 | 915 if (orthancFullConfiguration.IsSection("OrthancExplorer2")) |
| 916 { | |
| 917 OrthancPlugins::OrthancConfiguration oe2; | |
| 918 oe2.GetSection(orthancFullConfiguration, "OrthancExplorer2"); | |
| 919 oe2Root = oe2.GetStringValue("Root", "/ui/"); | |
| 1 | 920 } |
| 921 | |
| 922 std::list<std::string> tmp; | |
| 923 | |
| 71 | 924 pluginConfiguration.LookupListOfStrings(tmp, "TokenHttpHeaders", true); |
| 1 | 925 for (std::list<std::string>::const_iterator |
| 926 it = tmp.begin(); it != tmp.end(); ++it) | |
| 927 { | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
928 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, *it)); |
| 1 | 929 } |
| 930 | |
| 71 | 931 pluginConfiguration.LookupListOfStrings(tmp, "TokenGetArguments", true); |
| 1 | 932 |
|
8
4362026afddf
orthanc 1.2.1 renamed as 1.3.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1
diff
changeset
|
933 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 3, 0) |
| 1 | 934 for (std::list<std::string>::const_iterator |
| 935 it = tmp.begin(); it != tmp.end(); ++it) | |
| 936 { | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
937 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_GetArgument, *it)); |
| 1 | 938 } |
| 939 #else | |
| 940 if (!tmp.empty()) | |
| 941 { | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
942 throw Orthanc::OrthancException( |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
943 Orthanc::ErrorCode_Plugin, |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
944 "The option \"TokenGetArguments\" of the authorization plugin " |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
945 "is only valid if compiled against Orthanc >= 1.3.0" |
| 1 | 946 } |
| 947 #endif | |
| 948 | |
| 71 | 949 pluginConfiguration.LookupSetOfStrings(uncheckedResources_, "UncheckedResources", false); |
| 950 pluginConfiguration.LookupListOfStrings(uncheckedFolders_, "UncheckedFolders", false); | |
| 1 | 951 |
| 74 | 952 std::string urlTokenDecoder; |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
953 std::string urlTokenValidation; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
954 std::string urlTokenCreationBase; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
955 std::string urlUserProfile; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
956 std::string urlRoot; |
| 1 | 957 |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
958 static const char* WEB_SERVICE_ROOT = "WebServiceRootUrl"; |
| 74 | 959 static const char* WEB_SERVICE_TOKEN_DECODER = "WebServiceTokenDecoderUrl"; |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
960 static const char* WEB_SERVICE_TOKEN_VALIDATION = "WebServiceTokenValidationUrl"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
961 static const char* WEB_SERVICE_TOKEN_CREATION_BASE = "WebServiceTokenCreationBaseUrl"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
962 static const char* WEB_SERVICE_USER_PROFILE = "WebServiceUserProfileUrl"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
963 static const char* WEB_SERVICE_TOKEN_VALIDATION_LEGACY = "WebService"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
964 if (pluginConfiguration.LookupStringValue(urlRoot, WEB_SERVICE_ROOT)) |
| 71 | 965 { |
| 74 | 966 urlTokenDecoder = Orthanc::Toolbox::JoinUri(urlRoot, "/tokens/decode"); |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
967 urlTokenValidation = Orthanc::Toolbox::JoinUri(urlRoot, "/tokens/validate"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
968 urlTokenCreationBase = Orthanc::Toolbox::JoinUri(urlRoot, "/tokens/"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
969 urlUserProfile = Orthanc::Toolbox::JoinUri(urlRoot, "/user/get-profile"); |
| 71 | 970 } |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
971 else |
| 71 | 972 { |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
973 pluginConfiguration.LookupStringValue(urlTokenValidation, WEB_SERVICE_TOKEN_VALIDATION); |
| 74 | 974 pluginConfiguration.LookupStringValue(urlTokenDecoder, WEB_SERVICE_TOKEN_DECODER); |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
975 if (urlTokenValidation.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
976 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
977 pluginConfiguration.LookupStringValue(urlTokenValidation, WEB_SERVICE_TOKEN_VALIDATION_LEGACY); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
978 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
979 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
980 pluginConfiguration.LookupStringValue(urlTokenCreationBase, WEB_SERVICE_TOKEN_CREATION_BASE); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
981 pluginConfiguration.LookupStringValue(urlUserProfile, WEB_SERVICE_USER_PROFILE); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
982 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
983 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
984 if (!urlTokenValidation.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
985 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
986 LOG(WARNING) << "Authorization plugin: url defined for Token Validation: " << urlTokenValidation; |
| 71 | 987 authorizationParser_.reset |
| 988 (new OrthancPlugins::DefaultAuthorizationParser(factory, dicomWebRoot)); | |
| 989 } | |
| 990 else | |
| 991 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
992 LOG(WARNING) << "Authorization plugin: no url defined for Token Validation"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
993 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
994 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
995 if (!urlUserProfile.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
996 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
997 LOG(WARNING) << "Authorization plugin: url defined for User Profile: " << urlUserProfile; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
998 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
999 static const char* PERMISSIONS = "Permissions"; |
| 71 | 1000 if (!pluginConfiguration.GetJson().isMember(PERMISSIONS)) |
| 1001 { | |
| 1002 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Authorization plugin: Missing required \"" + std::string(PERMISSIONS) + | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1003 "\" option since you have defined the \"" + std::string(WEB_SERVICE_ROOT) + "\" option"); |
| 71 | 1004 } |
| 1005 permissionParser_.reset | |
| 1006 (new OrthancPlugins::PermissionParser(dicomWebRoot, oe2Root)); | |
| 1007 | |
| 1008 permissionParser_->Add(pluginConfiguration.GetJson()[PERMISSIONS]); | |
| 1009 } | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1010 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1011 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1012 LOG(WARNING) << "Authorization plugin: no url defined for User Profile"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1013 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1014 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1015 if (!urlTokenCreationBase.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1016 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1017 LOG(WARNING) << "Authorization plugin: base url defined for Token Creation : " << urlTokenCreationBase; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1018 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1019 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1020 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1021 LOG(WARNING) << "Authorization plugin: no base url defined for Token Creation"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1022 } |
| 71 | 1023 |
| 1024 if (authorizationParser_.get() == NULL && permissionParser_.get() == NULL) | |
| 1025 { | |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1026 if (hasBasicAuthEnabled) |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1027 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1028 LOG(WARNING) << "Authorization plugin: No Token Validation or User Profile url defined -> will only be able to generate tokens. All API routes are accessible to all registered users."; |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1029 } |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1030 else |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1031 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1032 LOG(WARNING) << "Authorization plugin: ----------- insecure setup ---------- No Token Validation or User Profile url defined -> will only be able to generate tokens. Authentication is not enabled -> anyone will have access to all API routes."; |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1033 } |
| 1 | 1034 } |
| 1035 | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1036 std::set<std::string> standardConfigurations; |
| 71 | 1037 if (pluginConfiguration.LookupSetOfStrings(standardConfigurations, "StandardConfigurations", false)) |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1038 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1039 if (standardConfigurations.find("osimis-web-viewer") != standardConfigurations.end()) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1040 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1041 uncheckedFolders_.push_back("/osimis-viewer/app/"); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1042 uncheckedFolders_.push_back("/osimis-viewer/languages/"); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1043 uncheckedResources_.insert("/osimis-viewer/config.js"); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1044 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1045 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "token")); |
|
95
dff72e397f90
fix standard configuration 'orthanc-explorer-2' for TokenGetArguments
Alain Mazy <am@osimis.io>
parents:
86
diff
changeset
|
1046 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_GetArgument, "token")); // for download links in Webviewer |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1047 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1048 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1049 if (standardConfigurations.find("stone-webviewer") != standardConfigurations.end()) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1050 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1051 uncheckedFolders_.push_back("/stone-webviewer/"); |
| 65 | 1052 uncheckedResources_.insert("/system"); // for Stone to check that Orthanc is the server providing the data |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1053 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1054 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "Authorization")); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1055 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1056 |
| 65 | 1057 if (standardConfigurations.find("orthanc-explorer-2") != standardConfigurations.end()) |
| 1058 { | |
| 1059 uncheckedFolders_.push_back("/ui/app/"); | |
| 74 | 1060 uncheckedFolders_.push_back("/ui/landing/"); |
| 76 | 1061 uncheckedResources_.insert("/"); // for the redirect to /ui/app/ |
| 66 | 1062 uncheckedResources_.insert("/ui/api/pre-login-configuration"); // for the UI to know, i.e. if Keycloak is enabled or not |
| 71 | 1063 uncheckedResources_.insert("/ui/api/configuration"); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
1064 uncheckedResources_.insert("/auth/user-profile"); |
| 65 | 1065 |
| 1066 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "Authorization")); // for basic-auth | |
| 1067 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "token")); // for keycloak | |
|
95
dff72e397f90
fix standard configuration 'orthanc-explorer-2' for TokenGetArguments
Alain Mazy <am@osimis.io>
parents:
86
diff
changeset
|
1068 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_GetArgument, "token")); // for download links in OE2 |
| 65 | 1069 } |
| 1070 | |
| 102 | 1071 if (standardConfigurations.find("ohif") != standardConfigurations.end()) |
| 1072 { | |
| 1073 uncheckedFolders_.push_back("/ohif/"); | |
| 1074 } | |
| 1075 | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1076 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1077 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1078 std::string checkedLevelString; |
| 71 | 1079 if (pluginConfiguration.LookupStringValue(checkedLevelString, "CheckedLevel")) |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1080 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1081 OrthancPlugins::AccessLevel checkedLevel = OrthancPlugins::StringToAccessLevel(checkedLevelString); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1082 if (checkedLevel == OrthancPlugins::AccessLevel_Instance) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1083 { |
| 113 | 1084 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_System); |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1085 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Patient); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1086 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Study); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1087 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Series); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1088 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1089 else if (checkedLevel == OrthancPlugins::AccessLevel_Series) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1090 { |
| 113 | 1091 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_System); |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1092 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Patient); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1093 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Study); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1094 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Instance); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1095 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1096 else if (checkedLevel == OrthancPlugins::AccessLevel_Study) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1097 { |
| 113 | 1098 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_System); |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1099 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Patient); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1100 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Series); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1101 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Instance); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1102 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1103 else if (checkedLevel == OrthancPlugins::AccessLevel_Patient) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1104 { |
| 113 | 1105 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_System); |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1106 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Study); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1107 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Series); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1108 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Instance); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1109 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1110 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1111 |
| 71 | 1112 if (pluginConfiguration.LookupListOfStrings(tmp, "UncheckedLevels", false)) |
| 1 | 1113 { |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1114 if (uncheckedLevels_.size() == 0) |
| 1 | 1115 { |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1116 for (std::list<std::string>::const_iterator |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1117 it = tmp.begin(); it != tmp.end(); ++it) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1118 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1119 uncheckedLevels_.insert(OrthancPlugins::StringToAccessLevel(*it)); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1120 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1121 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1122 else |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1123 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1124 LOG(ERROR) << "Authorization plugin: you may only provide one of 'CheckedLevel' or 'UncheckedLevels' configurations"; |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1125 return -1; |
| 1 | 1126 } |
| 1127 } | |
| 1128 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1129 std::unique_ptr<OrthancPlugins::AuthorizationWebService> webService(new OrthancPlugins::AuthorizationWebService(urlTokenValidation, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1130 urlTokenCreationBase, |
| 74 | 1131 urlUserProfile, |
| 1132 urlTokenDecoder)); | |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1133 |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1134 std::string webServiceIdentifier; |
| 71 | 1135 if (pluginConfiguration.LookupStringValue(webServiceIdentifier, "WebServiceIdentifier")) |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1136 { |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1137 webService->SetIdentifier(webServiceIdentifier); |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1138 } |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1139 |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1140 std::string webServiceUsername; |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1141 std::string webServicePassword; |
| 71 | 1142 if (pluginConfiguration.LookupStringValue(webServiceUsername, "WebServiceUsername") && pluginConfiguration.LookupStringValue(webServicePassword, "WebServicePassword")) |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1143 { |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1144 webService->SetCredentials(webServiceUsername, webServicePassword); |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1145 } |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1146 |
| 1 | 1147 authorizationService_.reset |
| 1148 (new OrthancPlugins::CachedAuthorizationService | |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1149 (webService.release(), factory)); |
| 1 | 1150 |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1151 if (!urlTokenValidation.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1152 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1153 OrthancPluginRegisterOnChangeCallback(context, OnChangeCallback); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1154 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1155 |
| 74 | 1156 if (!urlTokenDecoder.empty()) |
| 1157 { | |
| 1158 OrthancPlugins::RegisterRestCallback<DecodeToken>("/auth/tokens/decode", true); | |
| 1159 } | |
| 1160 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1161 if (!urlUserProfile.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1162 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1163 OrthancPlugins::RegisterRestCallback<GetUserProfile>("/auth/user/profile", true); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1164 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1165 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1166 if (!urlTokenCreationBase.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1167 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1168 OrthancPlugins::RegisterRestCallback<CreateToken>("/auth/tokens/(.*)", true); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1169 } |
| 74 | 1170 |
| 111 | 1171 OrthancPlugins::RegisterRestCallback<ToolsFind>("/tools/find", true); |
|
112
572955904411
added tools/labels + removed forbidden_labels
Alain Mazy <am@osimis.io>
parents:
111
diff
changeset
|
1172 OrthancPlugins::RegisterRestCallback<ToolsLabels>("/tools/labels", true); |
| 111 | 1173 |
| 74 | 1174 |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1175 if (authorizationParser_.get() != NULL || permissionParser_.get() != NULL) |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1176 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1177 if (hasBasicAuthEnabled) |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1178 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1179 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Authorization plugin: you are using the plugin to grant access to resources or handle user permissions. This is not compatible with \"AuthenticationEnabled\" = true"); |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1180 } |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1181 |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1182 LOG(WARNING) << "Authorization plugin: Registering Incoming HTTP Request Filter"; |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1183 |
| 1 | 1184 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 2, 1) |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1185 OrthancPluginRegisterIncomingHttpRequestFilter2(context, FilterHttpRequests); |
| 1 | 1186 #else |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1187 OrthancPluginRegisterIncomingHttpRequestFilter(context, FilterHttpRequestsFallback); |
| 1 | 1188 #endif |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1189 } |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1190 |
| 1 | 1191 } |
| 1192 else | |
| 1193 { | |
| 71 | 1194 LOG(WARNING) << "No section \"" << PLUGIN_SECTION << "\" in the configuration file, " |
| 1 | 1195 << "the authorization plugin is disabled"; |
| 1196 } | |
| 1197 } | |
| 1198 catch (Orthanc::OrthancException& e) | |
| 1199 { | |
| 1200 LOG(ERROR) << e.What(); | |
| 1201 return -1; | |
| 1202 } | |
| 1203 | |
| 1204 return 0; | |
| 1205 } | |
| 1206 | |
| 1207 | |
| 1208 ORTHANC_PLUGINS_API void OrthancPluginFinalize() | |
| 1209 { | |
| 1210 authorizationParser_.reset(NULL); | |
| 1211 } | |
| 1212 | |
| 1213 | |
| 1214 ORTHANC_PLUGINS_API const char* OrthancPluginGetName() | |
| 1215 { | |
| 1216 return "authorization"; | |
| 1217 } | |
| 1218 | |
| 1219 | |
| 1220 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion() | |
| 1221 { | |
|
22
c44013681a51
now using the Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
1222 return ORTHANC_PLUGIN_VERSION; |
| 1 | 1223 } |
| 1224 } |