diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/EmailFooter.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/EmailFooter.html index 5ae8021733..8594808753 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/EmailFooter.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/EmailFooter.html @@ -4,6 +4,6 @@

Contact CSET CISA U.S. Toll Free: (888) 282-0870
- email: central@cisa.gov
+ email: {{DHSEmail}}

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs index 161597ffa0..2b62f3b1b4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs @@ -264,6 +264,7 @@ public void SendMail(MailMessage mail) mail.Body = mail.Body.Replace("{{email-footer-CF}}", footerCF); string footer = _resourceHelper.GetEmbeddedResource(@"App_Data\EmailFooter.html"); + footer = footer.Replace("{{DHSEmail}}", _configuration.GetValue("Email:DHSEmail")); mail.Body = mail.Body.Replace("{{email-footer}}", footer); SmtpClient client = new SmtpClient diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DHSEmailController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DHSEmailController.cs new file mode 100644 index 0000000000..f1d923671d --- /dev/null +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DHSEmailController.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; + +namespace CSETWebCore.Api.Controllers +{ + [ApiController] + [Route("api/[controller]")] + public class EmailController : ControllerBase + { + private readonly IConfiguration _configuration; + + public EmailController(IConfiguration configuration) + { + _configuration = configuration; + } + + [HttpGet("dhsemail")] + public IActionResult GetDHSEmail() + { + var dhsEmail = _configuration.GetValue("Email:DHSEmail"); + if (string.IsNullOrEmpty(dhsEmail)) + { + return Ok("test"); // 204 No Content + } + return Ok(dhsEmail); + } + } +} \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html b/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html index 81f5f6208c..28a73c43bd 100644 --- a/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html +++ b/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html @@ -52,7 +52,7 @@

{{t('about.contact')}}

-

+

diff --git a/CSETWebNg/src/app/services/config.service.ts b/CSETWebNg/src/app/services/config.service.ts index 6aa30a7cb7..01a6fbe2f3 100644 --- a/CSETWebNg/src/app/services/config.service.ts +++ b/CSETWebNg/src/app/services/config.service.ts @@ -54,6 +54,7 @@ export class ConfigService { * host/api/library */ libraryUrl: string; + dhsEmail: string; onlineUrl: string; @@ -156,6 +157,10 @@ export class ConfigService { return this.http.get(this.apiUrl + 'HasLocalDocuments'); } + getDhsEmail() { + return this.http.get(this.apiUrl + 'Email/dhsemail', { responseType: 'text' }); + } + /** * */ @@ -186,7 +191,12 @@ export class ConfigService { this.helpContactEmail = this.config.helpContactEmail; this.helpContactPhone = this.config.helpContactPhone; this.csetGithubApiUrl = this.config.csetGithubApiUrl; - + this.getDhsEmail().subscribe((resp: string) => { + this.dhsEmail = resp; + if (!this.helpContactEmail) { + this.helpContactEmail = resp; + } + }); // configure the reference document URL if the "library" property is defined // or if passed in as query param and stored as local storage variable. Local storage should // take precedence over the config file, since Electron uses it to dynamically set the port. diff --git a/CSETWebNg/src/assets/i18n/en.json b/CSETWebNg/src/assets/i18n/en.json index bdcd6b0c04..2cc912c340 100644 --- a/CSETWebNg/src/assets/i18n/en.json +++ b/CSETWebNg/src/assets/i18n/en.json @@ -1590,7 +1590,7 @@ "version": "Version", "build date": "Build Date", "contact": "Contact", - "learn more": "To learn more about cyber vulnerabilities, training, standards, and references, visit the CISA Vulnerability Management website or contact vulnerability@cisa.gov.", + "learn more": "To learn more about cyber vulnerabilities, training, standards, and references, visit the CISA Vulnerability Management website or contact {{dhsEmail}}.", "encourage reporting": "CISA — Cybersecurity and Infrastructure Security Agency — encourages you to report suspicious cyber activity, incidents, and vulnerabilities affecting critical infrastructure control systems.", "cset training resources": "Training Resources", "training available": "training is available through the following resources", diff --git a/CSETWebNg/src/assets/i18n/es.json b/CSETWebNg/src/assets/i18n/es.json index a8834ce331..d9e3972ad0 100644 --- a/CSETWebNg/src/assets/i18n/es.json +++ b/CSETWebNg/src/assets/i18n/es.json @@ -1206,7 +1206,7 @@ "version": "Versión", "build date": "Fecha de Compilación", "contact": "Contacto", - "learn more": "Para obtener más información sobre vulnerabilidades cibernéticas, capacitación, estándares y referencias, visite el sitio web de gestión de vulnerabilidades de CISA o póngase en contacto con vulnerability@cisa.gov.", + "learn more": "Para obtener más información sobre vulnerabilidades cibernéticas, capacitación, estándares y referencias, visite el sitio web de gestión de vulnerabilidades de CISA o póngase en contacto con {{dhsEmail}}.", "encourage reporting": "CISA (Agencia de Seguridad de la Infraestructura y Ciberseguridad) lo alienta a informar sobre actividades cibernéticas sospechosas, incidentes y vulnerabilidades que afectan los sistemas de control de infraestructura crítica.", "cset training resources": "Recursos de capacitación CSET", "training available": "La capacitación CSET está disponible a través de los siguientes recursos", diff --git a/CSETWebNg/src/assets/i18n/uk.json b/CSETWebNg/src/assets/i18n/uk.json index 6fdfe17b2f..5eec462f82 100644 --- a/CSETWebNg/src/assets/i18n/uk.json +++ b/CSETWebNg/src/assets/i18n/uk.json @@ -1119,7 +1119,7 @@ "version": "Версія", "build date": "Дата збірки", "contact": "контакт", - "learn more": "Щоб дізнатися більше про кіберуразливості, навчання, стандарти та посилання, відвідайте Веб-сайт керування вразливостями CISA або зв’яжіться з vulnerability@cisa.gov.", + "learn more": "Щоб дізнатися більше про кіберуразливості, навчання, стандарти та посилання, відвідайте Веб-сайт керування вразливостями CISA або зв’яжіться з {{dhsEmail}}.", "encourage reporting": "CISA — Агентство з кібербезпеки та безпеки інфраструктури — заохочує вас повідомляти про підозрілу кіберактивність, інциденти та вразливі місця, що впливають на системи контролю критичної інфраструктури.", "cset training resources": "Навчальні ресурси CSET", "training available": "Навчання CSET доступне через такі ресурси",