This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 13fd64d8710778f919df00512b88ae82952ba86e Merge: 4684cb603 a6719b109 Author: Virtually Nick <[email protected]> AuthorDate: Fri Dec 12 20:38:34 2025 -0500 Merge main branch changes to next. .../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 | 41 ++ .../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 +- .../guacamole/log/ReconfigurableLoggerFactory.java | 46 +++ .../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, 1320 insertions(+), 288 deletions(-)
