This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit f312b6916a28c076d2452c2c463bfbb50fdbd0ab Merge: 66e0e8bd8 2bf93c130 Author: Michael Jumper <[email protected]> AuthorDate: Wed Oct 2 09:28:15 2024 -0700 Merge changes from main branch back to next. .../auth/header/ConfigurationService.java | 21 ++++ .../auth/header/HTTPHeaderGuacamoleProperties.java | 16 ++- .../auth/header/user/AuthenticatedUser.java | 28 +++++ .../auth/jdbc/HistoryTrackingConnection.java | 10 +- .../auth/jdbc/base/ActivityRecordMapper.java | 21 +++- .../auth/jdbc/connection/ConnectionService.java | 23 ++-- .../auth/jdbc/permission/UserPermissionMapper.java | 137 ++++++++++++++++++++- .../auth/jdbc/security/PasswordPolicyService.java | 9 +- .../tunnel/AbstractGuacamoleTunnelService.java | 11 +- .../auth/jdbc/user/ModeledAuthenticatedUser.java | 5 + .../guacamole/auth/jdbc/user/ModeledUser.java | 21 ++++ .../auth/jdbc/user/ModeledUserContext.java | 8 +- .../auth/jdbc/user/PasswordRecordMapper.java | 7 +- .../guacamole/auth/jdbc/user/UserMapper.java | 75 ++++++++++- .../guacamole/auth/jdbc/user/UserService.java | 36 +++++- .../jdbc/usergroup/UserGroupMemberUserMapper.java | 59 ++++++++- .../auth/mysql/conf/MySQLEnvironment.java | 25 +++- .../auth/mysql/conf/MySQLGuacamoleProperties.java | 14 +++ .../jdbc/connection/ConnectionRecordMapper.xml | 28 ++++- .../auth/jdbc/permission/UserPermissionMapper.xml | 66 ++++++++-- .../auth/jdbc/user/PasswordRecordMapper.xml | 9 +- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 111 +++++++++++++++-- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 46 ++++++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 39 +++++- .../postgresql/conf/PostgreSQLEnvironment.java | 15 +++ .../conf/PostgreSQLGuacamoleProperties.java | 12 ++ .../jdbc/connection/ConnectionRecordMapper.xml | 28 ++++- .../auth/jdbc/permission/UserPermissionMapper.xml | 69 ++++++++--- .../auth/jdbc/user/PasswordRecordMapper.xml | 9 +- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 114 ++++++++++++++--- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 46 ++++++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 51 ++++++-- .../auth/sqlserver/conf/SQLServerEnvironment.java | 23 ++++ .../conf/SQLServerGuacamoleProperties.java | 15 +++ .../jdbc/connection/ConnectionRecordMapper.xml | 28 ++++- .../auth/jdbc/permission/UserPermissionMapper.xml | 51 ++++++-- .../auth/jdbc/user/PasswordRecordMapper.xml | 9 +- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 113 ++++++++++++++--- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 48 +++++++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 51 ++++++-- .../guacamole/auth/json/ConfigurationService.java | 34 +++++ .../auth/json/user/AuthenticatedUser.java | 29 +++++ .../auth/ldap/ConnectedLDAPConfiguration.java | 5 + .../auth/ldap/conf/DefaultLDAPConfiguration.java | 13 ++ .../ldap/conf/EnvironmentLDAPConfiguration.java | 14 +++ .../auth/ldap/conf/JacksonLDAPConfiguration.java | 13 ++ .../auth/ldap/conf/LDAPConfiguration.java | 17 ++- .../auth/ldap/conf/LDAPGuacamoleProperties.java | 12 ++ .../auth/ldap/user/LDAPAuthenticatedUser.java | 25 ++++ .../auth/radius/conf/ConfigurationService.java | 21 ++++ .../radius/conf/RadiusGuacamoleProperties.java | 12 ++ .../auth/radius/user/AuthenticatedUser.java | 26 ++++ .../auth/sso/user/SSOAuthenticatedUser.java | 32 +++++ .../auth/cas/CASAuthenticationProviderModule.java | 10 ++ .../guacamole/auth/cas/conf/CASEnvironment.java | 53 ++++++++ .../auth/cas/conf/CASGuacamoleProperties.java | 13 ++ .../openid/OpenIDAuthenticationProviderModule.java | 9 ++ .../auth/openid/conf/ConfigurationService.java | 15 ++- .../auth/openid/conf/OpenIDEnvironment.java | 53 ++++++++ .../saml/SAMLAuthenticationProviderModule.java | 9 ++ .../auth/saml/conf/ConfigurationService.java | 12 ++ .../guacamole/auth/saml/conf/SAMLEnvironment.java | 53 ++++++++ .../auth/ssl/SSLAuthenticationProviderModule.java | 9 ++ .../auth/ssl/conf/ConfigurationService.java | 13 ++ .../guacamole/auth/ssl/conf/SSLEnvironment.java | 53 ++++++++ .../environment/DelegatingEnvironment.java | 5 + .../apache/guacamole/environment/Environment.java | 30 +++++ .../guacamole/net/auth/AbstractIdentifiable.java | 24 +++- .../apache/guacamole/net/auth/AbstractUser.java | 8 ++ .../apache/guacamole/net/auth/Identifiable.java | 13 ++ 70 files changed, 1976 insertions(+), 166 deletions(-)
