diff --git a/src/main/java/org/eclipsefoundation/git/eca/config/EclipseQuteTemplateExtensions.java b/src/main/java/org/eclipsefoundation/git/eca/config/EclipseQuteTemplateExtensions.java index af3e3c858b9a632dc16547c3dc8c47b2fc5ede07..0413b4249a7a2856b84c4440e4d8d9e091740503 100644 --- a/src/main/java/org/eclipsefoundation/git/eca/config/EclipseQuteTemplateExtensions.java +++ b/src/main/java/org/eclipsefoundation/git/eca/config/EclipseQuteTemplateExtensions.java @@ -80,7 +80,7 @@ public class EclipseQuteTemplateExtensions { * @param email the address to obfuscate * @return the obfuscated address, or empty string if (the string could not be parsed as an email address. */ - static String obfuscateEmail(String email) { + public static String obfuscateEmail(String email) { if (StringUtils.isBlank(email)) { return ""; } diff --git a/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java b/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java index 8fe1a05f106e0fec523b9ec9970de162f75849c6..0a95623ebf8f157bb0afe6b93889d2458cd84c2d 100644 --- a/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java +++ b/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java @@ -15,6 +15,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.eclipsefoundation.efservices.api.models.Project; +import org.eclipsefoundation.git.eca.config.EclipseQuteTemplateExtensions; import org.eclipsefoundation.git.eca.dto.CommitValidationStatus; import org.eclipsefoundation.git.eca.helper.GithubValidationHelper; import org.eclipsefoundation.git.eca.helper.ProjectHelper; @@ -86,7 +87,17 @@ public class StatusResource extends CommonResource { @GET @Path("{fingerprint}") public Response getCommitValidation(@PathParam("fingerprint") String fingerprint) { - return Response.ok(validationStatus.getHistoricValidationStatus(wrapper, fingerprint)).build(); + List<CommitValidationStatus> statuses = validationStatus.getHistoricValidationStatus(wrapper, fingerprint); + // for each of the statuses, obfuscate the emails before return + statuses.forEach(s -> { + s.setUserMail(EclipseQuteTemplateExtensions.obfuscateEmail(s.getUserMail())); + s.getErrors().stream().forEach(e -> { + e.setAuthorEmail(EclipseQuteTemplateExtensions.obfuscateEmail(e.getAuthorEmail())); + e.setCommitterEmail(EclipseQuteTemplateExtensions.obfuscateEmail(e.getCommitterEmail())); + }); + }); + + return Response.ok(statuses).build(); } /**