From 04a61794e08d7b2cc3c713eea073c176a7ed3cbb Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 15 Sep 2017 06:46:59 -0700 Subject: [PATCH] Fix closing and self-closing tags in templates Void tags (e.g. ) couldn't have a closing tag (e.g. is invalid). Non-void tags (e.g.
) couldn't be self closing (e.g.
is invalid) and must be closed explicitly (e.g. with
). This CL fixes the tags which also prepares the templates for stricthtml which enforces it. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=168829028 --- java/google/registry/flows/soy/DomainCheckFeeEpp.soy | 2 +- java/google/registry/tools/soy/ContactCreate.soy | 2 +- .../google/registry/tools/soy/CreateAnchorTenant.soy | 2 +- java/google/registry/tools/soy/DeleteDomain.soy | 2 +- java/google/registry/tools/soy/DeleteHost.soy | 2 +- java/google/registry/tools/soy/DomainAllocate.soy | 2 +- .../registry/tools/soy/DomainApplicationInfo.soy | 2 +- java/google/registry/tools/soy/DomainCheck.soy | 2 +- java/google/registry/tools/soy/DomainCheckClaims.soy | 2 +- java/google/registry/tools/soy/DomainCheckFee.soy | 2 +- java/google/registry/tools/soy/DomainCreate.soy | 2 +- java/google/registry/tools/soy/DomainUpdate.soy | 2 +- java/google/registry/tools/soy/HostCreate.soy | 2 +- java/google/registry/tools/soy/RemoveIpAddress.soy | 2 +- .../registry/tools/soy/UniformRapidSuspension.soy | 2 +- java/google/registry/tools/soy/UpdateServerLocks.soy | 2 +- java/google/registry/ui/soy/registrar/Contact.soy | 2 +- java/google/registry/ui/soy/registrar/ContactEpp.soy | 6 +++--- java/google/registry/ui/soy/registrar/DomainEpp.soy | 12 ++++++------ java/google/registry/ui/soy/registrar/Epp.soy | 4 ++-- java/google/registry/ui/soy/registrar/HostEpp.soy | 6 +++--- 21 files changed, 31 insertions(+), 31 deletions(-) diff --git a/java/google/registry/flows/soy/DomainCheckFeeEpp.soy b/java/google/registry/flows/soy/DomainCheckFeeEpp.soy index b1f9d7f24..5e467565c 100644 --- a/java/google/registry/flows/soy/DomainCheckFeeEpp.soy +++ b/java/google/registry/flows/soy/DomainCheckFeeEpp.soy @@ -15,7 +15,7 @@ {namespace registry.soy.api autoescape="strict"} /** Domain check fee request for one domain. */ -{template .domaincheckfee} +{template .domaincheckfee stricthtml="false"} {@param domainName: string} diff --git a/java/google/registry/tools/soy/ContactCreate.soy b/java/google/registry/tools/soy/ContactCreate.soy index 6fdc8cd16..fbb0b03e7 100644 --- a/java/google/registry/tools/soy/ContactCreate.soy +++ b/java/google/registry/tools/soy/ContactCreate.soy @@ -16,7 +16,7 @@ /** * Create contact */ -{template .contactcreate} +{template .contactcreate stricthtml="false"} {@param? id: string} {@param? name: string} {@param? org: string} diff --git a/java/google/registry/tools/soy/CreateAnchorTenant.soy b/java/google/registry/tools/soy/CreateAnchorTenant.soy index eab428e58..149d2d686 100644 --- a/java/google/registry/tools/soy/CreateAnchorTenant.soy +++ b/java/google/registry/tools/soy/CreateAnchorTenant.soy @@ -17,7 +17,7 @@ /** * Create anchor tenant domain */ -{template .createanchortenant} +{template .createanchortenant stricthtml="false"} {@param domainName: string} {@param contactId: string} {@param password: string} diff --git a/java/google/registry/tools/soy/DeleteDomain.soy b/java/google/registry/tools/soy/DeleteDomain.soy index 0f3a507d1..fcf28c228 100644 --- a/java/google/registry/tools/soy/DeleteDomain.soy +++ b/java/google/registry/tools/soy/DeleteDomain.soy @@ -17,7 +17,7 @@ /** * Delete domain request */ -{template .deletedomain} +{template .deletedomain stricthtml="false"} {@param domainName: string} {@param reason: string} {@param requestedByRegistrar: any} diff --git a/java/google/registry/tools/soy/DeleteHost.soy b/java/google/registry/tools/soy/DeleteHost.soy index 78dd151d7..6adc82085 100644 --- a/java/google/registry/tools/soy/DeleteHost.soy +++ b/java/google/registry/tools/soy/DeleteHost.soy @@ -17,7 +17,7 @@ /** * Delete host request */ -{template .deletehost} +{template .deletehost stricthtml="false"} {@param hostName: string} {@param reason: string} {@param requestedByRegistrar: any} diff --git a/java/google/registry/tools/soy/DomainAllocate.soy b/java/google/registry/tools/soy/DomainAllocate.soy index 0507e7ee4..210c86431 100644 --- a/java/google/registry/tools/soy/DomainAllocate.soy +++ b/java/google/registry/tools/soy/DomainAllocate.soy @@ -17,7 +17,7 @@ /** * Domain allocate request. */ -{template .create} +{template .create stricthtml="false"} {@param name: string} {@param period: int} {@param registrant: string} diff --git a/java/google/registry/tools/soy/DomainApplicationInfo.soy b/java/google/registry/tools/soy/DomainApplicationInfo.soy index 8e93332b2..000b6b344 100644 --- a/java/google/registry/tools/soy/DomainApplicationInfo.soy +++ b/java/google/registry/tools/soy/DomainApplicationInfo.soy @@ -16,7 +16,7 @@ /** * Domain application info request */ -{template .domainapplicationinfo} +{template .domainapplicationinfo stricthtml="false"} {@param domainName: string} {@param id: string} {@param phase: string} diff --git a/java/google/registry/tools/soy/DomainCheck.soy b/java/google/registry/tools/soy/DomainCheck.soy index 8f94e62a2..9bdb264dd 100644 --- a/java/google/registry/tools/soy/DomainCheck.soy +++ b/java/google/registry/tools/soy/DomainCheck.soy @@ -17,7 +17,7 @@ /** * Domain check request */ -{template .domaincheck} +{template .domaincheck stricthtml="false"} {@param domainNames: list} diff --git a/java/google/registry/tools/soy/DomainCheckClaims.soy b/java/google/registry/tools/soy/DomainCheckClaims.soy index b8fd847b2..7e852f0c0 100644 --- a/java/google/registry/tools/soy/DomainCheckClaims.soy +++ b/java/google/registry/tools/soy/DomainCheckClaims.soy @@ -17,7 +17,7 @@ /** * Domain check claims request */ -{template .domaincheckclaims} +{template .domaincheckclaims stricthtml="false"} {@param domainNames: list} diff --git a/java/google/registry/tools/soy/DomainCheckFee.soy b/java/google/registry/tools/soy/DomainCheckFee.soy index 9dcb35e55..9bbfd35b2 100644 --- a/java/google/registry/tools/soy/DomainCheckFee.soy +++ b/java/google/registry/tools/soy/DomainCheckFee.soy @@ -17,7 +17,7 @@ /** * Domain check fee request */ -{template .domaincheckfee} +{template .domaincheckfee stricthtml="false"} {@param domainNames: list} diff --git a/java/google/registry/tools/soy/DomainCreate.soy b/java/google/registry/tools/soy/DomainCreate.soy index f859e1169..d1b6c5d12 100644 --- a/java/google/registry/tools/soy/DomainCreate.soy +++ b/java/google/registry/tools/soy/DomainCreate.soy @@ -16,7 +16,7 @@ /** * Create domain */ -{template .domaincreate} +{template .domaincreate stricthtml="false"} {@param domain: string} {@param? period: string} {@param nameservers: list} diff --git a/java/google/registry/tools/soy/DomainUpdate.soy b/java/google/registry/tools/soy/DomainUpdate.soy index 81e4b673d..6cbfc265b 100644 --- a/java/google/registry/tools/soy/DomainUpdate.soy +++ b/java/google/registry/tools/soy/DomainUpdate.soy @@ -16,7 +16,7 @@ /** * Update domain */ -{template .domainupdate} +{template .domainupdate stricthtml="false"} {@param domain: string} {@param add: bool} {@param addNameservers: list} diff --git a/java/google/registry/tools/soy/HostCreate.soy b/java/google/registry/tools/soy/HostCreate.soy index 23a2b2487..cbdda1634 100644 --- a/java/google/registry/tools/soy/HostCreate.soy +++ b/java/google/registry/tools/soy/HostCreate.soy @@ -16,7 +16,7 @@ /** * Create host */ -{template .hostcreate} +{template .hostcreate stricthtml="false"} {@param hostname: string} {@param? ipv4addresses: list} {@param? ipv6addresses: list} diff --git a/java/google/registry/tools/soy/RemoveIpAddress.soy b/java/google/registry/tools/soy/RemoveIpAddress.soy index 5a4f3b1f9..38baa99bb 100644 --- a/java/google/registry/tools/soy/RemoveIpAddress.soy +++ b/java/google/registry/tools/soy/RemoveIpAddress.soy @@ -17,7 +17,7 @@ /** * Request to remove IP addresses. */ -{template .remove_ip_address} +{template .remove_ip_address stricthtml="false"} {@param name: string} {@param ipAddresses: list>} {@param requestedByRegistrar: string} diff --git a/java/google/registry/tools/soy/UniformRapidSuspension.soy b/java/google/registry/tools/soy/UniformRapidSuspension.soy index dc74331c5..785c9ab75 100644 --- a/java/google/registry/tools/soy/UniformRapidSuspension.soy +++ b/java/google/registry/tools/soy/UniformRapidSuspension.soy @@ -17,7 +17,7 @@ /** * Uniform Rapid Suspension */ -{template .uniformrapidsuspension} +{template .uniformrapidsuspension stricthtml="false"} {@param domainName: string} {@param hostsToAdd: list} {@param hostsToRemove: list} diff --git a/java/google/registry/tools/soy/UpdateServerLocks.soy b/java/google/registry/tools/soy/UpdateServerLocks.soy index 1c2470069..339eb0e2a 100644 --- a/java/google/registry/tools/soy/UpdateServerLocks.soy +++ b/java/google/registry/tools/soy/UpdateServerLocks.soy @@ -17,7 +17,7 @@ /** * Update server locks */ -{template .updateserverlocks} +{template .updateserverlocks stricthtml="false"} {@param domainName: string} {@param locksToApply: list} {@param locksToRemove: list} diff --git a/java/google/registry/ui/soy/registrar/Contact.soy b/java/google/registry/ui/soy/registrar/Contact.soy index cc82dd836..e03dde18e 100644 --- a/java/google/registry/ui/soy/registrar/Contact.soy +++ b/java/google/registry/ui/soy/registrar/Contact.soy @@ -103,7 +103,7 @@ {param namePrefix: 'contact:postalInfo[0].contact:' /} {/call} {/if} - +
diff --git a/java/google/registry/ui/soy/registrar/ContactEpp.soy b/java/google/registry/ui/soy/registrar/ContactEpp.soy index fa895f3b7..7cbd5f7e1 100644 --- a/java/google/registry/ui/soy/registrar/ContactEpp.soy +++ b/java/google/registry/ui/soy/registrar/ContactEpp.soy @@ -22,7 +22,7 @@ * @param item * @param clTrid */ -{template .create} +{template .create stricthtml="false"} @@ -63,7 +63,7 @@ * @param item * @param clTrid */ -{template .update} +{template .update stricthtml="false"} @@ -104,7 +104,7 @@ * @param id * @param clTrid */ -{template .info} +{template .info stricthtml="false"} diff --git a/java/google/registry/ui/soy/registrar/DomainEpp.soy b/java/google/registry/ui/soy/registrar/DomainEpp.soy index 4fbc3428b..a667a170e 100644 --- a/java/google/registry/ui/soy/registrar/DomainEpp.soy +++ b/java/google/registry/ui/soy/registrar/DomainEpp.soy @@ -21,7 +21,7 @@ * @param item * @param clTrid */ -{template .create} +{template .create stricthtml="false"} @@ -61,7 +61,7 @@ * @param id * @param clTrid */ -{template .info} +{template .info stricthtml="false"} @@ -84,7 +84,7 @@ * @param? addContacts list of contact to add. * @param? remContacts list of contact to remove. */ -{template .update} +{template .update stricthtml="false"} @@ -148,7 +148,7 @@ * @param item * @param clTrid */ -{template .createSunrush} +{template .createSunrush stricthtml="false"} @@ -192,7 +192,7 @@ * @param applicationID * @param clTrid */ -{template .infoSunrush} +{template .infoSunrush stricthtml="false"} @@ -219,7 +219,7 @@ * @param item * @param clTrid */ -{template .updateSunrush} +{template .updateSunrush stricthtml="false"} diff --git a/java/google/registry/ui/soy/registrar/Epp.soy b/java/google/registry/ui/soy/registrar/Epp.soy index 50e9a354b..813f7f7f1 100644 --- a/java/google/registry/ui/soy/registrar/Epp.soy +++ b/java/google/registry/ui/soy/registrar/Epp.soy @@ -21,7 +21,7 @@ * @param pw * @param clTrid */ -{template .login} +{template .login stricthtml="false"} @@ -47,7 +47,7 @@ * Logout request. * @param clTrid */ -{template .logout} +{template .logout stricthtml="false"} diff --git a/java/google/registry/ui/soy/registrar/HostEpp.soy b/java/google/registry/ui/soy/registrar/HostEpp.soy index fc87f43aa..97685a222 100644 --- a/java/google/registry/ui/soy/registrar/HostEpp.soy +++ b/java/google/registry/ui/soy/registrar/HostEpp.soy @@ -20,7 +20,7 @@ * @param item * @param clTrid */ -{template .create} +{template .create stricthtml="false"} @@ -47,7 +47,7 @@ * @param? addAddrs list of addrs to add. * @param? remAddrs list of addrs to remove. */ -{template .update} +{template .update stricthtml="false"} @@ -79,7 +79,7 @@ * @param clTrid * @param id The hostname (named "id" to preserve component API). */ -{template .info} +{template .info stricthtml="false"}