This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from df4e45f1b Merge patch branch changes to main and fix conflicts.
add be53376f2 GUACAMOLE-2181: Include extension information and line
continuations in log messages.
add c92694c45 GUACAMOLE-2181: Include full exception when logging at debug
level.
add ea06e01dd GUACAMOLE-2181: Rely on automatic stack traces for
debug-level logs.
add cf3902ea8 GUACAMOLE-2181: Ensure ThreadLocals are cleaned up when
empty.
add 751ca979c GUACAMOLE-2181: Migrate to deriving log context from call
stack.
add 10558b268 GUACAMOLE-2181: Avoid NPE if servlet container is shut down
before extensions are loaded.
add 1457b186f GUACAMOLE-2181: Ensure our custom logging factory is used.
add b5748a121 GUACAMOLE-2181: Silence noisy WebSocket error when socket is
closed.
add 4098e7680 GUACAMOLE-2181: Warning regarding log init failures is
non-fatal, not bailing out.
add 42f450315 GUACAMOLE-2181: Pre-initialize logging such that format is
always consistent.
add 5ad5a46cf GUACAMOLE-2181: Clarify log messages for RADIUS challenge
parsing failures.
add f309d6de9 GUACAMOLE-2181: Disable WADL support (silence Jersey
warning).
add acf068491 GUACAMOLE-2181: Remove LDAP reference to non-existent
overlay language.
add 4aa841c4f GUACAMOLE-2181: Merge improve readability of logs.
add 27be6e9f3 Merge 1.6.1 changes to patch branch.
new a6719b109 Merge patch branch changes to main.
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:
.../auth/jdbc/connection/ModeledConnection.java | 12 +-
.../connectiongroup/ModeledConnectionGroup.java | 6 +-
.../tunnel/AbstractGuacamoleTunnelService.java | 5 +-
.../guacamole/auth/jdbc/user/ModeledUser.java | 12 +-
.../auth/jdbc/user/ModeledUserContext.java | 10 +-
.../auth/json/RequestValidationService.java | 13 +-
.../guacamole/auth/json/user/UserDataService.java | 12 +-
.../guacamole/auth/ldap/LDAPConnectionService.java | 7 +-
.../guacamole/auth/ldap/ObjectQueryService.java | 3 +-
.../auth/ldap/conf/ConfigurationService.java | 2 +-
.../auth/ldap/connection/ConnectionService.java | 15 +-
.../auth/ldap/group/UserGroupService.java | 7 +-
.../src/main/resources/guac-manifest.json | 1 -
.../auth/radius/AuthenticationProviderService.java | 19 +-
.../auth/radius/RadiusConnectionService.java | 9 +-
.../guacamole/host/HostRestrictionParser.java | 3 +-
.../auth/openid/token/TokenValidationService.java | 15 +-
.../saml/acs/AssertionConsumerServiceResource.java | 3 +-
.../auth/ssl/SSLClientAuthenticationResource.java | 12 +-
.../auth/totp/user/UserVerificationService.java | 10 +-
.../connection/HistoryConnectionRecord.java | 13 +-
.../vault/ksm/conf/KsmAttributeService.java | 13 +-
.../guacamole/vault/ksm/secret/KsmClient.java | 2 +-
.../apache/guacamole/vault/ksm/user/KsmUser.java | 13 +-
.../servlet/GuacamoleHTTPTunnelServlet.java | 5 +-
.../GuacamoleWebSocketTunnelEndpoint.java | 18 +-
.../guacamole/environment/DefaultEnvironment.java | 3 +-
.../guacamole/environment/LocalEnvironment.java | 10 +-
guacamole/.ratignore | 1 +
.../org/apache/guacamole/GuacamoleApplication.java | 5 +
.../GuacamoleServletContainerInitializer.java | 90 +++++
.../guacamole/GuacamoleServletContextListener.java | 29 +-
.../org/apache/guacamole/GuacamoleSession.java | 3 +-
.../SystemFileEnvironmentGuacamoleProperties.java | 4 +-
.../auth/file/FileAuthenticationProvider.java | 14 +-
.../guacamole/event/EventLoggingListener.java | 15 +-
.../extension/AuthenticationProviderFacade.java | 12 +-
.../guacamole/extension/DirectoryClassLoader.java | 7 +-
.../org/apache/guacamole/extension/Extension.java | 2 +-
.../guacamole/extension/ExtensionClassLoader.java | 20 +-
.../guacamole/extension/ExtensionModule.java | 14 +-
.../extension/LanguageResourceService.java | 9 +-
.../guacamole/extension/LoggerContextProvider.java | 22 +-
.../guacamole/extension/ProviderFactory.java | 23 +-
.../apache/guacamole/log/ContextAwareLogger.java | 429 +++++++++++++++++++++
.../guacamole/log/ContextAwareLoggerFactory.java | 355 +++++++++++++++++
.../log/GuacamoleLogbackServiceProvider.java | 86 +++++
.../java/org/apache/guacamole/log/LogLevel.java | 43 ++-
.../java/org/apache/guacamole/log/LogModule.java | 35 +-
.../log/ReconfigurableLoggerFactory.java} | 48 ++-
.../apache/guacamole/rest/RESTExceptionMapper.java | 16 +-
.../guacamole/rest/auth/AuthenticationService.java | 10 +-
.../guacamole/rest/auth/HashTokenSessionMap.java | 3 +-
.../guacamole/tunnel/InterceptedStreamMap.java | 3 +-
.../tunnel/OutputStreamInterceptingFilter.java | 3 +-
.../jetty8/GuacamoleWebSocketTunnelServlet.java | 9 +-
.../jetty9/GuacamoleWebSocketTunnelListener.java | 9 +-
.../tomcat/GuacamoleWebSocketTunnelServlet.java | 9 +-
.../javax.servlet.ServletContainerInitializer | 1 +
.../services/org.slf4j.spi.SLF4JServiceProvider | 1 +
guacamole/src/main/webapp/WEB-INF/web.xml | 8 +
61 files changed, 1268 insertions(+), 323 deletions(-)
create mode 100644
guacamole/src/main/java/org/apache/guacamole/GuacamoleServletContainerInitializer.java
copy
guacamole-ext/src/main/java/org/apache/guacamole/language/Translatable.java =>
guacamole/src/main/java/org/apache/guacamole/extension/LoggerContextProvider.java
(54%)
create mode 100644
guacamole/src/main/java/org/apache/guacamole/log/ContextAwareLogger.java
create mode 100644
guacamole/src/main/java/org/apache/guacamole/log/ContextAwareLoggerFactory.java
create mode 100644
guacamole/src/main/java/org/apache/guacamole/log/GuacamoleLogbackServiceProvider.java
copy guacamole/src/main/{frontend/src/app/client/directives/guacZoomCtrl.js =>
java/org/apache/guacamole/log/ReconfigurableLoggerFactory.java} (50%)
create mode 100644
guacamole/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
create mode 100644
guacamole/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
