Fixed anonymous LDAP logins (issue-297)

diff --git a/releases.moxie b/releases.moxie
index 5400234aa5318f17af9767a72b1ab7cc718c1e7a..e28b83f81ab042197555203ddea53946b8b95755 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -12,6 +12,7 @@ r19: {
     fixes:
     - Fixed Gitblit Authority startup failures when using alternate user services (issue-280)
     - Manually redirect after branch deletion (issue 282)
+    - Fixed anonymous LDAP connections (issue-297)
     - Improved branch deletion-reflog interaction
     - Encode page url parameters as UTF-8
     - Encode filename for binary files on RawPage according to browser
@@ -28,6 +29,7 @@ r19: {
     - Doug Ayers
     - Ori Livneh
     - Florian Zschocke
+    - Tito Nobre
     settings:
     - { name: 'web.activityDurationMaximum', defaultValue: 30 }
     - { name: 'realm.htpasswd.userFile', defaultValue: '${baseFolder}/htpasswd' }

diff --git a/src/main/java/com/gitblit/LdapUserService.java b/src/main/java/com/gitblit/LdapUserService.java
index 39d564dd8fd1b6faf90dd6e14faa7f0aea103c88..b65f9bb71e3912907b8987cc6e2f90a8957c92dc 100644 (file)
--- 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\r
                                        ldapPort = 636;\r
                                \r
-                               SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager()); \r
-                               return new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);\r
+                               LDAPConnection conn;\r
+                               SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());\r
+                               if (StringUtils.isEmpty(bindUserName) && StringUtils.isEmpty(bindPassword)) {\r
+                                        conn = new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort);\r
+                               } else {\r
+                                        conn = new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);\r
+                               }\r
+                               return conn;\r
                        } else {\r
                                if (ldapPort == -1)     // Default Port\r
                                        ldapPort = 389;\r
-                               \r
-                               LDAPConnection conn = new LDAPConnection(ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);\r
+\r
+                               LDAPConnection conn;\r
+                               if (StringUtils.isEmpty(bindUserName) && StringUtils.isEmpty(bindPassword)) {\r
+                                       conn = new LDAPConnection(ldapUrl.getHost(), ldapPort); \r
+                               } else {\r
+                                       conn = new LDAPConnection(ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);     \r
+                               }\r
 \r
                                if (ldapUrl.getScheme().equalsIgnoreCase("ldap+tls")) {\r
                                        SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());\r