mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 13:17:41 +00:00
Remove whitespace errors at end of non-blank lines as well.
This commit is contained in:
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
* Allows users to be authenticated against an LDAP server. Each user may have
|
* Allows users to be authenticated against an LDAP server. Each user may have
|
||||||
* any number of authorized configurations. Authorized configurations may be
|
* any number of authorized configurations. Authorized configurations may be
|
||||||
* shared.
|
* shared.
|
||||||
*
|
*
|
||||||
* @author Michael Jumper
|
* @author Michael Jumper
|
||||||
*/
|
*/
|
||||||
public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider {
|
public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider {
|
||||||
@@ -174,16 +174,16 @@ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Construct user DN
|
// Construct user DN
|
||||||
String user_dn =
|
String user_dn =
|
||||||
escapeDN(username_attribute) + "=" + escapeDN(credentials.getUsername())
|
escapeDN(username_attribute) + "=" + escapeDN(credentials.getUsername())
|
||||||
+ "," + user_base_dn;
|
+ "," + user_base_dn;
|
||||||
|
|
||||||
// Bind as user
|
// Bind as user
|
||||||
try {
|
try {
|
||||||
ldapConnection.bind(
|
ldapConnection.bind(
|
||||||
LDAPConnection.LDAP_V3,
|
LDAPConnection.LDAP_V3,
|
||||||
user_dn,
|
user_dn,
|
||||||
credentials.getPassword().getBytes("UTF-8")
|
credentials.getPassword().getBytes("UTF-8")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
catch (UnsupportedEncodingException e) {
|
catch (UnsupportedEncodingException e) {
|
||||||
@@ -213,7 +213,7 @@ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider {
|
|||||||
// New empty configuration
|
// New empty configuration
|
||||||
GuacamoleConfiguration config = new GuacamoleConfiguration();
|
GuacamoleConfiguration config = new GuacamoleConfiguration();
|
||||||
|
|
||||||
// Get CN
|
// Get CN
|
||||||
LDAPAttribute cn = entry.getAttribute("cn");
|
LDAPAttribute cn = entry.getAttribute("cn");
|
||||||
if (cn == null)
|
if (cn == null)
|
||||||
throw new GuacamoleException("guacConfigGroup without cn");
|
throw new GuacamoleException("guacConfigGroup without cn");
|
||||||
|
@@ -44,7 +44,7 @@ import net.sourceforge.guacamole.properties.StringGuacamoleProperty;
|
|||||||
* Provides properties required for use of the LDAP authentication provider.
|
* Provides properties required for use of the LDAP authentication provider.
|
||||||
* These properties will be read from guacamole.properties when the LDAP
|
* These properties will be read from guacamole.properties when the LDAP
|
||||||
* authentication provider is used.
|
* authentication provider is used.
|
||||||
*
|
*
|
||||||
* @author Michael Jumper
|
* @author Michael Jumper
|
||||||
*/
|
*/
|
||||||
public class LDAPGuacamoleProperties {
|
public class LDAPGuacamoleProperties {
|
||||||
|
Reference in New Issue
Block a user