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