This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.6.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 2e8d2f3191182616fbb0f3cae6018683030bf3be Merge: 3fcc59a8a f314e78c7 Author: Mike Jumper <[email protected]> AuthorDate: Sun Nov 10 10:40:34 2024 -0800 GUACAMOLE-1239: Merge changes correcting and simplifying case sensitivity settings (single global setting). .../auth/header/ConfigurationService.java | 21 --- .../auth/header/HTTPHeaderGuacamoleProperties.java | 13 -- .../auth/header/user/AuthenticatedUser.java | 28 ---- .../auth/jdbc/HistoryTrackingConnection.java | 10 +- .../auth/jdbc/base/ActivityRecordMapper.java | 25 +-- .../guacamole/auth/jdbc/base/EntityMapper.java | 8 +- .../guacamole/auth/jdbc/base/EntityService.java | 28 +++- .../jdbc/base/ModeledDirectoryObjectMapper.java | 32 ++-- .../jdbc/base/ModeledDirectoryObjectService.java | 36 +++-- .../auth/jdbc/base/ObjectRelationMapper.java | 24 +-- .../guacamole/auth/jdbc/base/RelatedObjectSet.java | 24 +-- .../auth/jdbc/connection/ConnectionMapper.java | 8 +- .../auth/jdbc/connection/ConnectionService.java | 7 +- .../connectiongroup/ConnectionGroupMapper.java | 4 +- .../connectiongroup/ConnectionGroupService.java | 3 +- .../permission/ModeledObjectPermissionService.java | 15 +- .../jdbc/permission/ModeledPermissionService.java | 5 +- .../jdbc/permission/ObjectPermissionMapper.java | 17 ++- .../auth/jdbc/permission/PermissionMapper.java | 19 ++- .../auth/jdbc/permission/PermissionService.java | 21 ++- .../jdbc/permission/SystemPermissionMapper.java | 10 +- .../jdbc/permission/SystemPermissionService.java | 15 +- .../auth/jdbc/permission/UserPermissionMapper.java | 137 +---------------- .../jdbc/permission/UserPermissionService.java | 15 +- .../auth/jdbc/security/PasswordPolicyService.java | 2 +- .../tunnel/AbstractGuacamoleTunnelService.java | 21 ++- .../guacamole/auth/jdbc/user/ModeledUser.java | 10 +- .../auth/jdbc/user/ModeledUserContext.java | 2 +- .../auth/jdbc/user/PasswordRecordMapper.java | 9 +- .../guacamole/auth/jdbc/user/UserMapper.java | 9 +- .../guacamole/auth/jdbc/user/UserService.java | 29 ++-- .../auth/jdbc/usergroup/ModeledUserGroup.java | 30 ++++ .../auth/jdbc/usergroup/UserGroupMapper.java | 8 +- .../usergroup/UserGroupMemberUserGroupSet.java | 13 ++ .../jdbc/usergroup/UserGroupMemberUserSet.java | 14 +- .../usergroup/UserGroupParentUserGroupSet.java | 13 ++ .../auth/jdbc/usergroup/UserGroupService.java | 19 ++- .../mysql/MySQLAuthenticationProviderModule.java | 16 +- .../auth/mysql/conf/MySQLEnvironment.java | 11 -- .../auth/mysql/conf/MySQLGuacamoleProperties.java | 14 -- .../guacamole/auth/jdbc/base/EntityMapper.xml | 89 ++++++++--- .../auth/jdbc/connection/ConnectionMapper.xml | 22 +-- .../jdbc/connection/ConnectionRecordMapper.xml | 16 +- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 37 +++-- .../permission/ConnectionGroupPermissionMapper.xml | 21 +-- .../jdbc/permission/ConnectionPermissionMapper.xml | 21 +-- .../permission/SharingProfilePermissionMapper.xml | 21 +-- .../jdbc/permission/SystemPermissionMapper.xml | 14 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 100 ++++++++---- .../auth/jdbc/permission/UserPermissionMapper.xml | 33 ++-- .../jdbc/sharingprofile/SharingProfileMapper.xml | 22 +-- .../auth/jdbc/user/PasswordRecordMapper.xml | 2 +- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 44 +++--- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 47 +++++- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 11 +- .../auth/jdbc/usergroup/UserGroupMapper.xml | 154 +++++++++++++++---- .../usergroup/UserGroupMemberUserGroupMapper.xml | 53 +++++-- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 16 +- .../usergroup/UserGroupParentUserGroupMapper.xml | 53 +++++-- .../postgresql/conf/PostgreSQLEnvironment.java | 22 --- .../guacamole/auth/jdbc/base/EntityMapper.xml | 44 ++++-- .../auth/jdbc/connection/ConnectionMapper.xml | 32 ++-- .../jdbc/connection/ConnectionRecordMapper.xml | 16 +- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 37 +++-- .../permission/ConnectionGroupPermissionMapper.xml | 21 +-- .../jdbc/permission/ConnectionPermissionMapper.xml | 21 +-- .../permission/SharingProfilePermissionMapper.xml | 21 +-- .../jdbc/permission/SystemPermissionMapper.xml | 14 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 85 ++++++++--- .../auth/jdbc/permission/UserPermissionMapper.xml | 46 +++--- .../jdbc/sharingprofile/SharingProfileMapper.xml | 22 +-- .../auth/jdbc/user/PasswordRecordMapper.xml | 2 +- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 80 +++++----- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 54 +++++-- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 15 +- .../auth/jdbc/usergroup/UserGroupMapper.xml | 167 +++++++++++++++------ .../usergroup/UserGroupMemberUserGroupMapper.xml | 53 +++++-- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 13 +- .../usergroup/UserGroupParentUserGroupMapper.xml | 53 +++++-- .../SQLServerAuthenticationProviderModule.java | 5 +- .../auth/sqlserver/conf/SQLServerEnvironment.java | 14 -- .../conf/SQLServerGuacamoleProperties.java | 15 -- .../guacamole/auth/jdbc/base/EntityMapper.xml | 44 ++++-- .../auth/jdbc/connection/ConnectionMapper.xml | 32 ++-- .../jdbc/connection/ConnectionRecordMapper.xml | 16 +- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 37 +++-- .../permission/ConnectionGroupPermissionMapper.xml | 21 +-- .../jdbc/permission/ConnectionPermissionMapper.xml | 21 +-- .../permission/SharingProfilePermissionMapper.xml | 21 +-- .../jdbc/permission/SystemPermissionMapper.xml | 14 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 83 +++++++--- .../auth/jdbc/permission/UserPermissionMapper.xml | 45 +++--- .../jdbc/sharingprofile/SharingProfileMapper.xml | 22 +-- .../auth/jdbc/user/PasswordRecordMapper.xml | 2 +- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 65 ++++---- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 53 +++++-- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 15 +- .../auth/jdbc/usergroup/UserGroupMapper.xml | 155 +++++++++++++------ .../usergroup/UserGroupMemberUserGroupMapper.xml | 54 +++++-- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 17 ++- .../usergroup/UserGroupParentUserGroupMapper.xml | 53 +++++-- .../guacamole/auth/json/ConfigurationService.java | 34 ----- .../auth/json/user/AuthenticatedUser.java | 22 --- .../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 | 16 -- .../auth/ldap/conf/LDAPGuacamoleProperties.java | 12 -- .../auth/ldap/user/LDAPAuthenticatedUser.java | 24 --- .../auth/radius/conf/ConfigurationService.java | 21 --- .../radius/conf/RadiusGuacamoleProperties.java | 13 -- .../auth/radius/user/AuthenticatedUser.java | 15 +- .../auth/sso/user/SSOAuthenticatedUser.java | 32 ---- .../guacamole/auth/cas/conf/CASEnvironment.java | 14 -- .../auth/cas/conf/CASGuacamoleProperties.java | 13 -- .../auth/openid/conf/ConfigurationService.java | 13 -- .../auth/openid/conf/OpenIDEnvironment.java | 14 -- .../auth/saml/conf/ConfigurationService.java | 12 -- .../guacamole/auth/saml/conf/SAMLEnvironment.java | 14 -- .../auth/ssl/conf/ConfigurationService.java | 12 -- .../guacamole/auth/ssl/conf/SSLEnvironment.java | 13 -- .../environment/DelegatingEnvironment.java | 5 +- .../apache/guacamole/environment/Environment.java | 35 ++--- .../net/auth/AbstractAuthenticatedUser.java | 31 ++++ .../guacamole/net/auth/AbstractIdentifiable.java | 7 +- .../guacamole/net/auth/AbstractUserGroup.java | 30 ++++ .../apache/guacamole/net/auth/DelegatingUser.java | 5 + .../apache/guacamole/net/auth/Identifiable.java | 4 +- .../guacamole/properties/CaseSensitivity.java | 92 ++++++++++++ 130 files changed, 2164 insertions(+), 1527 deletions(-)
