You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2026/06/25 13:02:57 UTC

(guacamole-client) branch patch updated (b137ed006 -> 3b9f73b3d)

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a change to branch patch
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git


 discard b137ed006 Merge 1.6.1 changes to patch branch.
    omit 982645944 GUACAMOLE-2250: Merge add an option to create groups on connection import. (#1197)
    omit 4bb85fa41 GUACAMOLE-2250: Add an option to create groups on connection import.
    omit 27922fe19 GUACAMOLE-2275: Merge automatically release virtual keyboard SHIFT keys after character input.
    omit d0b362e2e Merge patch branch changes to main.
    omit 3aaf3c45b Merge changes from patch branch back to main.
    omit 5f810ba76 GUACAMOLE-2275: Automatically release virtual keyboard SHIFT keys after character input.
    omit 35116e65e GUACAMOLE-1969: Merge clamp negative timestamps in ClipboardEventInterpreter.
    omit 51fe4339a GUACAMOLE-1969: Clamp negative timestamps in ClipboardEventInterpreter.
    omit f38302a18 GUACAMOLE-1969: Merge display clipboard history within recordings.
    omit 83c55f096 GUACAMOLE-1969: Display clipboard history within recordings.
    omit 3ba340beb Merge patch branch changes to main.
    omit 7097d1e4b Merge patch branch changes to main.
    omit ab2cbb2cf Merge patch branch changes to main.
    omit 4ea7ef10a Merge changes from patch branch back to main.
    omit 28d6f4e62 Merge patch branch changes to main.
    omit 3d87ae543 Merge changes from patch branch back to main.
    omit 9185ae69f Merge patch branch changes to main.
    omit 4245fbb7e Merge changes from patch branch back to main.
    omit d051f8c5e Merge changes from patch branch back to main.
    omit b5fdb0afa GUACAMOLE-2002: Merge combination of duplicated clipboard sections in Kubernetes parameter definitions.
    omit 1905730c0 GUACAMOLE-2002: Deduplicate Kubernetes clipboard configuration section.
    omit efb930c24 Merge changes from patch branch back to main.
    omit ff84680db Merge patch branch changes to main.
    omit 27c47d6f1 Merge patch branch changes to main.
    omit 5c4a62bbb Merge changes from patch branch back to main.
    omit 90a938c8d Merge patch branch changes to main.
    omit cb0281e83 GUACAMOLE-2206: Merge ability to apply login restrictions to admin users.
    omit 693f05f4e GUACAMOLE-1266: Merge implement SAML Single Logout
    omit c36ace657 GUACAMOLE-1266 Alphabetical reorder fix of import, and js block
    omit 8ec4d816c GUACAMOLE-1266 Remove local js testing lines in pom
    omit 764311f3d GUACAMOLE-2206: Implement ability to apply login restrictions to admin users.
    omit a8a70f25d Merge patch branch changes to main.
    omit 7c237334e GUACAMOLE-1266 SAML Single Logout
    omit dd3a0fb96 GUACAMOLE-519: Merge Single Logout for OpenID Extension
    omit c00c18ea7 Merge changes from patch branch back to main.
    omit 476385684 GUACAMOLE-519: MR code review change to simplify getPostLogoutRedirect
    omit 89edf02b3 Merge changes from patch branch back to main.
    omit b5838b96b GUACAMOLE-519: revert pom.xml change
    omit 903fdebf9 GUACAMOLE-519: fix api endpoint forwarding to use logout address
    omit 12bcea5c6 GUACAMOLE-519: Javascript fix in module to forward to openid logout endpoint
    omit d3d1a980d GUACAMOLE-519: Implement Single Logout on OpenID Extension
    omit 27ac2d416 Merge changes from patch branch back to main.
    omit f7a9d87cb Merge patch branch changes to main.
    omit 8df2d3d8a Merge patch branch changes to main.
    omit a6719b109 Merge patch branch changes to main.
    omit df4e45f1b Merge patch branch changes to main and fix conflicts.
    omit 7451a9c2c Merge patch branch changes to main.
    omit 93f981701 Merge patch branch changes to main.
    omit d5593607c Merge patch branch changes to main.
    omit 07bbc36d6 GUACAMOLE-1292: Merge prompt user to confirm closing guacamole if at least one client is active.
    omit ecde73d05 GUACAMOLE-1292: Prompt user to confirm closing guacamole if at least one client is active.
    omit a438b8f23 GUACAMOLE-954: Merge correction to declaration of nested group OID string (should be static).
    omit 299015539 GUACAMOLE-954: OID string for nested group search should be static.
    omit 74e3b3444 GUACAMOLE-954: Merge add LDAP support for nested user groups
    omit 214835825 GUACAMOLE-954: Add LDAP support for nested user groups
    omit 253dad3aa GUACAMOLE-2120: Merge support for requesting VT100-style codes for function/keypad keys.
    omit 8e210633c GUACAMOLE-2120: Support VT100 escape codes sent for function keys and keypad.
    omit 0336e2c7e Merge patch branch changes to main.
    omit db37ac3c8 Merge changes from patch branch back to main.
    omit 4a7ee78b1 Merge changes from patch branch back to main.
    omit ed54b5b12 Merge patch branch changes to main.
    omit 99dbe07e9 Merge patch branch changes to main.
    omit 812641a8a Merge patch branch changes to main.
    omit 2090e99a0 Merge changes from patch branch back to main.
    omit 457e3a583 Merge changes from patch branch back to main.
    omit 63c9aef81 Merge changes from patch branch back to main.
    omit 98ed7395f Merge patch branch changes to main.
    omit 82762fade Merge patch branch changes to main.
    omit 4dd4209c2 Merge patch branch changes to main
    omit 511ef7c6b Merge changes from patch branch back to main.
    omit b72e2390c Merge patch branch changes to main.
    omit 145dcfb79 GUACAMOLE-2055: Merge Turkish translation and keyboard layout.
    omit 7ac069de2 Merge patch branch changes to main.
    omit 02058e7fc Merge patch branch changes to main.
    omit 60ddc612e Merge patch branch changes to main.
    omit 49effea02 Merge patch branch changes to main.
    omit bd0a34293 GUACAMOLE-2055: Sort by key names in tr.json for auth duo extension and removal of one empty string
    omit f9e265339 GUACAMOLE-2055: Add Turkish translation and keyboard layout.
    omit 892dc9840 Merge patch branch changes to main.
    omit 73c149774 Merge patch branch changes to main.
    omit f6d4ed801 Merge patch branch changes to main.
    omit 3124b4493 Merge patch branch changes to main.
    omit 7d728aa23 Merge patch branch changes to main.
    omit 78e0436dc Merge changes from patch branch back to main.
    omit 936645bad GUACAMOLE-2002: Merge support for configuring clipboard size limits.
    omit caa6d3b52 Merge changes from patch branch back to main.
    omit 61d0cf00b Merge patch branch changes to main.
    omit fd138fba1 Merge changes from patch branch back to main.
    omit 4e5b78cbf Merge patch branch changes to main.
    omit 21cc3a64c Merge changes from patch branch back to main.
    omit 77ad786bf Merge changes from patch branch back to main.
    omit cea71eb72 Merge changes from patch branch back to main.
    omit 36dedc935 Merge changes from patch branch back to main.
    omit f3d92c437 Merge changes from patch branch back to main.
    omit c276c49fb Merge patch branch changes to main.
    omit 89a027b9d Merge changes from patch branch back to main.
    omit 56440deab Merge patch branch changes to main.
    omit fff0015f9 Merge changes from patch branch back to main.
    omit 65954c210 Merge patch branch changes to main.
    omit 4c4025690 Merge changes from patch branch back to main.
    omit 7de08098a GUACAMOLE-2002: Allow connection clipboard limits to be configured.
    omit 0995eb8eb Merge patch branch changes to main.
    omit 607e6118f Merge patch branch changes to main.
    omit 494c4ce05 Merge changes from patch branch back to main.
    omit b5c9a08e5 GUACAMOLE-1974: Merge changes to allow deferring received pipe streams for later consumption by name-specific handlers.
    omit 2770ef3a3 GUACAMOLE-1974: Allow deferring received pipe streams for later consumption by name-specific handlers.
    omit 397467a34 GUACAMOLE-1701: Merge new configurable connection date and time restrictions.
    omit 55d1b0d7c GUACAMOLE-1976: Merge new OPTIONAL token modifier.
    omit 8d1bf0393 GUACAMOLE-1976: Add OPTIONAL token modifier.
    omit 32eaffce6 GUACAMOLE-1701: Implement connection date and time before and after restrictions.
    omit bbede31ad GUACAMOLE-1989: Merge the ability to open guacamole as an independent application.
    omit 56fb1dd59 GUACAMOLE-1989: Add the ability to open guacamole as an independent application.
    omit d558a44c8 Merge changes from patch branch back to main.
    omit 3839f9c2c Merge changes from patch branch back to main.
    omit 2bf93c130 Merge changes from patch branch back to main.
    omit 9320cdb48 Merge changes from patch branch back to main.
    omit 40620e445 Merge patch branch changes to main.
    omit 38dd5a41d Merge patch branch changes to main.
    omit ea43caa7d Merge patch branch changes to main
    omit f95a218cc Merge changes from patch branch back to main.
    omit bef7e30ba Merge changes from patch branch back to main.
    omit 468c05070 Merge changes from patch branch back to main.
    omit d3b784dfa Merge changes from patch branch back to main.
    omit ad3a007e9 Merge patch branch changes to main.
    omit 30716c696 GUACAMOLE-1979: Merge allow setting required properties for connecting to MySQL 8.4 and later.
    omit 7a66ec9a7 GUACAMOLE-1979: Allow setting required properties for connecting to MySQL 8.4 and later.
    omit 3310272b7 Merge patch branch changes to main.
    omit fff7ba412 Merge changes from patch branch back to main.

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/patch (3b9f73b3d)
            \
             O -- O -- O   (b137ed006)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../mysql/MySQLAuthenticationProviderModule.java   |  18 +-
 .../auth/mysql/conf/MySQLEnvironment.java          |  31 --
 .../auth/mysql/conf/MySQLGuacamoleProperties.java  |  25 +-
 .../auth/ldap/ConnectedLDAPConfiguration.java      |   5 -
 .../auth/ldap/conf/DefaultLDAPConfiguration.java   |   5 -
 .../ldap/conf/EnvironmentLDAPConfiguration.java    |   8 -
 .../auth/ldap/conf/JacksonLDAPConfiguration.java   |  12 -
 .../auth/ldap/conf/LDAPConfiguration.java          |  12 -
 .../auth/ldap/conf/LDAPGuacamoleProperties.java    |  11 -
 .../auth/ldap/group/UserGroupService.java          |  35 +--
 .../guacamole/auth/restrict/Restrictable.java      |  59 ----
 .../RestrictionAuthenticationProvider.java         |  66 +----
 .../RestrictionAuthenticationProviderModule.java   |  76 -----
 .../restrict/RestrictionVerificationService.java   | 119 ++------
 .../auth/restrict/conf/ConfigurationService.java   |  58 ----
 .../auth/restrict/conf/RestrictionProperties.java  |  41 ---
 .../restrict/connection/RestrictedConnection.java  |  44 ++-
 .../connectiongroup/RestrictedConnectionGroup.java |  44 ++-
 .../restrict/form/DateTimeRestrictionField.java    | 100 -------
 .../restrict/usergroup/RestrictedUserGroup.java    |  44 ++-
 .../src/main/resources/config/restrictConfig.js    |   7 -
 .../dateTimeRestrictionFieldController.js          |  89 ------
 .../templates/dateTimeRestrictionField.html        |  12 -
 .../src/main/resources/translations/en.json        |   6 -
 .../auth/sso/SSOAuthenticationProviderService.java |  24 +-
 .../org/apache/guacamole/auth/sso/SSOResource.java |  31 --
 .../auth/openid/AuthenticationProviderService.java |  26 +-
 .../auth/openid/conf/ConfigurationService.java     |  59 +---
 .../src/main/resources/openidModule.js             |  40 ---
 .../modules/guacamole-auth-sso-saml/pom.xml        |  46 ---
 .../auth/saml/AuthenticationProviderService.java   |  26 +-
 .../auth/saml/conf/ConfigurationService.java       |  55 ----
 .../src/main/resource-templates/guac-manifest.json |   4 -
 .../src/main/resources/samlModule.js               |  40 ---
 .../src/main/resources/translations/tr.json        |   1 -
 .../webapp/modules/ClipboardEventInterpreter.js    | 195 ------------
 .../src/main/webapp/modules/OnScreenKeyboard.js    | 158 +---------
 .../src/main/webapp/modules/SessionRecording.js    |  54 +---
 .../org/apache/guacamole/token/TokenFilter.java    |  21 +-
 .../org/apache/guacamole/protocols/kubernetes.json |  15 -
 .../org/apache/guacamole/protocols/rdp.json        |  10 -
 .../org/apache/guacamole/protocols/ssh.json        |  15 -
 .../org/apache/guacamole/protocols/telnet.json     |  15 -
 .../org/apache/guacamole/protocols/vnc.json        |  10 -
 .../src/app/client/services/guacClientManager.js   |  19 --
 .../frontend/src/app/client/types/ManagedClient.js | 140 +--------
 .../controllers/importConnectionsController.js     | 327 ++++-----------------
 .../import/directives/connectionImportErrors.js    | 120 +++-----
 .../app/import/services/connectionParseService.js  |  85 ++++--
 .../src/app/import/templates/connectionImport.html |  10 +-
 .../src/app/import/types/ConnectionImportConfig.js |   8 -
 .../frontend/src/app/import/types/ParseResult.js   |  43 ++-
 .../frontend/src/app/player/directives/player.js   |  36 +--
 .../app/player/services/keyEventDisplayService.js  | 212 ++++++-------
 .../src/main/frontend/src/images/logo-192.png      | Bin 11107 -> 0 bytes
 .../src/main/frontend/src/images/logo-512.png      | Bin 29134 -> 0 bytes
 .../src/main/frontend/src/images/logo-vector.svg   |   1 -
 guacamole/src/main/frontend/src/index.html         |   1 -
 guacamole/src/main/frontend/src/manifest.json      |  24 --
 .../src/main/frontend/src/translations/en.json     |  54 ----
 60 files changed, 455 insertions(+), 2397 deletions(-)
 delete mode 100644 extensions/guacamole-auth-restrict/src/main/java/org/apache/guacamole/auth/restrict/RestrictionAuthenticationProviderModule.java
 delete mode 100644 extensions/guacamole-auth-restrict/src/main/java/org/apache/guacamole/auth/restrict/conf/ConfigurationService.java
 delete mode 100644 extensions/guacamole-auth-restrict/src/main/java/org/apache/guacamole/auth/restrict/conf/RestrictionProperties.java
 delete mode 100644 extensions/guacamole-auth-restrict/src/main/java/org/apache/guacamole/auth/restrict/form/DateTimeRestrictionField.java
 delete mode 100644 extensions/guacamole-auth-restrict/src/main/resources/controllers/dateTimeRestrictionFieldController.js
 delete mode 100644 extensions/guacamole-auth-restrict/src/main/resources/templates/dateTimeRestrictionField.html
 delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/openidModule.js
 delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/samlModule.js
 delete mode 100644 guacamole-common-js/src/main/webapp/modules/ClipboardEventInterpreter.js
 delete mode 100644 guacamole/src/main/frontend/src/images/logo-192.png
 delete mode 100644 guacamole/src/main/frontend/src/images/logo-512.png
 delete mode 100644 guacamole/src/main/frontend/src/images/logo-vector.svg
 delete mode 100644 guacamole/src/main/frontend/src/manifest.json