This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 3006988 GUACAMOLE-1299: Merge handle errors that occur while
automatically invalidating expired sessions.
add fbd0d3c GUACAMOLE-1298: Enforce default limit on request size.
add 172705f GUACAMOLE-1298: Replace com.guice.* annotations with
javax.inject.* where interchangeable.
add f21a7c6 GUACAMOLE-1298: Migrate to latest version of Guice and Jersey
2.x
add a67211d GUACAMOLE-1298: Do not enforce request size limits on file
uploads handled as streams.
new 32b10ec GUACAMOLE-1298: Merge automatically limit HTTP request size.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
create mode 100644
guacamole/src/main/java/org/apache/guacamole/GuacamoleApplication.java
create mode 100644
guacamole/src/main/java/org/apache/guacamole/rest/LimitedRequestInputStream.java
delete mode 100644 guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java
delete mode 100644
guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java
create mode 100644
guacamole/src/main/java/org/apache/guacamole/rest/RequestSizeFilter.java
