Proof of concept #1026

Paul Martin

2016-04-16 eecaad8b8e2c447429c31a01d49260ddd6b4ee03

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

@@ -37,6 +37,7 @@
import javax.mail.internet.MimeBodyPart;

import javax.mail.internet.MimeMessage;

import javax.mail.internet.MimeMultipart;

import javax.mail.internet.MimeUtility;



import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

@@ -68,6 +69,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 +88,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");

@@ -194,7 +197,8 @@
         }



         message.setSentDate(new Date());

         message.setSubject(mailing.subject);

         // UTF-8 encode

         message.setSubject(MimeUtility.encodeText(mailing.subject, "utf-8", "B"));



         MimeBodyPart messagePart = new MimeBodyPart();

         messagePart.setText(mailing.content, "utf-8");