Merge pull request #183 from bviktor/develop

James Moger

2014-05-08 4eec40857a2af12baa64585fe3e380258b710599

Merge pull request #183 from bviktor/develop

Add option to explicitly specify the use of STARTTLS

 src/main/distrib/data/gitblit.properties

@@ -1410,6 +1410,11 @@
# use SMTPs flag

mail.smtps = false



# use STARTTLS flag

#

# SINCE 1.6.0

mail.starttls = false



# if your smtp server requires authentication, supply the credentials here

#

# SINCE 0.6.0


 src/main/java/com/gitblit/service/MailService.java

@@ -68,6 +68,7 @@
        final String mailUser = settings.getString(Keys.mail.username, null);

        final String mailPassword = settings.getString(Keys.mail.password, null);

        final boolean smtps = settings.getBoolean(Keys.mail.smtps, false);

        final boolean starttls = settings.getBoolean(Keys.mail.starttls, false);

        boolean authenticate = !StringUtils.isEmpty(mailUser) && !StringUtils.isEmpty(mailPassword);

        String server = settings.getString(Keys.mail.server, "");

        if (StringUtils.isEmpty(server)) {

@@ -86,6 +87,7 @@
        props.setProperty("mail.smtp.port", String.valueOf(port));

        props.setProperty("mail.smtp.auth", String.valueOf(authenticate));

        props.setProperty("mail.smtp.auths", String.valueOf(authenticate));

        props.setProperty("mail.smtp.starttls.enable", String.valueOf(starttls));



        if (isGMail || smtps) {

            props.setProperty("mail.smtp.starttls.enable", "true");