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 66e0e8bd8df7c716b38a20bed59c86e6099b6df2 Merge: fccbb23a6 9320cdb48 Author: Michael Jumper <[email protected]> AuthorDate: Wed Oct 2 00:02:19 2024 -0700 Merge changes from main branch back to next. extensions/guacamole-auth-restrict/.gitignore | 3 + extensions/guacamole-auth-restrict/.ratignore | 0 .../pom.xml | 26 +- .../src/main/assembly/dist.xml | 53 ++ .../guacamole/auth/restrict/Restrictable.java | 67 +++ .../RestrictionAuthenticationProvider.java | 59 +++ .../restrict/RestrictionVerificationService.java | 538 +++++++++++++++++++++ ...TranslatableInvalidHostConnectionException.java | 73 +++ .../TranslatableInvalidHostLoginException.java | 72 +++ ...TranslatableInvalidTimeConnectionException.java | 73 +++ .../TranslatableInvalidTimeLoginException.java | 73 +++ .../restrict/connection/RestrictedConnection.java | 200 ++++++++ .../connectiongroup/RestrictedConnectionGroup.java | 202 ++++++++ .../auth/restrict/form/HostRestrictionField.java | 47 ++ .../auth/restrict/form/TimeRestrictionField.java | 47 ++ .../auth/restrict/user/RestrictedUser.java | 199 ++++++++ .../auth/restrict/user/RestrictedUserContext.java | 214 ++++++++ .../restrict/usergroup/RestrictedUserGroup.java | 160 ++++++ .../guacamole/calendar/DailyRestriction.java | 140 ++++++ .../apache/guacamole/calendar/RestrictionType.java | 109 +++++ .../guacamole/calendar/TimeRestrictionParser.java | 157 ++++++ .../guacamole/host/HostRestrictionParser.java | 77 +++ .../src/main/resources/config/restrictConfig.js | 40 ++ .../controllers/hostRestrictionFieldController.js | 170 +++++++ .../controllers/timeRestrictionFieldController.js | 317 ++++++++++++ .../src/main/resources/guac-manifest.json | 29 ++ .../src/main/resources/license.txt | 18 + .../src/main/resources/restrictModule.js | 29 ++ .../src/main/resources/styles/restrict.css | 36 ++ .../resources/templates/hostRestrictionField.html | 23 + .../resources/templates/timeRestrictionField.html | 38 ++ .../src/main/resources/translations/en.json | 67 +++ .../main/resources/types/HostRestrictionEntry.js | 53 ++ .../main/resources/types/TimeRestrictionEntry.js | 69 +++ extensions/guacamole-auth-totp/pom.xml | 2 +- extensions/pom.xml | 1 + .../build.d/000-build-and-install-guacamole.sh | 2 +- .../build.d/010-map-guacamole-extensions.sh | 3 +- guacamole-docker/build.d/020-download-drivers.sh | 2 +- .../entrypoint.d/700-configure-features.sh | 2 +- 40 files changed, 3466 insertions(+), 24 deletions(-)
