mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-04-17 06:51:14 +00:00
Code Issues Releases Wiki Activity

Fix urs command after DomainUpdateFlow change (#3008)

Browse Source 
PR 2930 forbids adding statuses that already exist on a domain.
This PR updates the uniform_rapid_suspension command to conform.

PR 2930 also forbids removing non-existent statuses, but it does
not apply to this command.
This commit is contained in:
Weimin Yu
2026-04-13 20:52:29 +00:00
committed by GitHub
parent b78d12e73f
commit e85f48beba
3 changed files with 76 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java
View File

@@ -146,7 +146,7 @@ final class UniformRapidSuspensionCommand extends MutatingEppToolCommand {
? ImmutableSet.of(StatusValue.CLIENT_HOLD.getXmlName())
: ImmutableSet.of();
} else {
statusesToApply = URS_LOCKS;
statusesToApply = ImmutableSet.copyOf(difference(URS_LOCKS, existingLocks));
}
// trigger renew flow

28
core/src/test/java/google/registry/tools/UniformRapidSuspensionCommandTest.java
View File

@@ -94,6 +94,34 @@ class UniformRapidSuspensionCommandTest
assertNotInStdout("--restore_client_hold");
}
@Test
void testCommand_respectExistingStatuses() throws Exception {
persistDomainWithHosts(
defaultDomain
.asBuilder()
.addStatusValues(ImmutableSet.of(StatusValue.SERVER_DELETE_PROHIBITED))
.build(),
defaultDsData,
ns1,
ns2);
runCommandForced(
"--domain_name=evil.tld",
"--hosts=urs1.example.com,urs2.example.com",
"--dsdata=1 1 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
"--renew_one_year=false");
eppVerifier
.expectRegistrarId("CharlestonRoad")
.expectSuperuser()
.verifySent("uniform_rapid_suspension_with_forbid_delete.xml")
.verifyNoMoreSent();
assertInStdout("uniform_rapid_suspension --undo");
assertInStdout("--domain_name evil.tld");
assertInStdout("--hosts ns1.example.com,ns2.example.com");
assertInStdout("--dsdata 1 2 3 DEAD,4 5 6 BEEF");
assertInStdout("--locks_to_preserve serverDeleteProhibited");
assertNotInStdout("--restore_client_hold");
}
@Test
void testCommand_respectsExistingHost() throws Exception {
persistDomainWithHosts(defaultDomain, defaultDsData, urs2, ns1);

47
core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension_with_forbid_delete.xml Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
<command>
<update>
<domain:update xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>evil.tld</domain:name>
<domain:add>
<domain:ns>
<domain:hostObj>urs1.example.com</domain:hostObj>
<domain:hostObj>urs2.example.com</domain:hostObj>
</domain:ns>
<domain:status s="serverTransferProhibited" />
<domain:status s="serverUpdateProhibited" />
</domain:add>
<domain:rem>
<domain:ns>
<domain:hostObj>ns2.example.com</domain:hostObj>
<domain:hostObj>ns1.example.com</domain:hostObj>
</domain:ns>
</domain:rem>
</domain:update>
</update>
<extension>
<secDNS:update xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1">
<secDNS:rem>
<secDNS:all>true</secDNS:all>
</secDNS:rem>
<secDNS:add>
<secDNS:dsData>
<secDNS:keyTag>1</secDNS:keyTag>
<secDNS:alg>1</secDNS:alg>
<secDNS:digestType>1</secDNS:digestType>
<secDNS:digest>A94A8FE5CCB19BA61C4C0873D391E987982FBBD3</secDNS:digest>
</secDNS:dsData>
</secDNS:add>
</secDNS:update>
<superuser:domainUpdate xmlns:superuser="urn:google:params:xml:ns:superuser-1.0">
<superuser:autorenews>false</superuser:autorenews>
</superuser:domainUpdate>
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
<metadata:reason>Uniform Rapid Suspension</metadata:reason>
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
</metadata:metadata>
</extension>
<clTRID>RegistryTool</clTRID>
</command>
</epp>