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

Update signed marks files and add an expiration test

Browse source 
We'll continue to use injected clocks for the rest of our tests that use signed marks files, so that they don't all fail after the current validity period. The new test TmchTestDataExpirationTest will let us know when the files are expired, so we can update them.

All updated test data files come from https://newgtlds.icann.org/en/about/trademark-clearinghouse/registries-registrars

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=202208196
This commit is contained in:
mcilwain 2018-06-26 15:42:25 -07:00 • committed by Ben McIlwain
parent 11c5d11a29
commit 892c1fc707
95 changed files with 6574 additions and 6461 deletions
Download patch file Download diff file Expand all files Collapse all files

20
java/google/registry/flows/domain/DomainFlowTmchUtils.java
View file

@ -63,11 +63,21 @@ public final class DomainFlowTmchUtils {
if (!(signedMarks.get(0) instanceof EncodedSignedMark)) {
throw new SignedMarksMustBeEncodedException();
}
return verifyEncodedSignedMark((EncodedSignedMark) signedMarks.get(0), domainLabel, now);
SignedMark signedMark =
verifyEncodedSignedMark((EncodedSignedMark) signedMarks.get(0), now);
return verifySignedMarkValidForDomainLabel(signedMark, domainLabel);
}
public SignedMark verifyEncodedSignedMark(
EncodedSignedMark encodedSignedMark, String domainLabel, DateTime now) throws EppException {
public SignedMark verifySignedMarkValidForDomainLabel(SignedMark signedMark, String domainLabel)
throws NoMarksFoundMatchingDomainException {
if (!containsMatchingLabel(signedMark.getMark(), domainLabel)) {
throw new NoMarksFoundMatchingDomainException();
}
return signedMark;
}
public SignedMark verifyEncodedSignedMark(EncodedSignedMark encodedSignedMark, DateTime now)
throws EppException {
if (!encodedSignedMark.getEncoding().equals("base64")) {
throw new Base64RequiredForEncodedSignedMarksException();
}
@ -118,10 +128,6 @@ public final class DomainFlowTmchUtils {
throw new FoundMarkExpiredException();
}
if (!containsMatchingLabel(signedMark.getMark(), domainLabel)) {
throw new NoMarksFoundMatchingDomainException();
}
return signedMark;
}