This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 32b10ec4bd4696f25e43145771601ef620eb338b Merge: 3006988 a67211d Author: Virtually Nick <[email protected]> AuthorDate: Thu Feb 25 20:19:00 2021 -0500 GUACAMOLE-1298: Merge automatically limit HTTP request size. guacamole/pom.xml | 38 ++++-- .../org/apache/guacamole/GuacamoleApplication.java | 76 +++++++++++ .../guacamole/GuacamoleServletContextListener.java | 86 ++++++++++-- .../org/apache/guacamole/rest/APIException.java | 13 +- .../guacamole/rest/LimitedRequestInputStream.java | 152 +++++++++++++++++++++ .../main/java/org/apache/guacamole/rest/PATCH.java | 35 ----- .../apache/guacamole/rest/RESTExceptionMapper.java | 9 +- .../apache/guacamole/rest/RESTMethodMatcher.java | 128 ----------------- .../apache/guacamole/rest/RESTServiceModule.java | 37 ++--- .../apache/guacamole/rest/RequestSizeFilter.java | 108 +++++++++++++++ .../activeconnection/ActiveConnectionResource.java | 2 +- .../guacamole/rest/auth/AuthenticationService.java | 2 +- .../guacamole/rest/auth/DecorationService.java | 2 +- .../guacamole/rest/auth/TokenRESTService.java | 2 +- .../rest/connection/ConnectionResource.java | 2 +- .../rest/directory/DirectoryResource.java | 2 +- .../guacamole/rest/event/ListenerService.java | 2 +- .../rest/extension/ExtensionRESTService.java | 2 +- .../guacamole/rest/history/APISortPredicate.java | 5 +- .../rest/identifier/RelatedObjectSetResource.java | 2 +- .../rest/language/LanguageRESTService.java | 2 +- .../guacamole/rest/patch/PatchRESTService.java | 2 +- .../rest/permission/PermissionSetResource.java | 2 +- .../guacamole/rest/session/SessionRESTService.java | 2 +- .../guacamole/rest/session/SessionResource.java | 2 +- .../rest/session/UserContextResource.java | 2 +- .../guacamole/rest/tunnel/StreamResource.java | 2 + .../rest/tunnel/TunnelCollectionResource.java | 2 +- .../guacamole/rest/tunnel/TunnelResource.java | 2 +- .../guacamole/tunnel/TunnelRequestService.java | 4 +- .../http/RestrictedGuacamoleHTTPTunnelServlet.java | 5 +- .../RestrictedGuacamoleWebSocketTunnelServlet.java | 4 +- .../RestrictedGuacamoleWebSocketTunnelServlet.java | 4 +- .../RestrictedGuacamoleWebSocketTunnelServlet.java | 4 +- guacamole/src/main/webapp/WEB-INF/web.xml | 3 +- 35 files changed, 488 insertions(+), 259 deletions(-)
