Mercurial > hg > orthanc
annotate Core/HttpServer/FilesystemHttpHandler.cpp @ 3316:4b1017928fc4
Fix performance issue in DICOM protocol by disabling Nagle's algorithm
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 28 Feb 2019 18:21:28 +0100 |
| parents | 4e43e67f8ecf |
| children | 962e5f00744b |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 59 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1113
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3023
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 136 | 11 * |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 0 | 23 * |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
34 #include "../PrecompiledHeaders.h" |
| 0 | 35 #include "FilesystemHttpHandler.h" |
| 36 | |
| 59 | 37 #include "../OrthancException.h" |
|
2143
fd5875662670
creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2140
diff
changeset
|
38 #include "../SystemToolbox.h" |
| 217 | 39 #include "FilesystemHttpSender.h" |
| 0 | 40 |
| 41 #include <boost/filesystem.hpp> | |
| 42 | |
| 43 | |
| 59 | 44 namespace Orthanc |
| 0 | 45 { |
| 46 struct FilesystemHttpHandler::PImpl | |
| 47 { | |
| 48 UriComponents baseUri_; | |
| 49 boost::filesystem::path root_; | |
| 50 }; | |
| 51 | |
| 52 | |
| 53 | |
| 54 static void OutputDirectoryContent(HttpOutput& output, | |
|
1515
c94353fbd4e9
cont http compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1446
diff
changeset
|
55 const IHttpHandler::Arguments& headers, |
| 0 | 56 const UriComponents& uri, |
| 57 const boost::filesystem::path& p) | |
| 58 { | |
| 59 namespace fs = boost::filesystem; | |
| 60 | |
|
1113
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
61 std::string s; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
62 s += "<html>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
63 s += " <body>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
64 s += " <h1>Subdirectories</h1>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
65 s += " <ul>"; |
| 0 | 66 |
| 67 if (uri.size() > 0) | |
| 68 { | |
| 69 std::string h = Toolbox::FlattenUri(uri) + "/.."; | |
|
1113
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
70 s += "<li><a href=\"" + h + "\">..</a></li>"; |
| 0 | 71 } |
| 72 | |
| 73 fs::directory_iterator end; | |
| 74 for (fs::directory_iterator it(p) ; it != end; ++it) | |
| 75 { | |
|
110
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
76 #if BOOST_HAS_FILESYSTEM_V3 == 1 |
| 0 | 77 std::string f = it->path().filename().string(); |
|
110
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
78 #else |
|
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
79 std::string f = it->path().filename(); |
|
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
80 #endif |
|
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
81 |
| 0 | 82 std::string h = Toolbox::FlattenUri(uri) + "/" + f; |
| 83 if (fs::is_directory(it->status())) | |
|
1113
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
84 s += "<li><a href=\"" + h + "\">" + f + "</a></li>"; |
| 0 | 85 } |
| 86 | |
|
1113
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
87 s += " </ul>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
88 s += " <h1>Files</h1>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
89 s += " <ul>"; |
| 0 | 90 |
| 91 for (fs::directory_iterator it(p) ; it != end; ++it) | |
| 92 { | |
|
110
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
93 #if BOOST_HAS_FILESYSTEM_V3 == 1 |
| 0 | 94 std::string f = it->path().filename().string(); |
|
110
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
95 #else |
|
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
96 std::string f = it->path().filename(); |
|
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
97 #endif |
|
fd7b0a3e6260
support of boost 1.42 for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
98 |
| 0 | 99 std::string h = Toolbox::FlattenUri(uri) + "/" + f; |
| 2140 | 100 if (SystemToolbox::IsRegularFile(it->path().string())) |
| 1911 | 101 { |
|
1113
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
102 s += "<li><a href=\"" + h + "\">" + f + "</a></li>"; |
| 1911 | 103 } |
| 0 | 104 } |
| 105 | |
|
1113
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
106 s += " </ul>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
107 s += " </body>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
108 s += "</html>"; |
|
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
109 |
|
2908
9d277f8ad698
new enumeration: MimeType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
110 output.SetContentType(MimeType_Html); |
| 1521 | 111 output.Answer(s); |
| 0 | 112 } |
| 113 | |
| 114 | |
| 115 FilesystemHttpHandler::FilesystemHttpHandler(const std::string& baseUri, | |
| 116 const std::string& root) : pimpl_(new PImpl) | |
| 117 { | |
| 118 Toolbox::SplitUriComponents(pimpl_->baseUri_, baseUri); | |
| 119 pimpl_->root_ = root; | |
| 120 listDirectoryContent_ = false; | |
| 121 | |
| 122 namespace fs = boost::filesystem; | |
| 123 if (!fs::exists(pimpl_->root_) || | |
| 124 !fs::is_directory(pimpl_->root_)) | |
| 125 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
126 throw OrthancException(ErrorCode_DirectoryExpected); |
| 0 | 127 } |
| 128 } | |
| 129 | |
| 130 | |
|
895
7e8cde5905fd
allow superposition of REST handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
131 bool FilesystemHttpHandler::Handle( |
| 0 | 132 HttpOutput& output, |
|
1571
3232f1c995a5
provide the origin of the requests to HTTP handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1521
diff
changeset
|
133 RequestOrigin /*origin*/, |
|
3232f1c995a5
provide the origin of the requests to HTTP handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1521
diff
changeset
|
134 const char* /*remoteIp*/, |
|
3232f1c995a5
provide the origin of the requests to HTTP handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1521
diff
changeset
|
135 const char* /*username*/, |
|
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
398
diff
changeset
|
136 HttpMethod method, |
| 0 | 137 const UriComponents& uri, |
| 138 const Arguments& headers, | |
|
1363
feaf2840917c
Plugins now receive duplicated GET arguments in their REST callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
139 const GetArguments& arguments, |
|
1446
8dc80ba768aa
refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1363
diff
changeset
|
140 const char* /*bodyData*/, |
|
8dc80ba768aa
refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1363
diff
changeset
|
141 size_t /*bodySize*/) |
| 0 | 142 { |
|
901
7d88f3f4a3b3
refactoring IsServedUri, answer PNG images, regular expression groups
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
895
diff
changeset
|
143 if (!Toolbox::IsChildUri(pimpl_->baseUri_, uri)) |
|
7d88f3f4a3b3
refactoring IsServedUri, answer PNG images, regular expression groups
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
895
diff
changeset
|
144 { |
|
7d88f3f4a3b3
refactoring IsServedUri, answer PNG images, regular expression groups
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
895
diff
changeset
|
145 // This URI is not served by this handler |
|
7d88f3f4a3b3
refactoring IsServedUri, answer PNG images, regular expression groups
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
895
diff
changeset
|
146 return false; |
|
7d88f3f4a3b3
refactoring IsServedUri, answer PNG images, regular expression groups
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
895
diff
changeset
|
147 } |
|
7d88f3f4a3b3
refactoring IsServedUri, answer PNG images, regular expression groups
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
895
diff
changeset
|
148 |
|
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
398
diff
changeset
|
149 if (method != HttpMethod_Get) |
| 0 | 150 { |
|
1042
8d1845feb277
set cookies, not allowed methods, unauthorized in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
908
diff
changeset
|
151 output.SendMethodNotAllowed("GET"); |
|
895
7e8cde5905fd
allow superposition of REST handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
152 return true; |
| 0 | 153 } |
| 154 | |
| 155 namespace fs = boost::filesystem; | |
| 156 | |
| 157 fs::path p = pimpl_->root_; | |
| 158 for (size_t i = pimpl_->baseUri_.size(); i < uri.size(); i++) | |
| 159 { | |
| 160 p /= uri[i]; | |
| 161 } | |
| 162 | |
| 2140 | 163 if (SystemToolbox::IsRegularFile(p.string())) |
| 0 | 164 { |
|
1519
8bd0d897763f
refactoring: IHttpStreamAnswer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1517
diff
changeset
|
165 FilesystemHttpSender sender(p); |
|
3023
c9c2faf76bec
replaced 'var' by 'let' in Orthanc Explorer's JavaScript
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2908
diff
changeset
|
166 sender.SetContentType(SystemToolbox::AutodetectMimeType(p.string())); |
|
1519
8bd0d897763f
refactoring: IHttpStreamAnswer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1517
diff
changeset
|
167 output.Answer(sender); // TODO COMPRESSION |
| 0 | 168 } |
| 169 else if (listDirectoryContent_ && | |
| 170 fs::exists(p) && | |
| 171 fs::is_directory(p)) | |
| 172 { | |
|
1515
c94353fbd4e9
cont http compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1446
diff
changeset
|
173 OutputDirectoryContent(output, headers, uri, p); |
| 0 | 174 } |
| 175 else | |
| 176 { | |
|
1113
ba5c0908600c
Refactoring of HttpOutput ("Content-Length" header is now always sent)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1042
diff
changeset
|
177 output.SendStatus(HttpStatus_404_NotFound); |
| 0 | 178 } |
|
895
7e8cde5905fd
allow superposition of REST handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
179 |
|
7e8cde5905fd
allow superposition of REST handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
180 return true; |
| 0 | 181 } |
| 182 } |