Mercurial > hg > orthanc
annotate OrthancServer/main.cpp @ 1000:13e230bbd882 lua-scripting
rename filter to command
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 04 Jul 2014 14:14:14 +0200 |
parents | cf52f3bcb2b3 |
children | 84b6d7bca6db |
rev | line source |
---|---|
0 | 1 /** |
62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
689 | 3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, |
0 | 4 * Belgium |
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 | |
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
33 #include "PrecompiledHeadersServer.h" |
750 | 34 #include "OrthancRestApi/OrthancRestApi.h" |
0 | 35 |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
36 #include <fstream> |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
37 #include <glog/logging.h> |
112 | 38 #include <boost/algorithm/string/predicate.hpp> |
0 | 39 |
40 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h" | |
41 #include "../Core/HttpServer/FilesystemHttpHandler.h" | |
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
42 #include "../Core/Lua/LuaFunctionCall.h" |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
43 #include "../Core/DicomFormat/DicomArray.h" |
0 | 44 #include "DicomProtocol/DicomServer.h" |
774 | 45 #include "DicomProtocol/ReusableDicomUserConnection.h" |
62 | 46 #include "OrthancInitialization.h" |
224
4eb0c7ce86c9
refactoring for store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
210
diff
changeset
|
47 #include "ServerContext.h" |
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
559
diff
changeset
|
48 #include "OrthancFindRequestHandler.h" |
619 | 49 #include "OrthancMoveRequestHandler.h" |
730
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
725
diff
changeset
|
50 #include "ServerToolbox.h" |
0 | 51 |
62 | 52 using namespace Orthanc; |
0 | 53 |
54 | |
224
4eb0c7ce86c9
refactoring for store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
210
diff
changeset
|
55 |
613 | 56 class OrthancStoreRequestHandler : public IStoreRequestHandler |
0 | 57 { |
58 private: | |
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
59 ServerContext& server_; |
0 | 60 |
61 public: | |
613 | 62 OrthancStoreRequestHandler(ServerContext& context) : |
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
63 server_(context) |
0 | 64 { |
65 } | |
66 | |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
67 virtual void Handle(const std::string& dicomFile, |
0 | 68 const DicomMap& dicomSummary, |
69 const Json::Value& dicomJson, | |
34
96e57b863dd9
option to disallow remote access
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
70 const std::string& remoteAet) |
0 | 71 { |
72 if (dicomFile.size() > 0) | |
73 { | |
397
941ea46e9e26
lua filter of new instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
74 server_.Store(&dicomFile[0], dicomFile.size(), dicomSummary, dicomJson, remoteAet); |
0 | 75 } |
76 } | |
77 }; | |
78 | |
79 | |
613 | 80 |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
81 class MyDicomServerFactory : |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
82 public IStoreRequestHandlerFactory, |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
83 public IFindRequestHandlerFactory, |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
84 public IMoveRequestHandlerFactory |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
85 { |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
86 private: |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
87 ServerContext& context_; |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
88 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
89 public: |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
90 MyDicomServerFactory(ServerContext& context) : context_(context) |
0 | 91 { |
92 } | |
93 | |
94 virtual IStoreRequestHandler* ConstructStoreRequestHandler() | |
95 { | |
613 | 96 return new OrthancStoreRequestHandler(context_); |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
97 } |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
98 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
99 virtual IFindRequestHandler* ConstructFindRequestHandler() |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
100 { |
941
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
101 std::auto_ptr<OrthancFindRequestHandler> result(new OrthancFindRequestHandler(context_)); |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
102 |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
103 result->SetMaxResults(Configuration::GetGlobalIntegerParameter("LimitFindResults", 0)); |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
104 result->SetMaxInstances(Configuration::GetGlobalIntegerParameter("LimitFindInstances", 0)); |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
105 |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
106 if (result->GetMaxResults() == 0) |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
107 { |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
108 LOG(INFO) << "No limit on the number of C-FIND results at the Patient, Study and Series levels"; |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
109 } |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
110 else |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
111 { |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
112 LOG(INFO) << "Maximum " << result->GetMaxResults() |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
113 << " results for C-FIND queries at the Patient, Study and Series levels"; |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
114 } |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
115 |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
116 if (result->GetMaxInstances() == 0) |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
117 { |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
118 LOG(INFO) << "No limit on the number of C-FIND results at the Instance level"; |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
119 } |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
120 else |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
121 { |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
122 LOG(INFO) << "Maximum " << result->GetMaxInstances() |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
123 << " instances will be returned for C-FIND queries at the Instance level"; |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
124 } |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
125 |
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
126 return result.release(); |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
127 } |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
128 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
129 virtual IMoveRequestHandler* ConstructMoveRequestHandler() |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
130 { |
613 | 131 return new OrthancMoveRequestHandler(context_); |
0 | 132 } |
133 | |
134 void Done() | |
135 { | |
136 } | |
137 }; | |
138 | |
139 | |
618 | 140 class OrthancApplicationEntityFilter : public IApplicationEntityFilter |
141 { | |
142 public: | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
143 virtual bool IsAllowedConnection(const std::string& /*callingIp*/, |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
144 const std::string& /*callingAet*/) |
618 | 145 { |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
146 return true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
147 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
148 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
149 virtual bool IsAllowedRequest(const std::string& /*callingIp*/, |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
150 const std::string& callingAet, |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
151 DicomRequestType type) |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
152 { |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
153 if (type == DicomRequestType_Store) |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
154 { |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
155 // Incoming store requests are always accepted, even from unknown AET |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
156 return true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
157 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
158 |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
159 if (!Configuration::IsKnownAETitle(callingAet)) |
618 | 160 { |
725 | 161 LOG(ERROR) << "Unknown remote DICOM modality AET: \"" << callingAet << "\""; |
618 | 162 return false; |
163 } | |
164 else | |
165 { | |
166 return true; | |
167 } | |
168 } | |
169 }; | |
170 | |
171 | |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
172 class MyIncomingHttpRequestFilter : public IIncomingHttpRequestFilter |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
173 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
174 private: |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
175 ServerContext& context_; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
176 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
177 public: |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
178 MyIncomingHttpRequestFilter(ServerContext& context) : context_(context) |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
179 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
180 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
181 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
182 virtual bool IsAllowed(HttpMethod method, |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
183 const char* uri, |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
184 const char* ip, |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
185 const char* username) const |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
186 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
187 static const char* HTTP_FILTER = "IncomingHttpRequestFilter"; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
188 |
996
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
189 ServerContext::LuaContextLocker locker(context_); |
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
190 |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
191 // Test if the instance must be filtered out |
996
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
192 if (locker.GetLua().IsExistingFunction(HTTP_FILTER)) |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
193 { |
996
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
194 LuaFunctionCall call(locker.GetLua(), HTTP_FILTER); |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
195 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
196 switch (method) |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
197 { |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
198 case HttpMethod_Get: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
199 call.PushString("GET"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
200 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
201 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
202 case HttpMethod_Put: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
203 call.PushString("PUT"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
204 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
205 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
206 case HttpMethod_Post: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
207 call.PushString("POST"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
208 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
209 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
210 case HttpMethod_Delete: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
211 call.PushString("DELETE"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
212 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
213 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
214 default: |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
215 return true; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
216 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
217 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
218 call.PushString(uri); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
219 call.PushString(ip); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
220 call.PushString(username); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
221 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
222 if (!call.ExecutePredicate()) |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
223 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
224 LOG(INFO) << "An incoming HTTP request has been discarded by the filter"; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
225 return false; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
226 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
227 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
228 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
229 return true; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
230 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
231 }; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
232 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
233 |
133 | 234 void PrintHelp(char* path) |
235 { | |
236 std::cout | |
237 << "Usage: " << path << " [OPTION]... [CONFIGURATION]" << std::endl | |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
238 << "Orthanc, lightweight, RESTful DICOM server for healthcare and medical research." << std::endl |
133 | 239 << std::endl |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
240 << "If no configuration file is given on the command line, a set of default " << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
241 << "parameters is used. Please refer to the Orthanc homepage for the full " << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
242 << "instructions about how to use Orthanc " << std::endl |
133 | 243 << "<https://code.google.com/p/orthanc/wiki/OrthancCookbook>." << std::endl |
244 << std::endl | |
245 << "Command-line options:" << std::endl | |
246 << " --help\t\tdisplay this help and exit" << std::endl | |
247 << " --logdir=[dir]\tdirectory where to store the log files" << std::endl | |
248 << "\t\t\t(if not used, the logs are dumped to stderr)" << std::endl | |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
249 << " --config=[file]\tcreate a sample configuration file and exit" << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
250 << " --trace\t\thighest verbosity in logs (for debug)" << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
251 << " --verbose\t\tbe verbose in logs" << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
252 << " --version\t\toutput version information and exit" << std::endl |
133 | 253 << std::endl |
254 << "Exit status:" << std::endl | |
255 << " 0 if OK," << std::endl | |
256 << " -1 if error (have a look at the logs)." << std::endl | |
257 << std::endl; | |
258 } | |
0 | 259 |
260 | |
133 | 261 void PrintVersion(char* path) |
262 { | |
263 std::cout | |
264 << path << " " << ORTHANC_VERSION << std::endl | |
689 | 265 << "Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege (Belgium) " << std::endl |
133 | 266 << "Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception." << std::endl |
267 << "This is free software: you are free to change and redistribute it." << std::endl | |
268 << "There is NO WARRANTY, to the extent permitted by law." << std::endl | |
269 << std::endl | |
270 << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl; | |
271 } | |
272 | |
0 | 273 |
274 int main(int argc, char* argv[]) | |
275 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
276 // Initialize Google's logging library. |
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
277 FLAGS_logtostderr = true; |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
278 FLAGS_minloglevel = 1; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
279 FLAGS_v = 0; |
133 | 280 |
112 | 281 for (int i = 1; i < argc; i++) |
282 { | |
133 | 283 if (std::string(argv[i]) == "--help") |
284 { | |
285 PrintHelp(argv[0]); | |
286 return 0; | |
287 } | |
288 | |
289 if (std::string(argv[i]) == "--version") | |
290 { | |
291 PrintVersion(argv[0]); | |
292 return 0; | |
293 } | |
294 | |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
295 if (std::string(argv[i]) == "--verbose") |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
296 { |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
297 FLAGS_minloglevel = 0; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
298 } |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
299 |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
300 if (std::string(argv[i]) == "--trace") |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
301 { |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
302 FLAGS_minloglevel = 0; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
303 FLAGS_v = 1; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
304 } |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
305 |
112 | 306 if (boost::starts_with(argv[i], "--logdir=")) |
307 { | |
308 FLAGS_logtostderr = false; | |
309 FLAGS_log_dir = std::string(argv[i]).substr(9); | |
310 } | |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
311 |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
312 if (boost::starts_with(argv[i], "--config=")) |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
313 { |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
314 std::string configurationSample; |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
315 GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
316 |
684 | 317 #if defined(_WIN32) |
318 // Replace UNIX newlines with DOS newlines | |
319 boost::replace_all(configurationSample, "\n", "\r\n"); | |
320 #endif | |
321 | |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
322 std::string target = std::string(argv[i]).substr(9); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
323 std::ofstream f(target.c_str()); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
324 f << configurationSample; |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
325 f.close(); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
326 return 0; |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
327 } |
112 | 328 } |
329 | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
330 google::InitGoogleLogging("Orthanc"); |
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
331 |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
332 int status = 0; |
0 | 333 try |
334 { | |
112 | 335 bool isInitialized = false; |
26 | 336 if (argc >= 2) |
337 { | |
112 | 338 for (int i = 1; i < argc; i++) |
339 { | |
340 // Use the first argument that does not start with a "-" as | |
341 // the configuration file | |
342 if (argv[i][0] != '-') | |
343 { | |
344 OrthancInitialize(argv[i]); | |
345 isInitialized = true; | |
346 } | |
347 } | |
26 | 348 } |
112 | 349 |
350 if (!isInitialized) | |
26 | 351 { |
62 | 352 OrthancInitialize(); |
26 | 353 } |
354 | |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
355 std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage"); |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
356 boost::filesystem::path storageDirectory = Configuration::InterpretStringParameterAsPath(storageDirectoryStr); |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
357 boost::filesystem::path indexDirectory = Configuration::InterpretStringParameterAsPath( |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
358 Configuration::GetGlobalStringParameter("IndexDirectory", storageDirectoryStr)); |
376
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
359 ServerContext context(storageDirectory, indexDirectory); |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
360 |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
361 LOG(WARNING) << "Storage directory: " << storageDirectory; |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
362 LOG(WARNING) << "Index directory: " << indexDirectory; |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
363 |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
364 context.SetCompressionEnabled(Configuration::GetGlobalBoolParameter("StorageCompression", false)); |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
365 context.SetStoreMD5ForAttachments(Configuration::GetGlobalBoolParameter("StoreMD5ForAttachments", true)); |
236 | 366 |
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
367 std::list<std::string> luaScripts; |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
368 Configuration::GetGlobalListOfStringsParameter(luaScripts, "LuaScripts"); |
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
369 for (std::list<std::string>::const_iterator |
657
5425bb6f1ea5
further cppcheck fixes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
370 it = luaScripts.begin(); it != luaScripts.end(); ++it) |
392
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
371 { |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
372 std::string path = Configuration::InterpretStringParameterAsPath(*it); |
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
373 LOG(WARNING) << "Installing the Lua scripts from: " << path; |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
374 std::string script; |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
375 Toolbox::ReadFile(script, path); |
996
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
376 |
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
377 ServerContext::LuaContextLocker locker(context); |
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
378 locker.GetLua().Execute(script); |
392
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
379 } |
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
380 |
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
381 |
270
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
382 try |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
383 { |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
384 context.GetIndex().SetMaximumPatientCount(Configuration::GetGlobalIntegerParameter("MaximumPatientCount", 0)); |
270
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
385 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
386 catch (...) |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
387 { |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
388 context.GetIndex().SetMaximumPatientCount(0); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
389 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
390 |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
391 try |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
392 { |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
393 uint64_t size = Configuration::GetGlobalIntegerParameter("MaximumStorageSize", 0); |
270
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
394 context.GetIndex().SetMaximumStorageSize(size * 1024 * 1024); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
395 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
396 catch (...) |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
397 { |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
398 context.GetIndex().SetMaximumStorageSize(0); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
399 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
400 |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
401 MyDicomServerFactory serverFactory(context); |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
402 |
0 | 403 { |
404 // DICOM server | |
405 DicomServer dicomServer; | |
618 | 406 OrthancApplicationEntityFilter dicomFilter; |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
407 dicomServer.SetCalledApplicationEntityTitleCheck(Configuration::GetGlobalBoolParameter("DicomCheckCalledAet", false)); |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
408 dicomServer.SetStoreRequestHandlerFactory(serverFactory); |
559 | 409 dicomServer.SetMoveRequestHandlerFactory(serverFactory); |
410 dicomServer.SetFindRequestHandlerFactory(serverFactory); | |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
411 dicomServer.SetPortNumber(Configuration::GetGlobalIntegerParameter("DicomPort", 4242)); |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
412 dicomServer.SetApplicationEntityTitle(Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC")); |
618 | 413 dicomServer.SetApplicationEntityFilter(dicomFilter); |
0 | 414 |
415 // HTTP server | |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
416 MyIncomingHttpRequestFilter httpFilter(context); |
0 | 417 MongooseServer httpServer; |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
418 httpServer.SetPortNumber(Configuration::GetGlobalIntegerParameter("HttpPort", 8042)); |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
419 httpServer.SetRemoteAccessAllowed(Configuration::GetGlobalBoolParameter("RemoteAccessAllowed", false)); |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
420 httpServer.SetIncomingHttpRequestFilter(httpFilter); |
0 | 421 |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
422 httpServer.SetAuthenticationEnabled(Configuration::GetGlobalBoolParameter("AuthenticationEnabled", false)); |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
423 Configuration::SetupRegisteredUsers(httpServer); |
25
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
424 |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
425 if (Configuration::GetGlobalBoolParameter("SslEnabled", false)) |
23 | 426 { |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
427 std::string certificate = Configuration::InterpretStringParameterAsPath( |
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
428 Configuration::GetGlobalStringParameter("SslCertificate", "certificate.pem")); |
23 | 429 httpServer.SetSslEnabled(true); |
430 httpServer.SetSslCertificate(certificate.c_str()); | |
431 } | |
432 else | |
433 { | |
434 httpServer.SetSslEnabled(false); | |
435 } | |
436 | |
62 | 437 #if ORTHANC_STANDALONE == 1 |
438 httpServer.RegisterHandler(new EmbeddedResourceHttpHandler("/app", EmbeddedResources::ORTHANC_EXPLORER)); | |
0 | 439 #else |
62 | 440 httpServer.RegisterHandler(new FilesystemHttpHandler("/app", ORTHANC_PATH "/OrthancExplorer")); |
0 | 441 #endif |
442 | |
229 | 443 httpServer.RegisterHandler(new OrthancRestApi(context)); |
0 | 444 |
685
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
445 // GO !!! Start the requested servers |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
446 if (Configuration::GetGlobalBoolParameter("HttpServerEnabled", true)) |
685
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
447 { |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
448 httpServer.Start(); |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
449 LOG(WARNING) << "HTTP server listening on port: " << httpServer.GetPortNumber(); |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
450 } |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
451 else |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
452 { |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
453 LOG(WARNING) << "The HTTP server is disabled"; |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
454 } |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
455 |
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
774
diff
changeset
|
456 if (Configuration::GetGlobalBoolParameter("DicomServerEnabled", true)) |
685
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
457 { |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
458 dicomServer.Start(); |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
459 LOG(WARNING) << "DICOM server listening on port: " << dicomServer.GetPortNumber(); |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
460 } |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
461 else |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
462 { |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
463 LOG(WARNING) << "The DICOM server is disabled"; |
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
464 } |
0 | 465 |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
466 LOG(WARNING) << "Orthanc has started"; |
0 | 467 Toolbox::ServerBarrier(); |
468 | |
685
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
684
diff
changeset
|
469 // We're done |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
470 LOG(WARNING) << "Orthanc is stopping"; |
0 | 471 } |
472 | |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
473 serverFactory.Done(); |
0 | 474 } |
62 | 475 catch (OrthancException& e) |
0 | 476 { |
108 | 477 LOG(ERROR) << "EXCEPTION [" << e.What() << "]"; |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
478 status = -1; |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
479 } |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
480 catch (...) |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
481 { |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
482 LOG(ERROR) << "NATIVE EXCEPTION"; |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
483 status = -1; |
0 | 484 } |
485 | |
62 | 486 OrthancFinalize(); |
27 | 487 |
690
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
488 LOG(WARNING) << "Orthanc has stopped"; |
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
489 |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
490 return status; |
0 | 491 } |