Mercurial > hg > orthanc
annotate Core/HttpServer/HttpHandler.cpp @ 1363:feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 20 May 2015 15:21:26 +0200 |
| parents | 6e7e5ed91c2d |
| children | 02f5a3f5c0a0 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 59 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
912
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
912
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 0 | 5 * |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 136 | 10 * |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 0 | 22 * |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
33 #include "../PrecompiledHeaders.h" |
| 0 | 34 #include "HttpHandler.h" |
| 35 | |
| 36 #include <string.h> | |
|
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
37 #include <iostream> |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
38 |
| 0 | 39 |
| 59 | 40 namespace Orthanc |
| 0 | 41 { |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
42 static void SplitGETNameValue(HttpHandler::GetArguments& result, |
| 0 | 43 const char* start, |
| 44 const char* end) | |
| 45 { | |
| 334 | 46 std::string name, value; |
| 47 | |
| 0 | 48 const char* equal = strchr(start, '='); |
| 49 if (equal == NULL || equal >= end) | |
| 50 { | |
| 334 | 51 name = std::string(start, end - start); |
| 52 //value = ""; | |
| 0 | 53 } |
| 54 else | |
| 55 { | |
| 334 | 56 name = std::string(start, equal - start); |
| 57 value = std::string(equal + 1, end); | |
| 0 | 58 } |
| 334 | 59 |
| 336 | 60 Toolbox::UrlDecode(name); |
| 61 Toolbox::UrlDecode(value); | |
| 62 | |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
63 result.push_back(std::make_pair(name, value)); |
| 0 | 64 } |
| 65 | |
| 66 | |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
67 void HttpHandler::ParseGetArguments(HttpHandler::GetArguments& result, |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
68 const char* query) |
| 0 | 69 { |
| 70 const char* pos = query; | |
| 71 | |
| 72 while (pos != NULL) | |
| 73 { | |
| 74 const char* ampersand = strchr(pos, '&'); | |
| 75 if (ampersand) | |
| 76 { | |
| 77 SplitGETNameValue(result, pos, ampersand); | |
| 78 pos = ampersand + 1; | |
| 79 } | |
| 80 else | |
| 81 { | |
| 82 // No more ampersand, this is the last argument | |
| 83 SplitGETNameValue(result, pos, pos + strlen(pos)); | |
| 84 pos = NULL; | |
| 85 } | |
| 86 } | |
| 87 } | |
| 88 | |
| 89 | |
|
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
90 void HttpHandler::ParseGetQuery(UriComponents& uri, |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
91 HttpHandler::GetArguments& getArguments, |
|
912
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
92 const char* query) |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
93 { |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
94 const char *questionMark = ::strchr(query, '?'); |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
95 if (questionMark == NULL) |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
96 { |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
97 // No question mark in the string |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
98 Toolbox::SplitUriComponents(uri, query); |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
99 getArguments.clear(); |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
100 } |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
101 else |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
102 { |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
103 Toolbox::SplitUriComponents(uri, std::string(query, questionMark)); |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
104 HttpHandler::ParseGetArguments(getArguments, questionMark + 1); |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
105 } |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
106 } |
|
dcb2469f00f4
PluginsHttpHandler::RestApiGet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
107 |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
108 |
| 207 | 109 std::string HttpHandler::GetArgument(const Arguments& getArguments, |
| 0 | 110 const std::string& name, |
| 111 const std::string& defaultValue) | |
| 112 { | |
| 207 | 113 Arguments::const_iterator it = getArguments.find(name); |
| 114 if (it == getArguments.end()) | |
| 0 | 115 { |
| 116 return defaultValue; | |
| 117 } | |
| 118 else | |
| 119 { | |
| 120 return it->second; | |
| 121 } | |
| 122 } | |
| 330 | 123 |
| 124 | |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
125 std::string HttpHandler::GetArgument(const GetArguments& getArguments, |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
126 const std::string& name, |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
127 const std::string& defaultValue) |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
128 { |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
129 for (size_t i = 0; i < getArguments.size(); i++) |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
130 { |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
131 if (getArguments[i].first == name) |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
132 { |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
133 return getArguments[i].second; |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
134 } |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
135 } |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
136 |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
137 return defaultValue; |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
138 } |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
139 |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
140 |
| 330 | 141 |
| 142 void HttpHandler::ParseCookies(HttpHandler::Arguments& result, | |
| 143 const HttpHandler::Arguments& httpHeaders) | |
| 144 { | |
| 145 result.clear(); | |
| 146 | |
| 332 | 147 HttpHandler::Arguments::const_iterator it = httpHeaders.find("cookie"); |
| 330 | 148 if (it != httpHeaders.end()) |
| 149 { | |
| 150 const std::string& cookies = it->second; | |
| 151 | |
| 152 size_t pos = 0; | |
| 153 while (pos != std::string::npos) | |
| 154 { | |
| 155 size_t nextSemicolon = cookies.find(";", pos); | |
| 156 std::string cookie; | |
| 157 | |
| 158 if (nextSemicolon == std::string::npos) | |
| 159 { | |
| 160 cookie = cookies.substr(pos); | |
| 161 pos = std::string::npos; | |
| 162 } | |
| 163 else | |
| 164 { | |
| 165 cookie = cookies.substr(pos, nextSemicolon - pos); | |
| 166 pos = nextSemicolon + 1; | |
| 167 } | |
| 168 | |
| 169 size_t equal = cookie.find("="); | |
| 170 if (equal != std::string::npos) | |
| 171 { | |
| 172 std::string name = Toolbox::StripSpaces(cookie.substr(0, equal)); | |
| 173 std::string value = Toolbox::StripSpaces(cookie.substr(equal + 1)); | |
| 174 result[name] = value; | |
| 175 } | |
| 176 } | |
| 177 } | |
| 178 } | |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
179 |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
180 |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
181 void HttpHandler::CompileGetArguments(Arguments& compiled, |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
182 const GetArguments& source) |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
183 { |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
184 compiled.clear(); |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
185 |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
186 for (size_t i = 0; i < source.size(); i++) |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
187 { |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
188 compiled[source[i].first] = source[i].second; |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
189 } |
|
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
190 } |
| 0 | 191 } |