mirror of
https://github.com/google/nomulus.git
synced 2025-07-21 18:26:12 +02:00
Add autorenews to URS (#1343)
* Add autorenews to URS * Add autorenews to existing xml files for test cases
This commit is contained in:
parent
2be5eff1f5
commit
159c6ed5fb
9 changed files with 56 additions and 1 deletions
|
@ -157,7 +157,12 @@ final class UniformRapidSuspensionCommand extends MutatingEppToolCommand {
|
||||||
"newDsData",
|
"newDsData",
|
||||||
newDsData != null ? DsRecord.convertToSoy(newDsData) : new SoyListData(),
|
newDsData != null ? DsRecord.convertToSoy(newDsData) : new SoyListData(),
|
||||||
"reason",
|
"reason",
|
||||||
(undo ? "Undo " : "") + "Uniform Rapid Suspension"));
|
(undo ? "Undo " : "") + "Uniform Rapid Suspension",
|
||||||
|
// Domain auto-renewal is disabled as part of URS, and it's re-enabled if URS is undone.
|
||||||
|
// Therefore, autorenews is set to false by default and it's set to true only if the
|
||||||
|
// command is run in --undo mode.
|
||||||
|
"autorenews",
|
||||||
|
Boolean.toString(undo)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private ImmutableSortedSet<String> getExistingNameservers(DomainBase domain) {
|
private ImmutableSortedSet<String> getExistingNameservers(DomainBase domain) {
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
{@param statusesToRemove: list<string>}
|
{@param statusesToRemove: list<string>}
|
||||||
{@param newDsData: list<[keyTag:int, alg:int, digestType:int, digest:string]>}
|
{@param newDsData: list<[keyTag:int, alg:int, digestType:int, digest:string]>}
|
||||||
{@param reason: string}
|
{@param reason: string}
|
||||||
|
{@param autorenews: string}
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
||||||
<command>
|
<command>
|
||||||
|
@ -75,6 +76,9 @@
|
||||||
</secDNS:add>
|
</secDNS:add>
|
||||||
{/if}
|
{/if}
|
||||||
</secDNS:update>
|
</secDNS:update>
|
||||||
|
<superuser:domainUpdate xmlns:superuser="urn:google:params:xml:ns:superuser-1.0">
|
||||||
|
<superuser:autorenews>{$autorenews}</superuser:autorenews>
|
||||||
|
</superuser:domainUpdate>
|
||||||
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
<metadata:reason>{$reason}</metadata:reason>
|
<metadata:reason>{$reason}</metadata:reason>
|
||||||
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
|
|
@ -186,6 +186,34 @@ class UniformRapidSuspensionCommandTest
|
||||||
assertNotInStdout("--undo"); // Undo shouldn't print a new undo command.
|
assertNotInStdout("--undo"); // Undo shouldn't print a new undo command.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testAutorenews_setToFalsebyDefault() throws Exception {
|
||||||
|
persistResource(
|
||||||
|
newDomainBase("evil.tld")
|
||||||
|
.asBuilder()
|
||||||
|
.addStatusValue(StatusValue.SERVER_DELETE_PROHIBITED)
|
||||||
|
.build());
|
||||||
|
runCommandForced("--domain_name=evil.tld");
|
||||||
|
eppVerifier.verifySentAny();
|
||||||
|
assertInStdout("<superuser:autorenews>false</superuser:autorenews>");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testAutorenews_setToTrueWhenUndo() throws Exception {
|
||||||
|
persistResource(
|
||||||
|
newDomainBase("evil.tld")
|
||||||
|
.asBuilder()
|
||||||
|
.addStatusValue(StatusValue.SERVER_DELETE_PROHIBITED)
|
||||||
|
.build());
|
||||||
|
runCommandForced(
|
||||||
|
"--domain_name=evil.tld",
|
||||||
|
"--undo",
|
||||||
|
"--hosts=ns1.example.com,ns2.example.com",
|
||||||
|
"--restore_client_hold");
|
||||||
|
eppVerifier.verifySentAny();
|
||||||
|
assertInStdout("<superuser:autorenews>true</superuser:autorenews>");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testFailure_locksToPreserveWithoutUndo() {
|
void testFailure_locksToPreserveWithoutUndo() {
|
||||||
persistActiveDomain("evil.tld");
|
persistActiveDomain("evil.tld");
|
||||||
|
|
|
@ -35,6 +35,9 @@
|
||||||
</secDNS:dsData>
|
</secDNS:dsData>
|
||||||
</secDNS:add>
|
</secDNS:add>
|
||||||
</secDNS:update>
|
</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:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
<metadata:reason>Uniform Rapid Suspension</metadata:reason>
|
<metadata:reason>Uniform Rapid Suspension</metadata:reason>
|
||||||
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
|
|
@ -25,6 +25,9 @@
|
||||||
<secDNS:all>true</secDNS:all>
|
<secDNS:all>true</secDNS:all>
|
||||||
</secDNS:rem>
|
</secDNS:rem>
|
||||||
</secDNS:update>
|
</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:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
<metadata:reason>Uniform Rapid Suspension</metadata:reason>
|
<metadata:reason>Uniform Rapid Suspension</metadata:reason>
|
||||||
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
|
|
@ -27,6 +27,9 @@
|
||||||
<secDNS:all>true</secDNS:all>
|
<secDNS:all>true</secDNS:all>
|
||||||
</secDNS:rem>
|
</secDNS:rem>
|
||||||
</secDNS:update>
|
</secDNS:update>
|
||||||
|
<superuser:domainUpdate xmlns:superuser="urn:google:params:xml:ns:superuser-1.0">
|
||||||
|
<superuser:autorenews>true</superuser:autorenews>
|
||||||
|
</superuser:domainUpdate>
|
||||||
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
<metadata:reason>Undo Uniform Rapid Suspension</metadata:reason>
|
<metadata:reason>Undo Uniform Rapid Suspension</metadata:reason>
|
||||||
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
|
|
@ -28,6 +28,9 @@
|
||||||
<secDNS:all>true</secDNS:all>
|
<secDNS:all>true</secDNS:all>
|
||||||
</secDNS:rem>
|
</secDNS:rem>
|
||||||
</secDNS:update>
|
</secDNS:update>
|
||||||
|
<superuser:domainUpdate xmlns:superuser="urn:google:params:xml:ns:superuser-1.0">
|
||||||
|
<superuser:autorenews>true</superuser:autorenews>
|
||||||
|
</superuser:domainUpdate>
|
||||||
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
<metadata:reason>Undo Uniform Rapid Suspension</metadata:reason>
|
<metadata:reason>Undo Uniform Rapid Suspension</metadata:reason>
|
||||||
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
|
|
@ -26,6 +26,9 @@
|
||||||
<secDNS:all>true</secDNS:all>
|
<secDNS:all>true</secDNS:all>
|
||||||
</secDNS:rem>
|
</secDNS:rem>
|
||||||
</secDNS:update>
|
</secDNS:update>
|
||||||
|
<superuser:domainUpdate xmlns:superuser="urn:google:params:xml:ns:superuser-1.0">
|
||||||
|
<superuser:autorenews>true</superuser:autorenews>
|
||||||
|
</superuser:domainUpdate>
|
||||||
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
<metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
<metadata:reason>Undo Uniform Rapid Suspension</metadata:reason>
|
<metadata:reason>Undo Uniform Rapid Suspension</metadata:reason>
|
||||||
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
|
|
@ -36,6 +36,9 @@
|
||||||
</secDNS:dsData>
|
</secDNS:dsData>
|
||||||
</secDNS:add>
|
</secDNS:add>
|
||||||
</secDNS:update>
|
</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:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
|
||||||
<metadata:reason>Uniform Rapid Suspension</metadata:reason>
|
<metadata:reason>Uniform Rapid Suspension</metadata:reason>
|
||||||
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
<metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue