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 2019/08/11 22:54:55 UTC
[guacamole-client] branch master updated (51b1c08 -> 6e439bf)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 51b1c08 Merge 1.1.0 changes back to master.
add 2f1fac5 GUACAMOLE-234: Convert LDAP extension to use Apache Directory LDAP API.
add 5777d93 GUACAMOLE-234: Clean up some LDAP implementation details.
add 41e3b8c GUACAMOLE-234: Clean up comments.
add 288fcb5 GUACAMOLE-234: Exclude slf4j from Apache Directory dependency.
add 4aa4489 GUACAMOLE-234: Correct LDAP filter mispelling.
add d0b1d76 GUACAMOLE-234: Clean up comments, instanceof, and type-casting.
add 7a17b7f GUACAMOLE-234: Add storage for the LDAP Bind DN to LDAPAuthenticateduser.
add 7825f57 GUACAMOLE-234: Correct counter for referral hops.
add 72dad76 GUACAMOLE-234: Adjust LDAP filters.
add d7d6220 GUACAMOLE-234: Change EqualityNode to PresenceNode for wildcard objectClass.
add fc5c4c5 GUACAMOLE-234: Don't close the connection after bind.
add 791cfea GUACAMOLE-234: Only try LDAP bind if user authenticated with LDAP.
add 742b0c4 GUACAMOLE-234: Correctly handle bind failure.
add ed568b1 GUACAMOLE-234: Tweaks to handling bind requests/failures.
add 5ea518a GUACAMOLE-234: Update to latest available Apache Directory API.
add 8c1a3f3 GUACAMOLE-234: Remove stray catch block.
add 8b172a9 GUACAMOLE-234: Fix style, debug messages, and logger output.
add 11f7a7f GUACAMOLE-234: Update license files.
add 2d86bbf GUACAMOLE-234: Merge migration from JLDAP to Apache Directory API.
new 6e439bf Merge 1.1.0 changes back to master.
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:
extensions/guacamole-auth-ldap/pom.xml | 14 +-
.../guacamole-auth-ldap/src/licenses/LICENSE | 23 +--
.../bundled/directory-api-2.0.0}/LICENSE-2.0.txt | 0
.../src/licenses/bundled/jldap-4.3/LICENSE | 47 -----
.../src/licenses/bundled/jldap-4.3/LICENSE-2.0.1 | 56 -----
.../auth/ldap/AuthenticationProviderService.java | 179 ++++++----------
.../auth/ldap/DereferenceAliasesMode.java | 74 -------
.../guacamole/auth/ldap/EscapingService.java | 120 -----------
.../ldap/LDAPAuthenticationProviderModule.java | 2 +-
.../guacamole/auth/ldap/LDAPConnectionService.java | 230 ++++++++++++++-------
.../guacamole/auth/ldap/ObjectQueryService.java | 156 +++++++-------
.../guacamole/auth/ldap/ReferralAuthHandler.java | 79 -------
.../auth/ldap/{ => conf}/ConfigurationService.java | 63 ++----
.../{ => conf}/DereferenceAliasesProperty.java | 21 +-
.../auth/ldap/{ => conf}/EncryptionMethod.java | 2 +-
.../ldap/{ => conf}/EncryptionMethodProperty.java | 2 +-
.../ldap/{ => conf}/LDAPGuacamoleProperties.java | 56 +++--
.../auth/ldap/conf/LdapDnGuacamoleProperty.java | 22 +-
.../ldap/conf/LdapFilterGuacamoleProperty.java | 23 ++-
.../auth/ldap/{ => conf}/StringListProperty.java | 2 +-
.../auth/ldap/connection/ConnectionService.java | 127 +++++++-----
.../auth/ldap/group/UserGroupService.java | 76 ++++---
.../auth/ldap/user/LDAPAuthenticatedUser.java | 25 ++-
.../guacamole/auth/ldap/user/LDAPUserContext.java | 13 +-
.../guacamole/auth/ldap/user/UserService.java | 65 +++---
25 files changed, 603 insertions(+), 874 deletions(-)
copy {guacamole/src/licenses/bundled/jettison-1.1 => extensions/guacamole-auth-ldap/src/licenses/bundled/directory-api-2.0.0}/LICENSE-2.0.txt (100%)
delete mode 100644 extensions/guacamole-auth-ldap/src/licenses/bundled/jldap-4.3/LICENSE
delete mode 100644 extensions/guacamole-auth-ldap/src/licenses/bundled/jldap-4.3/LICENSE-2.0.1
delete mode 100644 extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/DereferenceAliasesMode.java
delete mode 100644 extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/EscapingService.java
delete mode 100644 extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ReferralAuthHandler.java
rename extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/{ => conf}/ConfigurationService.java (87%)
rename extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/{ => conf}/DereferenceAliasesProperty.java (75%)
rename extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/{ => conf}/EncryptionMethod.java (97%)
rename extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/{ => conf}/EncryptionMethodProperty.java (97%)
rename extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/{ => conf}/LDAPGuacamoleProperties.java (82%)
copy guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java => extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LdapDnGuacamoleProperty.java (58%)
copy guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java => extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LdapFilterGuacamoleProperty.java (53%)
rename extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/{ => conf}/StringListProperty.java (98%)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
Posted by mj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 6e439bf827ef4ec60a5095d32b20fb90e47d262d
Merge: 51b1c08 2d86bbf
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Sun Aug 11 15:54:36 2019 -0700
Merge 1.1.0 changes back to master.
extensions/guacamole-auth-ldap/pom.xml | 14 +-
.../guacamole-auth-ldap/src/licenses/LICENSE | 23 +--
.../directory-api-2.0.0/LICENSE-2.0.txt} | 51 -----
.../src/licenses/bundled/jldap-4.3/LICENSE | 47 -----
.../src/licenses/bundled/jldap-4.3/LICENSE-2.0.1 | 56 -----
.../auth/ldap/AuthenticationProviderService.java | 179 ++++++----------
.../auth/ldap/DereferenceAliasesMode.java | 74 -------
.../guacamole/auth/ldap/EscapingService.java | 120 -----------
.../ldap/LDAPAuthenticationProviderModule.java | 2 +-
.../guacamole/auth/ldap/LDAPConnectionService.java | 230 ++++++++++++++-------
.../guacamole/auth/ldap/ObjectQueryService.java | 156 +++++++-------
.../guacamole/auth/ldap/ReferralAuthHandler.java | 79 -------
.../auth/ldap/{ => conf}/ConfigurationService.java | 63 ++----
.../{ => conf}/DereferenceAliasesProperty.java | 21 +-
.../auth/ldap/{ => conf}/EncryptionMethod.java | 2 +-
.../ldap/{ => conf}/EncryptionMethodProperty.java | 2 +-
.../ldap/{ => conf}/LDAPGuacamoleProperties.java | 56 +++--
.../LdapDnGuacamoleProperty.java} | 38 ++--
.../LdapFilterGuacamoleProperty.java} | 39 ++--
.../auth/ldap/{ => conf}/StringListProperty.java | 2 +-
.../auth/ldap/connection/ConnectionService.java | 127 +++++++-----
.../auth/ldap/group/UserGroupService.java | 76 ++++---
.../auth/ldap/user/LDAPAuthenticatedUser.java | 25 ++-
.../guacamole/auth/ldap/user/LDAPUserContext.java | 13 +-
.../guacamole/auth/ldap/user/UserService.java | 65 +++---
25 files changed, 607 insertions(+), 953 deletions(-)