You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2024/08/30 17:53:06 UTC
(guacamole-client) branch next updated (87e43ea93 -> 3f18bed2a)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from 87e43ea93 Merge changes from main branch back to next.
add 929f6c7f6 GUACAMOLE-1980: Update client versions to 1.6.0.
add 086802ad2 GUACAMOLE-1980: Merge client version update to 1.6.0.
add 8d1a9fdf4 GUACAMOLE-1855: Implement property for tracking list of IP Addresses.
add 9139bdef0 GUACAMOLE-1855: Implement bypass and enforcement options in the Duo 2FA module.
add 614cd550b GUACAMOLE-1855: Implement bypass and enforcement options in the TOTP module.
add 2ecad02fe GUACAMOLE-1855: Use common code for checking for IP in list.
add f6c2787dc GUACAMOLE-1855: Merge configuration options for bypassing MFA based on client address.
add afe1e86d9 GUACAMOLE-61: Add JDBC-specific tokens, including connection start date and time.
add 289cee82d GUACAMOLE-61: Merge additional JDBC-specific tokens, including start date and time.
add 7b7f76f80 GUACAMOLE-538: Add System audit permission.
add 24e7e05ad GUACAMOLE-538: Update JDBC extension to recognize AUDIT permissions.
add 04806f8d0 GUACAMOLE-538: Add web application support for AUDIT permission.
add 8f6d0c37c GUACAMOLE-538: Add newlines at the end of the schema files for easy concatenation.
add 2799df679 GUACAMOLE-538: Merge support for system-level "AUDIT" permission.
add 6fab0f503 GUACAMOLE-577: Add support for Proxy Configuration to Connections stored in LDAP.
add 5f8afbddc GUACAMOLE-577: Merge support for configuring the proxy parameters of connections in LDAP.
add 7d8a6686c GUACAMOLE-61: New JDBC tokens should follow the standard naming conventions.
add 29e4a00c6 GUACAMOLE-61: Merge improved naming convention for JDBC-specific tokens.
add 9da128967 GUACAMOLE-1006: Implement Collection support within GuacamoleProperty classes.
add 9bc615036 GUACAMOLE-1006: Convert LDAP extension to use new StringGuacamoleProperty Collection.
add 0301a1148 GUACAMOLE-1006: Merge support for reading any property value as a Collection.
add df1745faa Merge 1.6.0 changes back to patch.
add bef7e30ba Merge changes from patch branch back to main.
new 3f18bed2a Merge changes from main branch back to next.
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:
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} | 18 +-
.../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} | 12 +-
.../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} | 25 ++-
.../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, 1308 insertions(+), 317 deletions(-)
copy extensions/guacamole-auth-jdbc/modules/{guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.9.sql => guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-1.6.0.sql} (65%)
copy extensions/guacamole-auth-jdbc/modules/{guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.7.sql => guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-1.6.0.sql} (78%)
copy extensions/guacamole-auth-jdbc/modules/{guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.9.sql => guacamole-auth-jdbc-sqlserver/schema/upgrade/upgrade-pre-1.6.0.sql} (63%)
delete mode 100644 extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/StringListProperty.java
create mode 100644 guacamole-ext/src/main/java/org/apache/guacamole/properties/IPAddressListProperty.java
(guacamole-client) 01/01: Merge changes from main branch back to next.
Posted by mj...@apache.org.
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 <mj...@apache.org>
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(-)