diff options
| author | James Moger <james.moger@gitblit.com> | 2013-08-16 08:57:05 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-08-16 08:57:05 -0400 |
| commit | 7d22407fa842604be25ffdaafe88c6c6c8e9d475 (patch) | |
| tree | 3ac2fa45b6859a0af15d10ab4c75ed3c513d7715 /src/main/java/com/gitblit | |
| parent | a0c34e37fe8e456a21c7a57e9d45e637ab40cce8 (diff) | |
| download | gitblit-7d22407fa842604be25ffdaafe88c6c6c8e9d475.tar.gz gitblit-7d22407fa842604be25ffdaafe88c6c6c8e9d475.zip | |
Fixed anonymous LDAP logins (issue-297)
Diffstat (limited to 'src/main/java/com/gitblit')
| -rw-r--r-- | src/main/java/com/gitblit/LdapUserService.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/LdapUserService.java b/src/main/java/com/gitblit/LdapUserService.java index 39d564dd..b65f9bb7 100644 --- a/src/main/java/com/gitblit/LdapUserService.java +++ b/src/main/java/com/gitblit/LdapUserService.java @@ -170,13 +170,24 @@ public class LdapUserService extends GitblitUserService { if (ldapPort == -1) // Default Port
ldapPort = 636;
- SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());
- return new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);
+ LDAPConnection conn;
+ SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());
+ if (StringUtils.isEmpty(bindUserName) && StringUtils.isEmpty(bindPassword)) {
+ conn = new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort);
+ } else {
+ conn = new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);
+ }
+ return conn;
} else {
if (ldapPort == -1) // Default Port
ldapPort = 389;
-
- LDAPConnection conn = new LDAPConnection(ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);
+
+ LDAPConnection conn;
+ if (StringUtils.isEmpty(bindUserName) && StringUtils.isEmpty(bindPassword)) {
+ conn = new LDAPConnection(ldapUrl.getHost(), ldapPort);
+ } else {
+ conn = new LDAPConnection(ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);
+ }
if (ldapUrl.getScheme().equalsIgnoreCase("ldap+tls")) {
SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());
|