From cb20b80d0ce0540e4006f50c37a1c2020022e97a Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:28:09 -0600 Subject: [PATCH 01/28] Update contact_error.py --- src/registrar/models/utility/contact_error.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/registrar/models/utility/contact_error.py b/src/registrar/models/utility/contact_error.py index fad928afe..f525c358b 100644 --- a/src/registrar/models/utility/contact_error.py +++ b/src/registrar/models/utility/contact_error.py @@ -2,8 +2,7 @@ from enum import IntEnum class ContactErrorCodes(IntEnum): - """ - Used in the ContactError class for + """Used in the ContactError class for error mapping. Overview of contact error codes: From 237b120d1f95c092768b53e39ba44eab928366b9 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:36:17 -0600 Subject: [PATCH 02/28] Revert changes --- src/registrar/models/domain.py | 14 ++++----- src/registrar/models/utility/contact_error.py | 30 ++++++++++++++++++- src/registrar/templates/domain_detail.html | 7 +++-- src/registrar/views/domain.py | 8 +++++ 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 59edb707a..6b7078162 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -15,7 +15,7 @@ from epplibwrapper import ( RegistryError, ErrorCode, ) -from registrar.models.utility.contact_error import ContactError +from registrar.models.utility.contact_error import ContactError, ContactErrorCodes from .utility.domain_field import DomainField from .utility.domain_helper import DomainHelper @@ -698,10 +698,10 @@ class Domain(TimeStampedModel, DomainHelper): return None if contact_type is None: - raise ContactError("contact_type is None") + raise ContactError(code=ContactErrorCodes.CONTACT_TYPE_NONE) if contact_id is None: - raise ContactError("contact_id is None") + raise ContactError(code=ContactErrorCodes.CONTACT_ID_NONE) # Since contact_id is registry_id, # check that its the right length @@ -710,14 +710,10 @@ class Domain(TimeStampedModel, DomainHelper): contact_id_length > PublicContact.get_max_id_length() or contact_id_length < 1 ): - raise ContactError( - "contact_id is of invalid length. " - "Cannot exceed 16 characters, " - f"got {contact_id} with a length of {contact_id_length}" - ) + raise ContactError(code=ContactErrorCodes.CONTACT_ID_INVALID_LENGTH) if not isinstance(contact, eppInfo.InfoContactResultData): - raise ContactError("Contact must be of type InfoContactResultData") + raise ContactError(code=ContactErrorCodes.CONTACT_INVALID_TYPE) auth_info = contact.auth_info postal_info = contact.postal_info diff --git a/src/registrar/models/utility/contact_error.py b/src/registrar/models/utility/contact_error.py index af6dca818..f525c358b 100644 --- a/src/registrar/models/utility/contact_error.py +++ b/src/registrar/models/utility/contact_error.py @@ -20,4 +20,32 @@ class ContactErrorCodes(IntEnum): class ContactError(Exception): - ... + """ + Overview of contact error codes: + - 2000 CONTACT_TYPE_NONE + - 2001 CONTACT_ID_NONE + - 2002 CONTACT_ID_INVALID_LENGTH + - 2003 CONTACT_INVALID_TYPE + - 2004 CONTACT_NOT_FOUND + """ + + # For linter + _contact_id_error = "contact_id has an invalid length. Cannot exceed 16 characters." + _contact_invalid_error = "Contact must be of type InfoContactResultData" + _contact_not_found_error = "No contact was found in cache or the registry" + _error_mapping = { + ContactErrorCodes.CONTACT_TYPE_NONE: "contact_type is None", + ContactErrorCodes.CONTACT_ID_NONE: "contact_id is None", + ContactErrorCodes.CONTACT_ID_INVALID_LENGTH: _contact_id_error, + ContactErrorCodes.CONTACT_INVALID_TYPE: _contact_invalid_error, + ContactErrorCodes.CONTACT_NOT_FOUND: _contact_not_found_error + } + + def __init__(self, *args, code=None, **kwargs): + super().__init__(*args, **kwargs) + self.code = code + if self.code in self._error_mapping: + self.message = self._error_mapping.get(self.code) + + def __str__(self): + return f"{self.message}" diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html index 6a700b393..ea3efd68c 100644 --- a/src/registrar/templates/domain_detail.html +++ b/src/registrar/templates/domain_detail.html @@ -46,8 +46,11 @@ {% include "includes/summary_item.html" with title='Your contact information' value=request.user.contact contact='true' edit_link=url %} {% url 'domain-security-email' pk=domain.id as url %} - {% include "includes/summary_item.html" with title='Security email' value=domain.security_email edit_link=url %} - + {% if security_email is not None and security_email != "dotgov@cisa.dhs.gov"%} + {% include "includes/summary_item.html" with title='Security email' value=security_email edit_link=url %} + {% else %} + {% include "includes/summary_item.html" with title='Security email' value='None provided' edit_link=url %} + {% endif %} {% url 'domain-users' pk=domain.id as url %} {% include "includes/summary_item.html" with title='User management' users='true' list=True value=domain.permissions.all edit_link=url %} diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index d8c3c80fa..8f1f2edde 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -42,6 +42,14 @@ class DomainView(DomainPermissionView): template_name = "domain_detail.html" + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + security_email = self.get_object().get_security_email() + if security_email is None or security_email == "dotgov@cisa.dhs.gov": + context["security_email"] = None + return context + context["security_email"] = security_email + return context class DomainOrgNameAddressView(DomainPermissionView, FormMixin): """Organization name and mailing address view""" From 664d9507b28c6318e37848d6477424fa180eb2dd Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:42:28 -0600 Subject: [PATCH 03/28] Black reformatting --- src/registrar/models/utility/contact_error.py | 2 +- src/registrar/views/domain.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/registrar/models/utility/contact_error.py b/src/registrar/models/utility/contact_error.py index f525c358b..cf392cb6e 100644 --- a/src/registrar/models/utility/contact_error.py +++ b/src/registrar/models/utility/contact_error.py @@ -38,7 +38,7 @@ class ContactError(Exception): ContactErrorCodes.CONTACT_ID_NONE: "contact_id is None", ContactErrorCodes.CONTACT_ID_INVALID_LENGTH: _contact_id_error, ContactErrorCodes.CONTACT_INVALID_TYPE: _contact_invalid_error, - ContactErrorCodes.CONTACT_NOT_FOUND: _contact_not_found_error + ContactErrorCodes.CONTACT_NOT_FOUND: _contact_not_found_error, } def __init__(self, *args, code=None, **kwargs): diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 8f1f2edde..0292baf5a 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -51,6 +51,7 @@ class DomainView(DomainPermissionView): context["security_email"] = security_email return context + class DomainOrgNameAddressView(DomainPermissionView, FormMixin): """Organization name and mailing address view""" From 029415974a17e7b836b1c5b7c19d535acd31b6a0 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 08:25:25 -0600 Subject: [PATCH 04/28] Store default email in a variable --- src/registrar/templates/domain_detail.html | 2 +- src/registrar/views/domain.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html index ea3efd68c..bcf775fe5 100644 --- a/src/registrar/templates/domain_detail.html +++ b/src/registrar/templates/domain_detail.html @@ -46,7 +46,7 @@ {% include "includes/summary_item.html" with title='Your contact information' value=request.user.contact contact='true' edit_link=url %} {% url 'domain-security-email' pk=domain.id as url %} - {% if security_email is not None and security_email != "dotgov@cisa.dhs.gov"%} + {% if security_email is not None and security_email != default_security_email%} {% include "includes/summary_item.html" with title='Security email' value=security_email edit_link=url %} {% else %} {% include "includes/summary_item.html" with title='Security email' value='None provided' edit_link=url %} diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 0292baf5a..7ffc3fa53 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -44,8 +44,12 @@ class DomainView(DomainPermissionView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + + default_email = Domain().get_default_security_contact().email + context["default_security_email"] = default_email + security_email = self.get_object().get_security_email() - if security_email is None or security_email == "dotgov@cisa.dhs.gov": + if security_email is None or security_email == default_email: context["security_email"] = None return context context["security_email"] = security_email From a58cff839835445ddb016106d5aaa04cbf8efcef Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 08:47:18 -0600 Subject: [PATCH 05/28] Update content --- src/registrar/admin.py | 3 ++- .../templates/django/admin/domain_change_form.html | 6 +++--- src/registrar/tests/test_admin.py | 14 +++++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 275f67bb3..cec84fd01 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -784,7 +784,8 @@ class DomainAdmin(ListHeaderAdmin): else: self.message_user( request, - ("Domain statuses are %s" ". Thanks!") % statuses, + f"The registry statuses are {statuses}. " + "These statuses are from the EPP provider of the .gov registry." ) return HttpResponseRedirect(".") diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html index ac26fc922..2ed3d7532 100644 --- a/src/registrar/templates/django/admin/domain_change_form.html +++ b/src/registrar/templates/django/admin/domain_change_form.html @@ -13,10 +13,10 @@ {% elif original.state == original.State.ON_HOLD %} {% endif %} - - + + {% if original.state != original.State.DELETED %} - + {% endif %} {{ block.super }} diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index def475536..a317bdf3b 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -108,12 +108,12 @@ class TestDomainAdmin(MockEppLib): ) self.assertEqual(response.status_code, 200) self.assertContains(response, domain.name) - self.assertContains(response, "Delete Domain in Registry") + self.assertContains(response, "Delete domain in registry") # Test the info dialog request = self.factory.post( "/admin/registrar/domain/{}/change/".format(domain.pk), - {"_delete_domain": "Delete Domain in Registry", "name": domain.name}, + {"_delete_domain": "Delete domain in registry", "name": domain.name}, follow=True, ) request.user = self.client @@ -148,12 +148,12 @@ class TestDomainAdmin(MockEppLib): ) self.assertEqual(response.status_code, 200) self.assertContains(response, domain.name) - self.assertContains(response, "Delete Domain in Registry") + self.assertContains(response, "Delete domain in registry") # Test the error request = self.factory.post( "/admin/registrar/domain/{}/change/".format(domain.pk), - {"_delete_domain": "Delete Domain in Registry", "name": domain.name}, + {"_delete_domain": "Delete domain in registry", "name": domain.name}, follow=True, ) request.user = self.client @@ -193,12 +193,12 @@ class TestDomainAdmin(MockEppLib): ) self.assertEqual(response.status_code, 200) self.assertContains(response, domain.name) - self.assertContains(response, "Delete Domain in Registry") + self.assertContains(response, "Delete domain in registry") # Test the info dialog request = self.factory.post( "/admin/registrar/domain/{}/change/".format(domain.pk), - {"_delete_domain": "Delete Domain in Registry", "name": domain.name}, + {"_delete_domain": "Delete domain in registry", "name": domain.name}, follow=True, ) request.user = self.client @@ -220,7 +220,7 @@ class TestDomainAdmin(MockEppLib): # Test the info dialog request = self.factory.post( "/admin/registrar/domain/{}/change/".format(domain.pk), - {"_delete_domain": "Delete Domain in Registry", "name": domain.name}, + {"_delete_domain": "Delete domain in registry", "name": domain.name}, follow=True, ) request.user = self.client From af39441df4e435146c7ae1696c9e95be3fa15a8f Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 08:58:46 -0600 Subject: [PATCH 06/28] Lint --- src/registrar/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index cec84fd01..5450d94ab 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -785,7 +785,7 @@ class DomainAdmin(ListHeaderAdmin): self.message_user( request, f"The registry statuses are {statuses}. " - "These statuses are from the EPP provider of the .gov registry." + "These statuses are from the provider of the .gov registry.", ) return HttpResponseRedirect(".") From c902d08aae6be4a245758e1c65b119855563b102 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:49:38 -0600 Subject: [PATCH 07/28] Sanity tests --- src/registrar/tests/test_models_domain.py | 55 +++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index 50456c2d5..c2b956cf6 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -16,6 +16,7 @@ from registrar.models.domain_information import DomainInformation from registrar.models.draft_domain import DraftDomain from registrar.models.public_contact import PublicContact from registrar.models.user import User +from registrar.models.utility.contact_error import ContactError, ContactErrorCodes from .common import MockEppLib from django_fsm import TransitionNotAllowed # type: ignore from epplibwrapper import ( @@ -193,6 +194,60 @@ class TestDomainCache(MockEppLib): self.assertEqual(cached_contact, in_db.registry_id) self.assertEqual(domain.security_contact.email, "123test@mail.gov") + def test_errors_map_epp_contact_to_public_contact(self): + """ + Scenario: Registrant gets invalid data from EPPLib + When the `map_epp_contact_to_public_contact` function + gets invalid data from EPPLib + Then the function throws the expected ContactErrors + """ + domain, _ = Domain.objects.get_or_create(name="registry.gov") + fakedEpp = self.fakedEppObject() + invalid_length = fakedEpp.dummyInfoContactResultData( + "Cymaticsisasubsetofmodalvibrationalphenomena", + "lengthInvalid@mail.gov" + ) + valid_object = fakedEpp.dummyInfoContactResultData( + "valid", + "valid@mail.gov" + ) + + desired_error = ContactErrorCodes.CONTACT_ID_INVALID_LENGTH + with self.assertRaises(ContactError) as context: + domain.map_epp_contact_to_public_contact( + invalid_length, + invalid_length.id, + PublicContact.ContactTypeChoices.SECURITY, + ) + self.assertEqual(context.exception.code, desired_error) + + desired_error = ContactErrorCodes.CONTACT_ID_NONE + with self.assertRaises(ContactError) as context: + domain.map_epp_contact_to_public_contact( + valid_object, + None, + PublicContact.ContactTypeChoices.SECURITY, + ) + self.assertEqual(context.exception.code, desired_error) + + desired_error = ContactErrorCodes.CONTACT_INVALID_TYPE + with self.assertRaises(ContactError) as context: + domain.map_epp_contact_to_public_contact( + "bad_object", + valid_object.id, + PublicContact.ContactTypeChoices.SECURITY, + ) + self.assertEqual(context.exception.code, desired_error) + + desired_error = ContactErrorCodes.CONTACT_TYPE_NONE + with self.assertRaises(ContactError) as context: + domain.map_epp_contact_to_public_contact( + valid_object, + valid_object.id, + None, + ) + self.assertEqual(context.exception.code, desired_error) + class TestDomainCreation(MockEppLib): """Rule: An approved domain application must result in a domain""" From b9022b622cc7aa8068467814d2276ac0fc7ca9bd Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:53:50 -0600 Subject: [PATCH 08/28] Linting --- src/registrar/tests/test_models_domain.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index c2b956cf6..46a6de004 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -204,13 +204,9 @@ class TestDomainCache(MockEppLib): domain, _ = Domain.objects.get_or_create(name="registry.gov") fakedEpp = self.fakedEppObject() invalid_length = fakedEpp.dummyInfoContactResultData( - "Cymaticsisasubsetofmodalvibrationalphenomena", - "lengthInvalid@mail.gov" - ) - valid_object = fakedEpp.dummyInfoContactResultData( - "valid", - "valid@mail.gov" + "Cymaticsisasubsetofmodalvibrationalphenomena", "lengthInvalid@mail.gov" ) + valid_object = fakedEpp.dummyInfoContactResultData("valid", "valid@mail.gov") desired_error = ContactErrorCodes.CONTACT_ID_INVALID_LENGTH with self.assertRaises(ContactError) as context: From 8f349aa19ccec1c7a295327393202b4ab8fff688 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:29:05 -0600 Subject: [PATCH 09/28] Update domain.py --- src/registrar/models/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 59edb707a..85606ba88 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -718,7 +718,7 @@ class Domain(TimeStampedModel, DomainHelper): if not isinstance(contact, eppInfo.InfoContactResultData): raise ContactError("Contact must be of type InfoContactResultData") - + # temp comment for push - will remove auth_info = contact.auth_info postal_info = contact.postal_info addr = postal_info.addr From abbcf315eed58dd40f944a64b8f66c7cb6be53e9 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:01:23 -0600 Subject: [PATCH 10/28] Update admin.py --- src/registrar/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 275f67bb3..622934382 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -141,7 +141,7 @@ class MyUserAdmin(BaseUserAdmin): "is_superuser", "status", ) - + # Temp comment for deploy to sandbox - will remove fieldsets = ( ( None, From 545a5d80a6037439ba46622ea440e281b5a48411 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:12:41 -0600 Subject: [PATCH 11/28] Remove temp comment --- src/registrar/admin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 622934382..5b23a6128 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -141,7 +141,6 @@ class MyUserAdmin(BaseUserAdmin): "is_superuser", "status", ) - # Temp comment for deploy to sandbox - will remove fieldsets = ( ( None, From bd90b9a97469b2a0676e21bc9ca8d57ecdf203ea Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:13:01 -0700 Subject: [PATCH 12/28] Rename Domain Nameservers page title --- src/registrar/templates/domain_nameservers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html index 2dabac1af..eddb77dca 100644 --- a/src/registrar/templates/domain_nameservers.html +++ b/src/registrar/templates/domain_nameservers.html @@ -9,7 +9,7 @@ {% include "includes/form_errors.html" with form=form %} {% endfor %} -

Domain name servers

+

DNS name servers

Before your domain can be used we'll need information about your domain name servers.

From 611242b74af7c6066468ffcf6d95b01da463e449 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:13:44 -0700 Subject: [PATCH 13/28] Rename Contact Information page title --- src/registrar/templates/domain_your_contact_information.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_your_contact_information.html b/src/registrar/templates/domain_your_contact_information.html index 81c62584c..b776e59c2 100644 --- a/src/registrar/templates/domain_your_contact_information.html +++ b/src/registrar/templates/domain_your_contact_information.html @@ -5,7 +5,7 @@ {% block domain_content %} -

Domain contact information

+

Your contact information

If you’d like us to use a different name, email, or phone number you can make those changes below. Updating your contact information here will update the contact information for all domains in your account. However, it won’t affect your Login.gov account information.

From 687f369d18828a25cf57f12d0b29e11d893939ae Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:14:27 -0700 Subject: [PATCH 14/28] Rename Security Email page title --- src/registrar/templates/domain_security_email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 8175fa394..341312ae7 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -5,7 +5,7 @@ {% block domain_content %} -

Domain security email

+

Security email

We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

From 8c6b4f51e888341613aae1e12e2743b1991f2189 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:30:39 -0700 Subject: [PATCH 15/28] Rename block titles --- src/registrar/templates/domain_nameservers.html | 2 +- src/registrar/templates/domain_security_email.html | 2 +- src/registrar/templates/domain_your_contact_information.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html index eddb77dca..a7371ee0b 100644 --- a/src/registrar/templates/domain_nameservers.html +++ b/src/registrar/templates/domain_nameservers.html @@ -1,7 +1,7 @@ {% extends "domain_base.html" %} {% load static field_helpers%} -{% block title %}Domain name servers | {{ domain.name }} | {% endblock %} +{% block title %}DNS name servers | {{ domain.name }} | {% endblock %} {% block domain_content %} {# this is right after the messages block in the parent template #} diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 341312ae7..cb3af5725 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -1,7 +1,7 @@ {% extends "domain_base.html" %} {% load static field_helpers url_helpers %} -{% block title %}Domain security email | {{ domain.name }} | {% endblock %} +{% block title %}Security email | {{ domain.name }} | {% endblock %} {% block domain_content %} diff --git a/src/registrar/templates/domain_your_contact_information.html b/src/registrar/templates/domain_your_contact_information.html index b776e59c2..e2cad735f 100644 --- a/src/registrar/templates/domain_your_contact_information.html +++ b/src/registrar/templates/domain_your_contact_information.html @@ -1,7 +1,7 @@ {% extends "domain_base.html" %} {% load static field_helpers %} -{% block title %}Domain contact information | {{ domain.name }} | {% endblock %} +{% block title %}Your contact information | {{ domain.name }} | {% endblock %} {% block domain_content %} From 6a53a4a76b068c3891ab45662168e259d798dee0 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:38:08 -0700 Subject: [PATCH 16/28] Update tests --- src/registrar/tests/test_views.py | 10 +++++----- ~ | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 ~ diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 68aaf0ed8..2194b42db 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -1309,7 +1309,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): page = self.client.get( reverse("domain-nameservers", kwargs={"pk": self.domain.id}) ) - self.assertContains(page, "Domain name servers") + self.assertContains(page, "DNS name servers") @skip("Broken by adding registry connection fix in ticket 848") def test_domain_nameservers_form(self): @@ -1414,7 +1414,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): page = self.client.get( reverse("domain-your-contact-information", kwargs={"pk": self.domain.id}) ) - self.assertContains(page, "Domain contact information") + self.assertContains(page, "Your contact information") def test_domain_your_contact_information_content(self): """Logged-in user's contact information appears on the page.""" @@ -1439,7 +1439,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): ) # Loads correctly - self.assertContains(page, "Domain security email") + self.assertContains(page, "Security email") self.assertContains(page, "security@mail.gov") self.mockSendPatch.stop() @@ -1455,7 +1455,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): ) # Loads correctly - self.assertContains(page, "Domain security email") + self.assertContains(page, "Security email") self.assertNotContains(page, "dotgov@cisa.dhs.gov") self.mockSendPatch.stop() @@ -1464,7 +1464,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): page = self.client.get( reverse("domain-security-email", kwargs={"pk": self.domain.id}) ) - self.assertContains(page, "Domain security email") + self.assertContains(page, "Security email") def test_domain_security_email_form(self): """Adding a security email works. diff --git a/~ b/~ new file mode 100644 index 000000000..88f4c565d --- /dev/null +++ b/~ @@ -0,0 +1,6 @@ +GPG_TTY=$(tty) +export GPG_TTY + + #Add RVM to PATH for scripting. Make sure this is the last PATH variable change + +export PATH="$PATH:$HOME/.rvm/bin" From c99588687f26d2fc199ea22c08c1109edd28fe58 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:40:42 -0700 Subject: [PATCH 17/28] Remove ~ --- ~ | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 ~ diff --git a/~ b/~ deleted file mode 100644 index 88f4c565d..000000000 --- a/~ +++ /dev/null @@ -1,6 +0,0 @@ -GPG_TTY=$(tty) -export GPG_TTY - - #Add RVM to PATH for scripting. Make sure this is the last PATH variable change - -export PATH="$PATH:$HOME/.rvm/bin" From 8da6578b46c605634c1c39d40b14f98e0147168c Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:57:59 -0600 Subject: [PATCH 18/28] Let email field be null --- src/registrar/forms/domain.py | 2 +- src/registrar/models/domain.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py index f14448bcf..2f9aa1976 100644 --- a/src/registrar/forms/domain.py +++ b/src/registrar/forms/domain.py @@ -64,7 +64,7 @@ class DomainSecurityEmailForm(forms.Form): """Form for adding or editing a security email to a domain.""" - security_email = forms.EmailField(label="Security email") + security_email = forms.EmailField(label="Security email", required=False) class DomainOrgNameAddressForm(forms.ModelForm): diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 6b7078162..91f4299e5 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -625,7 +625,10 @@ class Domain(TimeStampedModel, DomainHelper): def get_security_email(self): logger.info("get_security_email-> getting the contact ") secContact = self.security_contact - return secContact.email + if secContact is not None: + return secContact.email + else: + return None def clientHoldStatus(self): return epp.Status(state=self.Status.CLIENT_HOLD, description="", lang="en") From 3625fc092759599a589db2e179ff8c2c48ce616d Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:27:16 -0600 Subject: [PATCH 19/28] Add delete functionality for sec email --- src/registrar/views/domain.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 7ffc3fa53..276895799 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -21,6 +21,7 @@ from registrar.models import ( User, UserDomainRole, ) +from registrar.models.public_contact import PublicContact from ..forms import ( ContactForm, @@ -297,7 +298,11 @@ class DomainSecurityEmailView(DomainPermissionView, FormMixin): """The form is valid, call setter in model.""" # Set the security email from the form - new_email = form.cleaned_data.get("security_email", "") + new_email: str = form.cleaned_data.get("security_email", "") + + # If we pass nothing for the sec email, set to the default + if new_email is None or new_email.strip() == "": + new_email = PublicContact.get_default_security().email domain = self.get_object() contact = domain.security_contact From 7f34a389f43cac815a7129bca6243cbd65ac978b Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:59:51 -0600 Subject: [PATCH 20/28] Remove required field text --- src/registrar/templates/domain_security_email.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 8175fa394..aac8abc84 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -11,8 +11,6 @@

A security contact should be capable of evaluating or triaging security reports for your entire domain. Use a team email address, not an individual’s email. We recommend using an alias, like security@domain.gov.

- {% include "includes/required_fields.html" %} -
{% csrf_token %} From acd804b548fc5ee416cb7469751d46acb954d0d9 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 10 Oct 2023 08:53:24 -0600 Subject: [PATCH 21/28] Fix bug with the DELETED state --- src/registrar/models/domain.py | 45 ++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 91f4299e5..3fd0b0997 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -880,8 +880,8 @@ class Domain(TimeStampedModel, DomainHelper): return self._handle_registrant_contact(desired_contact) - _registry_id: str - if contact_type in contacts: + _registry_id: str = "" + if contacts is not None and contact_type in contacts: _registry_id = contacts.get(contact_type) desired = PublicContact.objects.filter( @@ -1293,6 +1293,47 @@ class Domain(TimeStampedModel, DomainHelper): except RegistryError as e: logger.error(e) + except TransitionNotAllowed: + # Fixes a bug with _fetch_cache trying to create + # a deleted domain, as cache gets cleared on delete. + # Instead, serve what we have locally. + if self.state == self.State.DELETED: + logger.warning("Attempted to create a deleted domain") + data = self._cache + choices = PublicContact.ContactTypeChoices + contacts_dict = { + choices.ADMINISTRATIVE: None, + choices.SECURITY: None, + choices.TECHNICAL: None, + } + registrant_id = ... + existing_contacts = PublicContact.objects.filter( + domain=self + ) + if existing_contacts.count() > 0: + for choice in contacts_dict: + contacts_dict[choice] = existing_contacts.get(contact_type=choice).registry_id + # Edge case for registrant + registrant = PublicContact.ContactTypeChoices.REGISTRANT + registrant_id = existing_contacts.get(contact_type=registrant).registry_id + + cache = { + "auth_info": getattr(data, "auth_info", ...), + "contacts": getattr(data, "contacts", contacts_dict), + "cr_date": getattr(data, "cr_date", ...), + "ex_date": getattr(data, "ex_date", ...), + "hosts": getattr(data, "hosts", ...), + "name": getattr(data, "name", self.name), + "registrant": getattr(data, "name", registrant_id), + "statuses": getattr(data, "statuses", ...), + "tr_date": getattr(data, "tr_date", ...), + "up_date": getattr(data, "up_date", ...), + } + cleaned = {k: v for k, v in cache.items() if v is not ...} + + self._cache = cleaned + + def _get_or_create_public_contact(self, public_contact: PublicContact): """Tries to find a PublicContact object in our DB. If it can't, it'll create it. Returns PublicContact""" From e6c44b2d9b27ff1d27557cc128ce138665b79ed2 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:29:55 -0600 Subject: [PATCH 22/28] Suggestions --- src/registrar/models/domain.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 3fd0b0997..ec2c92824 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1293,7 +1293,7 @@ class Domain(TimeStampedModel, DomainHelper): except RegistryError as e: logger.error(e) - except TransitionNotAllowed: + except TransitionNotAllowed as err: # Fixes a bug with _fetch_cache trying to create # a deleted domain, as cache gets cleared on delete. # Instead, serve what we have locally. @@ -1332,6 +1332,8 @@ class Domain(TimeStampedModel, DomainHelper): cleaned = {k: v for k, v in cache.items() if v is not ...} self._cache = cleaned + else: + raise err def _get_or_create_public_contact(self, public_contact: PublicContact): From f334e516f1aaeded8d3b87aa7fdee551c0ef5659 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:41:34 -0600 Subject: [PATCH 23/28] Add a failure message when there is no EPP connection --- src/registrar/views/domain.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 276895799..f30014269 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -306,6 +306,15 @@ class DomainSecurityEmailView(DomainPermissionView, FormMixin): domain = self.get_object() contact = domain.security_contact + + # If no default is created for security_contact, + # then we cannot connect to EPPLib. + if contact is None: + messages.error( + self.request, "Update failed. Cannot contact the registry." + ) + return redirect(self.get_success_url()) + contact.email = new_email contact.save() From 3c33b079f1e9a28fd911d7ac856bf0d955971568 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:11:51 -0600 Subject: [PATCH 24/28] Removed comment --- src/registrar/models/domain.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 85606ba88..82f2c2cf4 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -718,7 +718,6 @@ class Domain(TimeStampedModel, DomainHelper): if not isinstance(contact, eppInfo.InfoContactResultData): raise ContactError("Contact must be of type InfoContactResultData") - # temp comment for push - will remove auth_info = contact.auth_info postal_info = contact.postal_info addr = postal_info.addr From 13e966fbca1da47a93b91d2c0554e8d0462b7c4f Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:26:59 -0600 Subject: [PATCH 25/28] Linter --- src/registrar/models/domain.py | 16 +++++++++------- src/registrar/views/domain.py | 4 +--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index ec2c92824..ff7dcbfd0 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1307,15 +1307,17 @@ class Domain(TimeStampedModel, DomainHelper): choices.TECHNICAL: None, } registrant_id = ... - existing_contacts = PublicContact.objects.filter( - domain=self - ) + existing_contacts = PublicContact.objects.filter(domain=self) if existing_contacts.count() > 0: for choice in contacts_dict: - contacts_dict[choice] = existing_contacts.get(contact_type=choice).registry_id + contacts_dict[choice] = existing_contacts.get( + contact_type=choice + ).registry_id # Edge case for registrant registrant = PublicContact.ContactTypeChoices.REGISTRANT - registrant_id = existing_contacts.get(contact_type=registrant).registry_id + registrant_id = existing_contacts.get( + contact_type=registrant + ).registry_id cache = { "auth_info": getattr(data, "auth_info", ...), @@ -1324,7 +1326,7 @@ class Domain(TimeStampedModel, DomainHelper): "ex_date": getattr(data, "ex_date", ...), "hosts": getattr(data, "hosts", ...), "name": getattr(data, "name", self.name), - "registrant": getattr(data, "name", registrant_id), + "registrant": getattr(data, "name", registrant_id), "statuses": getattr(data, "statuses", ...), "tr_date": getattr(data, "tr_date", ...), "up_date": getattr(data, "up_date", ...), @@ -1333,9 +1335,9 @@ class Domain(TimeStampedModel, DomainHelper): self._cache = cleaned else: + logger.error("Unknown TransitionNotAllowed exception") raise err - def _get_or_create_public_contact(self, public_contact: PublicContact): """Tries to find a PublicContact object in our DB. If it can't, it'll create it. Returns PublicContact""" diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index f30014269..710e76e6b 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -310,9 +310,7 @@ class DomainSecurityEmailView(DomainPermissionView, FormMixin): # If no default is created for security_contact, # then we cannot connect to EPPLib. if contact is None: - messages.error( - self.request, "Update failed. Cannot contact the registry." - ) + messages.error(self.request, "Update failed. Cannot contact the registry.") return redirect(self.get_success_url()) contact.email = new_email From 76e3e2eaeaee25c0a4d0816b76a9170bdc83d737 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 11 Oct 2023 07:48:44 -0600 Subject: [PATCH 26/28] Removed deleted bug fix --- src/registrar/admin.py | 2 ++ src/registrar/models/domain.py | 44 ---------------------------------- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 9f24df1c1..174500f28 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -138,6 +138,8 @@ class MyUserAdmin(BaseUserAdmin): "email", "first_name", "last_name", + # Group is a custom property defined within this file, + # rather than in a model like the other properties "group", "status", ) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index ff7dcbfd0..db7a92928 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1293,50 +1293,6 @@ class Domain(TimeStampedModel, DomainHelper): except RegistryError as e: logger.error(e) - except TransitionNotAllowed as err: - # Fixes a bug with _fetch_cache trying to create - # a deleted domain, as cache gets cleared on delete. - # Instead, serve what we have locally. - if self.state == self.State.DELETED: - logger.warning("Attempted to create a deleted domain") - data = self._cache - choices = PublicContact.ContactTypeChoices - contacts_dict = { - choices.ADMINISTRATIVE: None, - choices.SECURITY: None, - choices.TECHNICAL: None, - } - registrant_id = ... - existing_contacts = PublicContact.objects.filter(domain=self) - if existing_contacts.count() > 0: - for choice in contacts_dict: - contacts_dict[choice] = existing_contacts.get( - contact_type=choice - ).registry_id - # Edge case for registrant - registrant = PublicContact.ContactTypeChoices.REGISTRANT - registrant_id = existing_contacts.get( - contact_type=registrant - ).registry_id - - cache = { - "auth_info": getattr(data, "auth_info", ...), - "contacts": getattr(data, "contacts", contacts_dict), - "cr_date": getattr(data, "cr_date", ...), - "ex_date": getattr(data, "ex_date", ...), - "hosts": getattr(data, "hosts", ...), - "name": getattr(data, "name", self.name), - "registrant": getattr(data, "name", registrant_id), - "statuses": getattr(data, "statuses", ...), - "tr_date": getattr(data, "tr_date", ...), - "up_date": getattr(data, "up_date", ...), - } - cleaned = {k: v for k, v in cache.items() if v is not ...} - - self._cache = cleaned - else: - logger.error("Unknown TransitionNotAllowed exception") - raise err def _get_or_create_public_contact(self, public_contact: PublicContact): """Tries to find a PublicContact object in our DB. From 4413a218a5936d3410f01a063e461f77713cb584 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 11 Oct 2023 07:56:53 -0600 Subject: [PATCH 27/28] Update src/registrar/views/domain.py Co-authored-by: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com> --- src/registrar/views/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 710e76e6b..4ea3d2fbc 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -308,7 +308,7 @@ class DomainSecurityEmailView(DomainPermissionView, FormMixin): contact = domain.security_contact # If no default is created for security_contact, - # then we cannot connect to EPPLib. + # then we cannot connect to the registry. if contact is None: messages.error(self.request, "Update failed. Cannot contact the registry.") return redirect(self.get_success_url()) From 509ab977625900f2257b3eb8e1f9b901fcb54513 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 11 Oct 2023 08:53:02 -0600 Subject: [PATCH 28/28] Update domain.py --- src/registrar/models/domain.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index db7a92928..649eaed07 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1293,7 +1293,6 @@ class Domain(TimeStampedModel, DomainHelper): except RegistryError as e: logger.error(e) - def _get_or_create_public_contact(self, public_contact: PublicContact): """Tries to find a PublicContact object in our DB. If it can't, it'll create it. Returns PublicContact"""