Merge pull request #414 from surevine/dwd/pr304

Add and document LDAP startTls option to setup

documentation/docs/ldap-guide.html

@@ -259,7 +259,9 @@ servers, some of which are detailed below:
             you
             enable SSL connections, the LDAP server port number most likely should be changed to
             636.</li>
-
+    <li>ldap.startTlsEnabled -- a value of "true" to enable StartTLS connections to your LDAP server. If
+            you enable StartTLS connections, the LDAP server port number most likely should be changed to
+            389.</li>
     <li>ldap.initialContextFactory -- the name of the class that should be used as an initial
         context
         factory. if this value is not specified, "com.sun.jndi.ldap.LdapCtxFactory" will be used

src/i18n/openfire_i18n_de.properties

@@ -1300,6 +1300,8 @@ setup.ldap.server.connection_pool=Use Connection Pool
 setup.ldap.server.connection_pool_help=Connection Pooling. Default is 'Yes'
 setup.ldap.server.ssl=Use SSL
 setup.ldap.server.ssl_help=Enable SSL connections to your LDAP server, default port is usually 636
+setup.ldap.server.starttls=Verwende StartTLS
+setup.ldap.server.starttls_help=Verwende StartTLS Verbindungen zu deinem LDAP server, der standard port ist normalerweise 389
 setup.ldap.server.debug=Enable Debug
 setup.ldap.server.debug_help=Write trace information about LDAP connections to System.out
 setup.ldap.server.referral=Follow Referrals

src/i18n/openfire_i18n_en.properties

@@ -2030,6 +2030,8 @@ setup.ldap.server.connection_pool=Use Connection Pool
 setup.ldap.server.connection_pool_help=Connection Pooling. Default is 'Yes'
 setup.ldap.server.ssl=Use SSL
 setup.ldap.server.ssl_help=Enable SSL connections to your LDAP server, default port is usually 636
+setup.ldap.server.starttls=Use StartTLS
+setup.ldap.server.starttls_help=Enable StartTLS connections to your LDAP server, default port is usually 389
 setup.ldap.server.debug=Enable Debug
 setup.ldap.server.debug_help=Write trace information about LDAP connections to System.out
 setup.ldap.server.referral=Follow Referrals

src/web/setup/ldap-server.jspf

@@ -14,6 +14,7 @@
     String adminPassword;
     boolean connectionPoolEnabled = true;
     boolean sslEnabled = false;
+    boolean startTlsEnabled = false;
     boolean debugEnabled = false;
     boolean referralsEnabled = false;
     boolean aliasReferralsEnabled = true;
@@ -47,6 +48,7 @@
         connectionPoolEnabled =
                 ParamUtils.getBooleanParameter(request, "connectionpool", connectionPoolEnabled);
         sslEnabled = ParamUtils.getBooleanParameter(request, "ssl", sslEnabled);
+        startTlsEnabled = ParamUtils.getBooleanParameter(request, "starttls", startTlsEnabled);
         debugEnabled = ParamUtils.getBooleanParameter(request, "debug", debugEnabled);
         referralsEnabled = ParamUtils.getBooleanParameter(request, "referrals", referralsEnabled);
         aliasReferralsEnabled = ParamUtils.getBooleanParameter(request, "aliasreferrals", aliasReferralsEnabled);
@@ -68,6 +70,7 @@
             settings.put("ldap.connectionPoolEnabled",
                     Boolean.toString(connectionPoolEnabled));
             settings.put("ldap.sslEnabled", Boolean.toString(sslEnabled));
+            settings.put("ldap.startTlsEnabled", Boolean.toString(startTlsEnabled));
             settings.put("ldap.debugEnabled", Boolean.toString(debugEnabled));
             settings.put("ldap.autoFollowReferrals", Boolean.toString(referralsEnabled));
             settings.put("ldap.autoFollowAliasReferrals", Boolean.toString(aliasReferralsEnabled));
@@ -91,6 +94,7 @@
                 manager.setAdminPassword(adminPassword);
                 manager.setConnectionPoolEnabled(connectionPoolEnabled);
                 manager.setSslEnabled(sslEnabled);
+                manager.setStartTlsEnabled(startTlsEnabled);
                 manager.setDebugEnabled(debugEnabled);
                 manager.setFollowReferralsEnabled(referralsEnabled);
                 manager.setFollowAliasReferralsEnabled(aliasReferralsEnabled);
@@ -105,6 +109,7 @@
                     xmppSettings.put("ldap.adminPassword", adminPassword);
                     xmppSettings.put("ldap.connectionPoolEnabled", Boolean.toString(connectionPoolEnabled));
                     xmppSettings.put("ldap.sslEnabled", Boolean.toString(sslEnabled));
+                    xmppSettings.put("ldap.startTlsEnabled", Boolean.toString(startTlsEnabled));
                     xmppSettings.put("ldap.debugEnabled", Boolean.toString(debugEnabled));
                     xmppSettings.put("ldap.autoFollowReferrals", Boolean.toString(referralsEnabled));
                     xmppSettings.put("ldap.autoFollowAliasReferrals", Boolean.toString(aliasReferralsEnabled));
@@ -137,6 +142,7 @@
         adminPassword = manager.getAdminPassword();
         connectionPoolEnabled = manager.isConnectionPoolEnabled();
         sslEnabled = manager.isSslEnabled();
+        startTlsEnabled = manager.isStartTlsEnabled();
         debugEnabled = manager.isDebugEnabled();
         referralsEnabled = manager.isFollowReferralsEnabled();
         aliasReferralsEnabled = manager.isFollowAliasReferralsEnabled();
@@ -304,6 +310,20 @@
 						<input type="radio" name="ssl" value="false" <% if (!sslEnabled) { %>checked <% } %>>
 					</td>
 				</tr>
+				<tr>
+					<td class="jive-advancedLabel" nowrap>
+						<fmt:message key="setup.ldap.server.starttls" />:
+					</td>
+					<td class="jive-advancedDesc jive-advancedBorderBottom jive-advancedBorderRight">
+						<fmt:message key="setup.ldap.server.starttls_help" />
+					</td>
+					<td class="jive-advancedBorderBottom jive-advancedBorderRight" align="center">
+						<input type="radio" name="starttls" value="true" <% if (startTlsEnabled) { %>checked <% } %>>
+					</td>
+					<td class="jive-advancedBorderBottom" align="center">
+						<input type="radio" name="starttls" value="false" <% if (!startTlsEnabled) { %>checked <% } %>>
+					</td>
+				</tr>
 				<tr>
 					<td class="jive-advancedLabel" nowrap>
 						<fmt:message key="setup.ldap.server.debug" />: