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 3f18bed2a33bf3c80f1d538905227d465ff81ed8 Merge: 87e43ea93 bef7e30ba Author: Michael Jumper <[email protected]> AuthorDate: Fri Aug 30 10:52:57 2024 -0700 Merge changes from main branch back to next. doc/guacamole-example/pom.xml | 6 +- doc/guacamole-playback-example/pom.xml | 4 +- extensions/guacamole-auth-ban/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-duo/pom.xml | 14 +- .../auth/duo/UserVerificationService.java | 45 ++++- .../auth/duo/conf/ConfigurationService.java | 76 +++++++ .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../auth/jdbc/connection/ConnectionService.java | 4 +- .../tunnel/AbstractGuacamoleTunnelService.java | 73 ++++++- .../guacamole/auth/jdbc/user/UserService.java | 4 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 8 +- .../modules/guacamole-auth-jdbc-mysql/pom.xml | 4 +- .../schema/001-create-schema.sql | 2 + .../schema/002-create-admin-user.sql | 1 + .../schema/upgrade/upgrade-pre-1.6.0.sql | 32 +++ .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-postgresql/pom.xml | 4 +- .../schema/001-create-schema.sql | 1 + .../schema/002-create-admin-user.sql | 1 + .../schema/upgrade/upgrade-pre-1.6.0.sql | 27 +++ .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 4 +- .../schema/001-create-schema.sql | 1 + .../schema/002-create-admin-user.sql | 1 + .../schema/upgrade/upgrade-pre-1.6.0.sql | 43 ++++ .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 6 +- extensions/guacamole-auth-json/pom.xml | 7 +- .../guacamole/auth/json/ConfigurationService.java | 6 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-ldap/pom.xml | 6 +- .../schema/guacConfigGroup.ldif | 27 ++- .../schema/guacConfigGroup.schema | 20 +- .../auth/ldap/AuthenticationProviderService.java | 2 +- .../auth/ldap/ConnectedLDAPConfiguration.java | 7 +- .../ldap/conf/EnvironmentLDAPConfiguration.java | 14 +- .../auth/ldap/conf/JacksonLDAPConfiguration.java | 7 +- .../auth/ldap/conf/LDAPConfiguration.java | 7 +- .../auth/ldap/conf/LDAPGuacamoleProperties.java | 12 +- .../auth/ldap/conf/StringListProperty.java | 62 ------ .../auth/ldap/connection/ConnectionService.java | 112 ++++++++++- .../guacamole/auth/ldap/user/UserService.java | 2 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-quickconnect/pom.xml | 6 +- .../quickconnect/conf/ConfigurationService.java | 15 +- .../auth/quickconnect/utility/QCParser.java | 7 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-radius/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-base/pom.xml | 2 +- .../modules/guacamole-auth-sso-cas/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-dist/pom.xml | 10 +- .../modules/guacamole-auth-sso-openid/pom.xml | 4 +- .../auth/openid/conf/ConfigurationService.java | 10 +- .../auth/openid/token/TokenValidationService.java | 3 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-saml/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-ssl/pom.xml | 4 +- .../auth/ssl/SSLClientAuthenticationResource.java | 3 +- .../auth/ssl/conf/ConfigurationService.java | 11 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-sso/pom.xml | 8 +- extensions/guacamole-auth-totp/pom.xml | 14 +- .../auth/totp/conf/ConfigurationService.java | 68 +++++++ .../auth/totp/user/UserVerificationService.java | 47 ++++- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-display-statistics/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- .../guacamole-history-recording-storage/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-vault-base/pom.xml | 2 +- .../modules/guacamole-vault-dist/pom.xml | 4 +- .../modules/guacamole-vault-ksm/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-vault/pom.xml | 6 +- extensions/pom.xml | 4 +- guacamole-common-js/pom.xml | 4 +- .../src/main/webapp/modules/Version.js | 2 +- guacamole-common/pom.xml | 4 +- guacamole-ext/pom.xml | 13 +- .../environment/DelegatingEnvironment.java | 25 +++ .../apache/guacamole/environment/Environment.java | 219 +++++++++++++++++++-- .../guacamole/environment/LocalEnvironment.java | 46 +++++ .../net/auth/permission/SystemPermission.java | 8 + .../net/auth/simple/SimpleConnection.java | 45 ++++- .../properties/FileGuacamoleProperty.java | 25 +++ .../guacamole/properties/GuacamoleProperty.java | 50 ++++- .../properties/IPAddressListProperty.java | 113 +++++++++++ .../properties/IntegerGuacamoleProperty.java | 24 +++ .../properties/LongGuacamoleProperty.java | 24 +++ .../properties/StringGuacamoleProperty.java | 17 ++ .../guacamole/properties/StringListProperty.java | 13 +- .../properties/TimeZoneGuacamoleProperty.java | 24 +++ .../guacamole/properties/URIGuacamoleProperty.java | 25 +++ guacamole/pom.xml | 8 +- .../manage/directives/systemPermissionEditor.js | 4 + .../src/app/navigation/services/userPageService.js | 7 +- .../frontend/src/app/rest/types/PermissionSet.js | 5 + .../src/main/frontend/src/translations/en.json | 2 + .../guacamole/extension/ExtensionModule.java | 3 +- pom.xml | 2 +- 107 files changed, 1379 insertions(+), 293 deletions(-)
