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 2020/12/16 19:20:30 UTC
[guacamole-client] branch master updated (3624ffe -> 6fc7537)
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 3624ffe Merge 1.3.0 changes back to master.
add cec53a2 GUACAMOLE-1218: Copy guacamole-auth-json source tree from glyptodon/guacamole-auth-json at commit f7b2eaf6a65b7cd25fd73437360e36fe46e0bcb9.
add 90f1ce9 GUACAMOLE-1218: Refactor org.glyptodon.* packages to org.apache.*
add b4fd356 GUACAMOLE-1218: Re-license under Apache v2.0.
add 2a0f063 GUACAMOLE-1218: Remove old @author mentions from guacamole-auth-json JavaDoc.
add 2fefc99 GUACAMOLE-1218: Update to version 1.3.0 of guacamole-ext.
add f2ce412 GUACAMOLE-1218: Refactor guacamole-auth-json's ByteArrayProperty into guacamole-ext.
add 382e347 GUACAMOLE-1218: Refactor guacamole-auth-json's StringListProperty into guacamole-ext.
add e45c5ac GUACAMOLE-1218: Update to latest version of Spring Security.
add 6b054f2 GUACAMOLE-1218: Bundle and document the licenses of all guacamole-auth-json dependencies.
add 66d28b8 GUACAMOLE-1218: Replace use of "blacklist" with "denylist".
add 95c4bb4 GUACAMOLE-1218: Use diamond operator and multi-catch where possible.
add 27d791d GUACAMOLE-1218: Use static instances of Logger per established coding practices.
new 6fc7537 GUACAMOLE-1218: Merge "guacamole-auth-json" extension into Apache Guacamole.
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:
.../guacamole-auth-json}/.gitignore | 0
extensions/guacamole-auth-json/README.md | 189 ++++++++++
extensions/guacamole-auth-json/doc/encrypt-json.sh | 116 +++++++
.../pom.xml | 71 ++--
.../src/licenses/LICENSE | 45 ++-
.../guacamole-auth-json}/src/licenses/NOTICE | 0
.../src/licenses/bundled/aopalliance-1.0/LICENSE | 0
.../src/licenses/bundled/guice-3.0/COPYING | 0
.../bundled/jackson-1.9.2}/LICENSE-2.0.txt | 0
.../bundled/javax.inject-1}/LICENSE-2.0.txt | 0
.../bundled/spring-framework-5.2.9/LICENSE.txt} | 8 +-
.../bundled/spring-security-5.4.1/LICENSE.txt} | 10 +-
.../bundled/spring-security-5.4.1/notice.txt | 20 ++
.../src/main/assembly/dist.xml | 3 +-
.../auth/json/AuthenticationProviderService.java | 116 +++++++
.../guacamole/auth/json/ConfigurationService.java | 101 ++++++
.../apache/guacamole/auth/json/CryptoService.java | 199 +++++++++++
.../auth/json/JSONAuthenticationProvider.java} | 39 ++-
.../json/JSONAuthenticationProviderModule.java} | 28 +-
.../auth/json/RequestValidationService.java | 102 ++++++
.../auth/json/connection/ConnectionService.java | 303 ++++++++++++++++
.../auth/json}/user/AuthenticatedUser.java | 38 +-
.../guacamole/auth/json/user/UserContext.java | 87 +++++
.../apache/guacamole/auth/json/user/UserData.java | 386 +++++++++++++++++++++
.../auth/json/user/UserDataConnection.java | 187 ++++++++++
.../guacamole/auth/json/user/UserDataDenylist.java | 109 ++++++
.../guacamole/auth/json/user/UserDataService.java | 373 ++++++++++++++++++++
.../src/main/resources/guac-manifest.json | 16 +
.../src/main/resources/translations/en.json | 7 +
...acamoleProperty.java => ByteArrayProperty.java} | 18 +-
.../guacamole/properties}/StringListProperty.java | 3 +-
pom.xml | 1 +
32 files changed, 2457 insertions(+), 118 deletions(-)
copy {guacamole-ext => extensions/guacamole-auth-json}/.gitignore (100%)
create mode 100644 extensions/guacamole-auth-json/README.md
create mode 100755 extensions/guacamole-auth-json/doc/encrypt-json.sh
copy extensions/{guacamole-auth-header => guacamole-auth-json}/pom.xml (81%)
copy extensions/{guacamole-auth-radius => guacamole-auth-json}/src/licenses/LICENSE (94%)
copy {guacamole => extensions/guacamole-auth-json}/src/licenses/NOTICE (100%)
copy {guacamole => extensions/guacamole-auth-json}/src/licenses/bundled/aopalliance-1.0/LICENSE (100%)
copy {guacamole => extensions/guacamole-auth-json}/src/licenses/bundled/guice-3.0/COPYING (100%)
copy {guacamole/src/licenses/bundled/jettison-1.1 => extensions/guacamole-auth-json/src/licenses/bundled/jackson-1.9.2}/LICENSE-2.0.txt (100%)
copy {guacamole/src/licenses/bundled/jettison-1.1 => extensions/guacamole-auth-json/src/licenses/bundled/javax.inject-1}/LICENSE-2.0.txt (100%)
copy extensions/{guacamole-auth-cas/src/licenses/bundled/javax.inject-1/LICENSE-2.0.txt => guacamole-auth-json/src/licenses/bundled/spring-framework-5.2.9/LICENSE.txt} (98%)
copy extensions/{guacamole-auth-cas/src/licenses/bundled/javax.inject-1/LICENSE-2.0.txt => guacamole-auth-json/src/licenses/bundled/spring-security-5.4.1/LICENSE.txt} (98%)
create mode 100644 extensions/guacamole-auth-json/src/licenses/bundled/spring-security-5.4.1/notice.txt
copy extensions/{guacamole-auth-header => guacamole-auth-json}/src/main/assembly/dist.xml (94%)
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/AuthenticationProviderService.java
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ConfigurationService.java
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/CryptoService.java
copy extensions/{guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProvider.java => guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProvider.java} (62%)
copy extensions/{guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/TOTPAuthenticationProviderModule.java => guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProviderModule.java} (73%)
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/connection/ConnectionService.java
copy extensions/{guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius => guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json}/user/AuthenticatedUser.java (61%)
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserContext.java
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserData.java
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataConnection.java
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataDenylist.java
create mode 100644 extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataService.java
create mode 100644 extensions/guacamole-auth-json/src/main/resources/guac-manifest.json
create mode 100644 extensions/guacamole-auth-json/src/main/resources/translations/en.json
copy guacamole-ext/src/main/java/org/apache/guacamole/properties/{LongGuacamoleProperty.java => ByteArrayProperty.java} (63%)
copy {extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf => guacamole-ext/src/main/java/org/apache/guacamole/properties}/StringListProperty.java (95%)
[guacamole-client] 01/01: GUACAMOLE-1218: Merge
"guacamole-auth-json" extension into Apache Guacamole.
Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 6fc7537c089371ddf5235c2071c3e66811dc3e3c
Merge: 3624ffe 27d791d
Author: Virtually Nick <ne...@users.noreply.github.com>
AuthorDate: Wed Dec 16 14:20:19 2020 -0500
GUACAMOLE-1218: Merge "guacamole-auth-json" extension into Apache Guacamole.
extensions/guacamole-auth-json/.gitignore | 2 +
extensions/guacamole-auth-json/README.md | 189 ++++++++++
extensions/guacamole-auth-json/doc/encrypt-json.sh | 116 +++++++
extensions/guacamole-auth-json/pom.xml | 147 ++++++++
.../guacamole-auth-json/src/licenses/LICENSE | 265 ++++++++++++++
extensions/guacamole-auth-json/src/licenses/NOTICE | 5 +
.../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 +
.../src/licenses/bundled/guice-3.0/COPYING | 202 +++++++++++
.../licenses/bundled/jackson-1.9.2/LICENSE-2.0.txt | 202 +++++++++++
.../bundled/javax.inject-1/LICENSE-2.0.txt | 202 +++++++++++
.../bundled/spring-framework-5.2.9/LICENSE.txt | 202 +++++++++++
.../bundled/spring-security-5.4.1/LICENSE.txt | 202 +++++++++++
.../bundled/spring-security-5.4.1/notice.txt | 20 ++
.../guacamole-auth-json/src/main/assembly/dist.xml | 54 +++
.../auth/json/AuthenticationProviderService.java | 116 +++++++
.../guacamole/auth/json/ConfigurationService.java | 101 ++++++
.../apache/guacamole/auth/json/CryptoService.java | 199 +++++++++++
.../auth/json/JSONAuthenticationProvider.java | 82 +++++
.../json/JSONAuthenticationProviderModule.java | 85 +++++
.../auth/json/RequestValidationService.java | 102 ++++++
.../auth/json/connection/ConnectionService.java | 303 ++++++++++++++++
.../auth/json/user/AuthenticatedUser.java | 92 +++++
.../guacamole/auth/json/user/UserContext.java | 87 +++++
.../apache/guacamole/auth/json/user/UserData.java | 386 +++++++++++++++++++++
.../auth/json/user/UserDataConnection.java | 187 ++++++++++
.../guacamole/auth/json/user/UserDataDenylist.java | 109 ++++++
.../guacamole/auth/json/user/UserDataService.java | 373 ++++++++++++++++++++
.../src/main/resources/guac-manifest.json | 16 +
.../src/main/resources/translations/en.json | 7 +
.../guacamole/properties/ByteArrayProperty.java | 52 +++
.../guacamole/properties/StringListProperty.java | 61 ++++
pom.xml | 1 +
32 files changed, 4171 insertions(+)