zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-21 19:59:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use a multimap to index the Spec11 threat matches

Browse source 
Collecting by key leads to exceptions if there are multiple client IDs with the
same email address (if we group by client ID in the pipeline). Using
Multimaps::index means that if we're grouping by email, all matches with the
same email get concatenated together

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=242858112
This commit is contained in:
gbrodman 2019-04-10 06:36:51 -07:00 • committed by jianglai
parent 641c3f6bc3
commit 6b6e2ed930
2 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
View file

@ -14,6 +14,7 @@
package google.registry.reporting.spec11;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static google.registry.reporting.ReportingModule.PARAM_DATE;
import static google.registry.request.Action.Method.POST;
@ -24,7 +25,10 @@ import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.Job;
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimaps;
import com.google.common.flogger.FluentLogger;
import com.google.common.net.MediaType;
import com.google.template.soy.parseinfo.SoyTemplateInfo;
@ -168,12 +172,16 @@ public class PublishSpec11ReportAction implements Runnable {
private ImmutableSet<RegistrarThreatMatches> getNewMatches(
Set<RegistrarThreatMatches> previousMatchesSet,
Set<RegistrarThreatMatches> currentMatchesSet) {
// Group by email address then flat-map all of the ThreatMatch objects together
ImmutableListMultimap<String, RegistrarThreatMatches> currentMatchesByEmail =
Multimaps.index(currentMatchesSet, RegistrarThreatMatches::registrarEmailAddress);
Map<String, List<ThreatMatch>> currentMatchMap =
currentMatchesSet.stream()
.collect(
Collectors.toMap(
RegistrarThreatMatches::registrarEmailAddress,
RegistrarThreatMatches::threatMatches));
Maps.transformValues(
currentMatchesByEmail.asMap(),
registrarThreatMatchesCollection ->
registrarThreatMatchesCollection.stream()
.flatMap(matches -> matches.threatMatches().stream())
.collect(toImmutableList()));
previousMatchesSet.forEach(
previousMatches ->
currentMatchMap.computeIfPresent(

37
javatests/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java
View file

@ -15,6 +15,8 @@
package google.registry.reporting.spec11;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.reporting.spec11.Spec11RegistrarThreatMatchesParserTest.getMatchA;
import static google.registry.reporting.spec11.Spec11RegistrarThreatMatchesParserTest.getMatchB;
import static google.registry.reporting.spec11.Spec11RegistrarThreatMatchesParserTest.sampleThreatMatches;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED;
@ -30,8 +32,10 @@ import com.google.api.services.dataflow.Dataflow.Projects;
import com.google.api.services.dataflow.Dataflow.Projects.Jobs;
import com.google.api.services.dataflow.Dataflow.Projects.Jobs.Get;
import com.google.api.services.dataflow.model.Job;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.net.MediaType;
import google.registry.beam.spec11.ThreatMatch;
import google.registry.reporting.spec11.soy.Spec11EmailSoyInfo;
import google.registry.testing.FakeResponse;
import java.io.IOException;
@ -162,6 +166,39 @@ public class PublishSpec11ReportActionTest {
verifyNoMoreInteractions(emailUtils);
}
@Test
public void testJobDone_multipleEntriesWithSameEmail() throws Exception {
LocalDate yesterday = date.minusDays(1);
when(parser.getPreviousDateWithMatches(date)).thenReturn(Optional.of(yesterday));
when(parser.getRegistrarThreatMatches(yesterday)).thenReturn(ImmutableSet.of());
// if the input is [{email: a, matches: list1}, {email: a, matches: list2}] then we should
// concatenate list1 and list2 in the resulting grouping
RegistrarThreatMatches firstMatches = getMatchA();
ImmutableList<ThreatMatch> secondMatchList = getMatchB().threatMatches();
RegistrarThreatMatches secondMatches =
RegistrarThreatMatches.create("a@fake.com", secondMatchList);
when(parser.getRegistrarThreatMatches(date))
.thenReturn(ImmutableSet.of(firstMatches, secondMatches));
expectedJob.setCurrentState("JOB_STATE_DONE");
publishAction.run();
ImmutableSet<RegistrarThreatMatches> expectedMatchSet =
ImmutableSet.of(
RegistrarThreatMatches.create(
"a@fake.com",
ImmutableList.<ThreatMatch>builder()
.addAll(firstMatches.threatMatches())
.addAll(secondMatchList)
.build()));
verify(emailUtils)
.emailSpec11Reports(
date,
Spec11EmailSoyInfo.DAILY_SPEC_11_EMAIL,
"Super Cool Registry Daily Threat Detector [2018-06-05]",
expectedMatchSet);
verifyNoMoreInteractions(emailUtils);
}
@Test
public void testJobDone_failsDueToNoPreviousResults() {
when(parser.getPreviousDateWithMatches(date)).thenReturn(Optional.empty());