feat: add organization name configuration parameter

Author: mjabascal10

backend/src/main/java/com/park/utmstack/service/MailService.java

@@ -24,7 +24,6 @@
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect;
 import org.thymeleaf.spring5.SpringTemplateEngine;
@@ -62,6 +61,8 @@ public class MailService {
 
     private static final String BASE_URL = "baseUrl";
 
+    private static final String ORG_NAME = "orgName";
+
     private final MessageSource messageSource;
     private final SpringTemplateEngine templateEngine;
     private final ApplicationEventService eventService;
@@ -79,22 +80,6 @@ public MailService(MessageSource messageSource,
         this.templateEngine.addDialect(new Java8TimeDialect());
     }
 
-//    private JavaMailSender getJavaMailSender() {
-//        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-//        mailSender.setHost(Constants.CFG.get(Constants.PROP_MAIL_HOST));
-//        mailSender.setPort(Integer.parseInt(Constants.CFG.get(Constants.PROP_MAIL_PORT)));
-//        mailSender.setPassword(Constants.CFG.get(Constants.PROP_MAIL_PASSWORD));
-//        mailSender.setUsername(Constants.CFG.get(Constants.PROP_MAIL_USERNAME));
-//        mailSender.setProtocol(Constants.CFG.get(Constants.PROP_MAIL_PROTOCOL));
-//
-//        Properties props = mailSender.getJavaMailProperties();
-//        props.put("mail.smtp.auth", Constants.CFG.get(Constants.PROP_MAIL_SMTP_AUTH));
-//        props.put("mail.smtp.starttls.enable", Constants.CFG.get(Constants.PROP_MAIL_SMTP_STARTTLS_ENABLE));
-//        props.put("mail.smtp.ssl.trust", Constants.CFG.get(Constants.PROP_MAIL_SMTP_SSL_TRUST));
-//
-//        return mailSender;
-//    }
-
     private MailSenderStrategy getSender(String type){
         return mailSenders.stream()
                 .filter(s -> s.getEncryptionType().equals(type))
@@ -277,11 +262,12 @@ public void sendAlertEmail(List<String> emailsTo, AlertType alert, List<LogType>
             context.setVariable("relatedLogs", relatedLogs);
             context.setVariable("timestamp", alert.getTimestampFormatted());
             context.setVariable(BASE_URL, Constants.CFG.get(Constants.PROP_MAIL_BASE_URL));
+            context.setVariable(ORG_NAME, Constants.CFG.get(Constants.PROP_MAIL_ORGNAME));
 
             final MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             final MimeMessageHelper message = new MimeMessageHelper(mimeMessage, true, "UTF-8");
             message.setSubject(String.format("%1$s[%2$s]: %3$s", alert.getIncident() ? "INFOSEC-" : "", alert.getId().substring(0, 5), alert.getName()));
-            message.setFrom(Constants.CFG.get(Constants.PROP_MAIL_FROM));
+            message.setFrom(new InternetAddress(Constants.CFG.get(Constants.PROP_MAIL_FROM), Constants.CFG.get(Constants.PROP_MAIL_ORGNAME)));
             message.setTo(emailsTo.toArray(new String[0]));
 
             final String htmlContent = templateEngine.process("mail/alertEmail", context);
@@ -314,9 +300,12 @@ public void sendIncidentEmail(List<String> emailsTo, List<AlertType> alerts, Utm
             context.setVariable("alerts", alerts);
             context.setVariable("incident", incident);
             context.setVariable(BASE_URL, Constants.CFG.get(Constants.PROP_MAIL_BASE_URL));
+            context.setVariable(ORG_NAME, Constants.CFG.get(Constants.PROP_MAIL_ORGNAME));
+
             final MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             final MimeMessageHelper message = new MimeMessageHelper(mimeMessage, true, "UTF-8");
             message.setSubject(String.format("%1$s[%2$s]: %3$s", "INFOSEC- New Incident ", incident.getId().toString(), incident.getIncidentName()));
+            message.setFrom(new InternetAddress(Constants.CFG.get(Constants.PROP_MAIL_FROM), Constants.CFG.get(Constants.PROP_MAIL_ORGNAME)));
             message.setFrom(Constants.CFG.get(Constants.PROP_MAIL_FROM));
             message.setTo(emailsTo.toArray(new String[0]));
 

backend/src/main/java/com/park/utmstack/service/mail_config/MailConfigService.java

@@ -28,7 +28,7 @@ public String getParamValue(List<UtmConfigurationParameter> parameters, String s
         return parameters.stream()
                 .filter(p -> p.getConfParamShort().equals(shortName))
                 .findFirst()
-                . map(UtmConfigurationParameter::getConfParamValue)
+                .map(UtmConfigurationParameter::getConfParamValue)
                 .orElse(Constants.CFG.get(shortName));
     }
 }

backend/src/main/resources/config/liquibase/changelog/20250319001_add_organization_field_config_params.xml

@@ -8,7 +8,16 @@
         <sql>
             <![CDATA[
                 INSERT INTO utm_configuration_parameter (id, section_id, conf_param_short, conf_param_large, conf_param_description, conf_param_value, conf_param_required, conf_param_datatype, modification_time, modification_user, conf_param_option, conf_param_regexp)
-                VALUES (10, 2, 'utmstack.mail.organization', 'Organization Name', 'Displays the organization name in emails.', '', true, 'text', null, null, null, null);
+                VALUES (10, 2, 'utmstack.mail.organization', 'Organization Name', 'This field helps identify the organization name in incident and alert notification emails.', '', false, 'text', null, null, null, null);
+
+                UPDATE public.utm_configuration_parameter
+                SET conf_param_required = true
+                WHERE id = 4 AND section_id = 2;
+
+                UPDATE public.utm_configuration_parameter
+                SET conf_param_required = true
+                WHERE id = 9 AND section_id = 2;
+
             ]]>
         </sql>
     </changeSet>

backend/src/main/resources/templates/mail/fragments/alert-detail-fragment.html

@@ -13,6 +13,11 @@
         </thead>
         <tbody>
 
+        <tr th:if="${orgName != null && !#strings.isEmpty(orgName)}" style="font-family:Roboto, sans-serif;font-size: 13px">
+            <td style="font-weight: bold;vertical-align: top;" th:text="'Organization:'"></td>
+            <td style="vertical-align: top;" th:text="${orgName}"></td>
+        </tr>
+
         <tr style="font-family:Roboto, sans-serif;font-size: 13px">
             <td style="font-weight: bold;vertical-align: top;" th:text="'Name:'"></td>
             <td style="vertical-align: top;" th:text="${alert.getName()}"></td>

backend/src/main/resources/templates/mail/newIncidentEmail.html

@@ -25,6 +25,11 @@ <h1 style="font-family:Roboto, sans-serif;">
     </thead>
     <tbody>
 
+    <tr th:if="${orgName != null && !#strings.isEmpty(orgName)}" style="font-family:Roboto, sans-serif;font-size: 13px">
+        <td style="font-weight: bold;vertical-align: top;" th:text="'Organization:'"></td>
+        <td style="vertical-align: top;" th:text="${orgName}"></td>
+    </tr>
+
     <tr style="font-family:Roboto, sans-serif;font-size: 13px">
         <td style="font-weight: bold;vertical-align: top;" th:text="'Name:'"></td>
         <td style="vertical-align: top;"