Fixed anonymous LDAP logins (issue-297)

James Moger

2013-08-16 7d22407fa842604be25ffdaafe88c6c6c8e9d475

Fixed anonymous LDAP logins (issue-297)

 releases.moxie

@@ -12,6 +12,7 @@
    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 @@
    - Doug Ayers
    - Ori Livneh
    - Florian Zschocke
    - Tito Nobre
    settings:
    - { name: 'web.activityDurationMaximum', defaultValue: 30 }
    - { name: 'realm.htpasswd.userFile', defaultValue: '${baseFolder}/htpasswd' }

 src/main/java/com/gitblit/LdapUserService.java

@@ -170,13 +170,24 @@
                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());