From 10c2b995589dad04cb021209ee5a871b491844c6 Mon Sep 17 00:00:00 2001 From: Dmitriy Pavlov Date: Fri, 22 Apr 2022 17:50:37 +0300 Subject: [PATCH] IGNITE-16829 Support configurable mail smtp host, disabling auth and SSL+ test feature: Fix for email escaping --- .../main/java/org/apache/ignite/ci/web/model/Version.java | 2 +- .../ignite/ci/web/rest/monitoring/MonitoringService.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java index e947aa71..a338f177 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java @@ -28,7 +28,7 @@ public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot"; /** TC Bot Version. */ - public static final String VERSION = "20220414"; + public static final String VERSION = "20220422"; /** Java version, where Web App is running. */ public String javaVer; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java index e196ec31..53448dbf 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/monitoring/MonitoringService.java @@ -33,10 +33,7 @@ import javax.annotation.security.PermitAll; import javax.servlet.ServletContext; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import java.util.ArrayList; @@ -129,9 +126,8 @@ public SimpleResult testSlackNotification() { } @POST - @PermitAll @Path("testEmailNotification") - public SimpleResult testEmailNotification(String address) { + public SimpleResult testEmailNotification(@FormParam("address") String address) { IEmailSender emailSender = CtxListener.getInjector(ctx).getInstance(IEmailSender.class); ITcBotConfig tcBotConfig = CtxListener.getInjector(ctx).getInstance(ITcBotConfig.class);