From 448fc6ed16ad7d4f45557db0a78afebeb4cfff5c Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Fri, 16 Feb 2024 12:01:44 -0800 Subject: [PATCH 01/13] Update logic for making sure we clear out ip address field --- src/registrar/models/domain.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 7ebe3dc34..dca0693c2 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -427,7 +427,6 @@ class Domain(TimeStampedModel, DomainHelper): raise NameserverError(code=nsErrorCodes.INVALID_HOST, nameserver=nameserver) elif cls.isSubdomain(name, nameserver) and (ip is None or ip == []): raise NameserverError(code=nsErrorCodes.MISSING_IP, nameserver=nameserver) - elif not cls.isSubdomain(name, nameserver) and (ip is not None and ip != []): raise NameserverError(code=nsErrorCodes.GLUE_RECORD_NOT_ALLOWED, nameserver=nameserver, ip=ip) elif ip is not None and ip != []: @@ -1778,6 +1777,10 @@ class Domain(TimeStampedModel, DomainHelper): for cleaned_host in cleaned_hosts: # Check if the cleaned_host already exists host_in_db, host_created = Host.objects.get_or_create(domain=self, name=cleaned_host["name"]) + # Check if the nameserver is a subdomain of the current domain + # If it is NOT a subdomain, we remove the IP address + if not Domain.isSubdomain(self.name, cleaned_host["name"]): + cleaned_host["addrs"] = [] # or None # Get cleaned list of ips for update cleaned_ips = cleaned_host["addrs"] if not host_created: From 7e1c1f419ed01eee827944035cd1eaa04883ecc5 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Fri, 16 Feb 2024 16:18:17 -0800 Subject: [PATCH 02/13] Fix tests --- src/registrar/tests/common.py | 14 ++++++ src/registrar/tests/test_models_domain.py | 57 ++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 2865bf5c5..336740c02 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -691,6 +691,19 @@ class MockEppLib(TestCase): ], ex_date=datetime.date(2023, 5, 25), ) + + mockDataInfoDomainSubdomain = fakedEppObject( + "fakePw", + cr_date=make_aware(datetime.datetime(2023, 5, 25, 19, 45, 35)), + contacts=[common.DomainContact(contact="123", type=PublicContact.ContactTypeChoices.SECURITY)], + hosts=["fake.meoward.gov"], + statuses=[ + common.Status(state="serverTransferProhibited", description="", lang="en"), + common.Status(state="inactive", description="", lang="en"), + ], + ex_date=datetime.date(2023, 5, 25), + ) + mockDataExtensionDomain = fakedEppObject( "fakePw", cr_date=make_aware(datetime.datetime(2023, 5, 25, 19, 45, 35)), @@ -1083,6 +1096,7 @@ class MockEppLib(TestCase): "adomain2.gov": (self.InfoDomainWithVerisignSecurityContact, None), "defaulttechnical.gov": (self.InfoDomainWithDefaultTechnicalContact, None), "justnameserver.com": (self.justNameserver, None), + "meoward.gov": (self.mockDataInfoDomainSubdomain, None), } # Retrieve the corresponding values from the dictionary diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index 1c4d2521e..f4dea616b 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -96,7 +96,7 @@ class TestDomainCache(MockEppLib): self.mockedSendFunction.assert_has_calls(expectedCalls) - def test_cache_nested_elements(self): + def test_cache_nested_elements_not_subdomain(self): """Cache works correctly with the nested objects cache and hosts""" with less_console_noise(): domain, _ = Domain.objects.get_or_create(name="igorville.gov") @@ -113,7 +113,7 @@ class TestDomainCache(MockEppLib): } expectedHostsDict = { "name": self.mockDataInfoDomain.hosts[0], - "addrs": [item.addr for item in self.mockDataInfoHosts.addrs], + "addrs": [], # hould return empty bc fake.host.com is not a subdomain of igorville.gov "cr_date": self.mockDataInfoHosts.cr_date, } @@ -138,6 +138,59 @@ class TestDomainCache(MockEppLib): # invalidate cache domain._cache = {} + # get host + domain._get_property("hosts") + # Should return empty bc fake.host.com is not a subdomain of igorville.gov + self.assertEqual(domain._cache["hosts"], [expectedHostsDict]) + + # get contacts + domain._get_property("contacts") + self.assertEqual(domain._cache["hosts"], [expectedHostsDict]) + self.assertEqual(domain._cache["contacts"], expectedContactsDict) + + def test_cache_nested_elements_is_subdomain(self): + """Cache works correctly with the nested objects cache and hosts""" + with less_console_noise(): + domain, _ = Domain.objects.get_or_create(name="meoward.gov") + + # The contact list will initially contain objects of type 'DomainContact' + # this is then transformed into PublicContact, and cache should NOT + # hold onto the DomainContact object + expectedUnfurledContactsList = [ + common.DomainContact(contact="123", type="security"), + ] + expectedContactsDict = { + PublicContact.ContactTypeChoices.ADMINISTRATIVE: None, + PublicContact.ContactTypeChoices.SECURITY: "123", + PublicContact.ContactTypeChoices.TECHNICAL: None, + } + expectedHostsDict = { + "name": self.mockDataInfoDomainSubdomain.hosts[0], + "addrs": [item.addr for item in self.mockDataInfoHosts.addrs], + "cr_date": self.mockDataInfoHosts.cr_date, + } + + # this can be changed when the getter for contacts is implemented + domain._get_property("contacts") + + # check domain info is still correct and not overridden + self.assertEqual(domain._cache["auth_info"], self.mockDataInfoDomainSubdomain.auth_info) + self.assertEqual(domain._cache["cr_date"], self.mockDataInfoDomainSubdomain.cr_date) + + # check contacts + self.assertEqual(domain._cache["_contacts"], self.mockDataInfoDomainSubdomain.contacts) + # The contact list should not contain what is sent by the registry by default, + # as _fetch_cache will transform the type to PublicContact + self.assertNotEqual(domain._cache["contacts"], expectedUnfurledContactsList) + self.assertEqual(domain._cache["contacts"], expectedContactsDict) + + # get and check hosts is set correctly + domain._get_property("hosts") + self.assertEqual(domain._cache["hosts"], [expectedHostsDict]) + self.assertEqual(domain._cache["contacts"], expectedContactsDict) + # invalidate cache + domain._cache = {} + # get host domain._get_property("hosts") self.assertEqual(domain._cache["hosts"], [expectedHostsDict]) From a14a32159c79ce9bb72a121e6646f7d5c633c32e Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 20 Feb 2024 18:04:13 -0800 Subject: [PATCH 03/13] Add more tests in for caching, still WIP --- src/registrar/models/domain.py | 2 + src/registrar/tests/common.py | 79 +++++++++++++++++ src/registrar/tests/test_models_domain.py | 100 ++++++++++++++++++++-- 3 files changed, 173 insertions(+), 8 deletions(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index dca0693c2..f86990a5e 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1679,6 +1679,8 @@ class Domain(TimeStampedModel, DomainHelper): try: data_response = self._get_or_create_domain() cache = self._extract_data_from_response(data_response) + # print("!!! cache is") + # print(cache) cleaned = self._clean_cache(cache, data_response) self._update_hosts_and_contacts(cleaned, fetch_hosts, fetch_contacts) if fetch_hosts: diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 336740c02..2419c9687 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -704,6 +704,43 @@ class MockEppLib(TestCase): ex_date=datetime.date(2023, 5, 25), ) + mockDataInfoDomainSubdomainAndIPAddress = fakedEppObject( + "fakePw", + cr_date=make_aware(datetime.datetime(2023, 5, 25, 19, 45, 35)), + contacts=[common.DomainContact(contact="123", type=PublicContact.ContactTypeChoices.SECURITY)], + hosts=["fake.meow.gov"], + statuses=[ + common.Status(state="serverTransferProhibited", description="", lang="en"), + common.Status(state="inactive", description="", lang="en"), + ], + ex_date=datetime.date(2023, 5, 25), + addrs=[common.Ip(addr="2.0.0.8")], + ) + + mockDataInfoDomainNotSubdomainNoIP = fakedEppObject( + "fakePw", + cr_date=make_aware(datetime.datetime(2023, 5, 25, 19, 45, 35)), + contacts=[common.DomainContact(contact="123", type=PublicContact.ContactTypeChoices.SECURITY)], + hosts=["fake.meow.com"], + statuses=[ + common.Status(state="serverTransferProhibited", description="", lang="en"), + common.Status(state="inactive", description="", lang="en"), + ], + ex_date=datetime.date(2023, 5, 25), + ) + + mockDataInfoDomainSubdomainNoIP = fakedEppObject( + "fakePw", + cr_date=make_aware(datetime.datetime(2023, 5, 25, 19, 45, 35)), + contacts=[common.DomainContact(contact="123", type=PublicContact.ContactTypeChoices.SECURITY)], + hosts=["fake.subdomainwoip.gov"], + statuses=[ + common.Status(state="serverTransferProhibited", description="", lang="en"), + common.Status(state="inactive", description="", lang="en"), + ], + ex_date=datetime.date(2023, 5, 25), + ) + mockDataExtensionDomain = fakedEppObject( "fakePw", cr_date=make_aware(datetime.datetime(2023, 5, 25, 19, 45, 35)), @@ -841,6 +878,24 @@ class MockEppLib(TestCase): addrs=[common.Ip(addr="1.2.3.4"), common.Ip(addr="2.3.4.5")], ) + mockDataInfoHosts1IP = fakedEppObject( + "lastPw", + cr_date=make_aware(datetime.datetime(2023, 8, 25, 19, 45, 35)), + addrs=[common.Ip(addr="2.0.0.8")], + ) + + mockDataInfoHostsNotSubdomainNoIP = fakedEppObject( + "lastPw", + cr_date=make_aware(datetime.datetime(2023, 8, 26, 19, 45, 35)), + addrs=[], + ) + + mockDataInfoHostsSubdomainNoIP = fakedEppObject( + "lastPw", + cr_date=make_aware(datetime.datetime(2023, 8, 27, 19, 45, 35)), + addrs=[], + ) + mockDataHostChange = fakedEppObject("lastPw", cr_date=make_aware(datetime.datetime(2023, 8, 25, 19, 45, 35))) addDsData1 = { "keyTag": 1234, @@ -1002,6 +1057,8 @@ class MockEppLib(TestCase): return self.mockDeleteDomainCommands(_request, cleaned) case commands.RenewDomain: return self.mockRenewDomainCommand(_request, cleaned) + case commands.InfoHost: + return self.mockInfoHostCommmands(_request, cleaned) case _: return MagicMock(res_data=[self.mockDataInfoHosts]) @@ -1016,6 +1073,25 @@ class MockEppLib(TestCase): code=ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY, ) + # default - mock send + def mockInfoHostCommmands(self, _request, cleaned): + request_name = getattr(_request, "name", None) + + # Define a dictionary to map request names to data and extension values + request_mappings = { + "fake.meow.gov": (self.mockDataInfoHosts1IP, None), # is subdomain and has ip + "fake.meow.com": (self.mockDataInfoHostsNotSubdomainNoIP, None), # not subdomain w no ip + "fake.subdomainwoip.gov": (self.mockDataInfoHostsSubdomainNoIP, None), # subdomain w no ip + } + + # Retrieve the corresponding values from the dictionary + res_data, extensions = request_mappings.get(request_name, (self.mockDataInfoHosts, None)) # default + + return MagicMock( + res_data=[res_data], + extensions=[extensions] if extensions is not None else [], + ) + def mockUpdateHostCommands(self, _request, cleaned): test_ws_ip = common.Ip(addr="1.1. 1.1") addrs_submitted = getattr(_request, "addrs", []) @@ -1097,6 +1173,9 @@ class MockEppLib(TestCase): "defaulttechnical.gov": (self.InfoDomainWithDefaultTechnicalContact, None), "justnameserver.com": (self.justNameserver, None), "meoward.gov": (self.mockDataInfoDomainSubdomain, None), + "meow.gov": (self.mockDataInfoDomainSubdomainAndIPAddress, None), + "fakemeow.gov": (self.mockDataInfoDomainNotSubdomainNoIP, None), + "subdomainwoip.gov": (self.mockDataInfoDomainSubdomainNoIP, None), } # Retrieve the corresponding values from the dictionary diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index f4dea616b..adde4b410 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -1625,7 +1625,65 @@ class TestRegistrantNameservers(MockEppLib): self.assertEqual(nameservers[0][1], ["1.1.1.1"]) patcher.stop() - def test_nameservers_stored_on_fetch_cache(self): + # 1 - is it a subdomain and it has an ip address -- COVERED? + # 2 - is it a subdomain and it doesn't have an ip address + # 3 - no subdomain, it has an ip address -- COVERED + # 4 - no subomdina, doens't have ip address + + def test_nameservers_stored_on_fetch_cache_a_subdomain_with_ip(self): + """ + #1: It is a subdomain, and has an IP address -- referenced by mockDataInfoDomainSubdomainAndIPAddress + fake.meow.com is not a subdomain of fake.gov + """ + with less_console_noise(): + # make the domain + domain, _ = Domain.objects.get_or_create(name="meow.gov", state=Domain.State.READY) + + # mock the get_or_create methods for Host and HostIP + with patch.object(Host.objects, "get_or_create") as mock_host_get_or_create, patch.object( + HostIP.objects, "get_or_create" + ) as mock_host_ip_get_or_create: + mock_host_get_or_create.return_value = (Host(domain=domain), True) + mock_host_ip_get_or_create.return_value = (HostIP(), True) + + # force fetch_cache to be called, which will return above documented mocked hosts + domain.nameservers + + # This is never called? + mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.meow.gov") + # Retrieve the mocked_host from the return value of the mock + actual_mocked_host, _ = mock_host_get_or_create.return_value + mock_host_ip_get_or_create.assert_called_with(address="2.0.0.8", host=actual_mocked_host) + self.assertEqual(mock_host_ip_get_or_create.call_count, 1) + + def test_nameservers_stored_on_fetch_cache_a_subdomain_without_ip(self): + """ + #2: It is a subdomain, but doesn't has an IP address + """ + with less_console_noise(): + # make the domain + domain, _ = Domain.objects.get_or_create(name="subdomainwoip.gov", state=Domain.State.READY) + + # mock the get_or_create methods for Host and HostIP + # below should do it for mock_host_get_or_create and mock_host_ip_get_or_create right? + with patch.object(Host.objects, "get_or_create") as mock_host_get_or_create, patch.object( + HostIP.objects, "get_or_create" + ) as mock_host_ip_get_or_create: + mock_host_get_or_create.return_value = (Host(domain=domain), True) + mock_host_ip_get_or_create.return_value = (HostIP(), True) + + # force fetch_cache to be called, which will return above documented mocked hosts + domain.nameservers + + # This is never called? + mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.subdomainwoip.gov") + # Retrieve the mocked_host from the return value of the mock + actual_mocked_host, _ = mock_host_get_or_create.return_value + mock_host_ip_get_or_create.assert_called_with(address="", host=actual_mocked_host) + + self.assertEqual(mock_host_ip_get_or_create.call_count, 1) + + def test_nameservers_stored_on_fetch_cache_not_subdomain_with_ip(self): """ Scenario: Nameservers are stored in db when they are retrieved from fetch_cache. Verify the success of this by asserting get_or_create calls to db. @@ -1633,23 +1691,49 @@ class TestRegistrantNameservers(MockEppLib): of 'fake.host.com' from InfoDomain and an array of 2 IPs: 1.2.3.4 and 2.3.4.5 from InfoHost """ + + """ + #3: Not a subdomain, but it has an IP address returned due to how we return our defaults + fake.host.com is not a subdomain of fake.gov + """ with less_console_noise(): domain, _ = Domain.objects.get_or_create(name="fake.gov", state=Domain.State.READY) - # mock the get_or_create methods for Host and HostIP + with patch.object(Host.objects, "get_or_create") as mock_host_get_or_create, patch.object( HostIP.objects, "get_or_create" ) as mock_host_ip_get_or_create: - # Set the return value for the mocks - mock_host_get_or_create.return_value = (Host(), True) + mock_host_get_or_create.return_value = (Host(domain=domain), True) mock_host_ip_get_or_create.return_value = (HostIP(), True) + # force fetch_cache to be called, which will return above documented mocked hosts domain.nameservers - # assert that the mocks are called + # # assert that the mocks are called + mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.host.com") # Retrieve the mocked_host from the return value of the mock - actual_mocked_host, _ = mock_host_get_or_create.return_value - mock_host_ip_get_or_create.assert_called_with(address="2.3.4.5", host=actual_mocked_host) - self.assertEqual(mock_host_ip_get_or_create.call_count, 2) + mock_host_ip_get_or_create.assert_not_called() + self.assertEqual(mock_host_ip_get_or_create.call_count, 0) + + def test_nameservers_stored_on_fetch_cache_not_subdomain_without_ip(self): + """ + #4: Not a subdomain and doesn't has an IP address (not pointing to default) + referenced by self.mockDataInfoDomainNotSubdomainNoIP + """ + with less_console_noise(): + domain, _ = Domain.objects.get_or_create(name="fakemeow.gov", state=Domain.State.READY) + + with patch.object(Host.objects, "get_or_create") as mock_host_get_or_create, patch.object( + HostIP.objects, "get_or_create" + ) as mock_host_ip_get_or_create: + mock_host_get_or_create.return_value = (Host(domain=domain), True) + mock_host_ip_get_or_create.return_value = (HostIP(), True) + + # force fetch_cache to be called, which will return above documented mocked hosts + domain.nameservers + # # assert that the mocks are called + mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.meow.com") + mock_host_ip_get_or_create.assert_not_called() + self.assertEqual(mock_host_ip_get_or_create.call_count, 0) @skip("not implemented yet") def test_update_is_unsuccessful(self): From 51411f4e3ee2ad34c7bdb29b949729438bc88d7c Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 21 Feb 2024 08:57:26 -0800 Subject: [PATCH 04/13] Fix tests for diff scenarios --- src/registrar/models/domain.py | 2 -- src/registrar/tests/test_models_domain.py | 33 +++++++---------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index f86990a5e..dca0693c2 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1679,8 +1679,6 @@ class Domain(TimeStampedModel, DomainHelper): try: data_response = self._get_or_create_domain() cache = self._extract_data_from_response(data_response) - # print("!!! cache is") - # print(cache) cleaned = self._clean_cache(cache, data_response) self._update_hosts_and_contacts(cleaned, fetch_hosts, fetch_contacts) if fetch_hosts: diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index adde4b410..f4047556e 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -1625,15 +1625,10 @@ class TestRegistrantNameservers(MockEppLib): self.assertEqual(nameservers[0][1], ["1.1.1.1"]) patcher.stop() - # 1 - is it a subdomain and it has an ip address -- COVERED? - # 2 - is it a subdomain and it doesn't have an ip address - # 3 - no subdomain, it has an ip address -- COVERED - # 4 - no subomdina, doens't have ip address - def test_nameservers_stored_on_fetch_cache_a_subdomain_with_ip(self): """ - #1: It is a subdomain, and has an IP address -- referenced by mockDataInfoDomainSubdomainAndIPAddress - fake.meow.com is not a subdomain of fake.gov + #1: Nameserver is a subdomain, and has an IP address + referenced by mockDataInfoDomainSubdomainAndIPAddress """ with less_console_noise(): # make the domain @@ -1649,7 +1644,6 @@ class TestRegistrantNameservers(MockEppLib): # force fetch_cache to be called, which will return above documented mocked hosts domain.nameservers - # This is never called? mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.meow.gov") # Retrieve the mocked_host from the return value of the mock actual_mocked_host, _ = mock_host_get_or_create.return_value @@ -1658,14 +1652,14 @@ class TestRegistrantNameservers(MockEppLib): def test_nameservers_stored_on_fetch_cache_a_subdomain_without_ip(self): """ - #2: It is a subdomain, but doesn't has an IP address + #2: Nameserver is a subdomain, but doesn't have an IP address associated + referenced by mockDataInfoDomainSubdomainNoIP """ with less_console_noise(): # make the domain domain, _ = Domain.objects.get_or_create(name="subdomainwoip.gov", state=Domain.State.READY) # mock the get_or_create methods for Host and HostIP - # below should do it for mock_host_get_or_create and mock_host_ip_get_or_create right? with patch.object(Host.objects, "get_or_create") as mock_host_get_or_create, patch.object( HostIP.objects, "get_or_create" ) as mock_host_ip_get_or_create: @@ -1675,13 +1669,9 @@ class TestRegistrantNameservers(MockEppLib): # force fetch_cache to be called, which will return above documented mocked hosts domain.nameservers - # This is never called? mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.subdomainwoip.gov") - # Retrieve the mocked_host from the return value of the mock - actual_mocked_host, _ = mock_host_get_or_create.return_value - mock_host_ip_get_or_create.assert_called_with(address="", host=actual_mocked_host) - - self.assertEqual(mock_host_ip_get_or_create.call_count, 1) + mock_host_ip_get_or_create.assert_not_called() + self.assertEqual(mock_host_ip_get_or_create.call_count, 0) def test_nameservers_stored_on_fetch_cache_not_subdomain_with_ip(self): """ @@ -1690,11 +1680,9 @@ class TestRegistrantNameservers(MockEppLib): The mocked data for the EPP calls returns a host name of 'fake.host.com' from InfoDomain and an array of 2 IPs: 1.2.3.4 and 2.3.4.5 from InfoHost - """ - """ - #3: Not a subdomain, but it has an IP address returned due to how we return our defaults - fake.host.com is not a subdomain of fake.gov + #3: Nameserver is not a subdomain, but it does have an IP address returned + due to how we set up our defaults """ with less_console_noise(): domain, _ = Domain.objects.get_or_create(name="fake.gov", state=Domain.State.READY) @@ -1707,16 +1695,14 @@ class TestRegistrantNameservers(MockEppLib): # force fetch_cache to be called, which will return above documented mocked hosts domain.nameservers - # # assert that the mocks are called mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.host.com") - # Retrieve the mocked_host from the return value of the mock mock_host_ip_get_or_create.assert_not_called() self.assertEqual(mock_host_ip_get_or_create.call_count, 0) def test_nameservers_stored_on_fetch_cache_not_subdomain_without_ip(self): """ - #4: Not a subdomain and doesn't has an IP address (not pointing to default) + #4: Nameserver is not a subdomain and doesn't have an associated IP address referenced by self.mockDataInfoDomainNotSubdomainNoIP """ with less_console_noise(): @@ -1730,7 +1716,6 @@ class TestRegistrantNameservers(MockEppLib): # force fetch_cache to be called, which will return above documented mocked hosts domain.nameservers - # # assert that the mocks are called mock_host_get_or_create.assert_called_once_with(domain=domain, name="fake.meow.com") mock_host_ip_get_or_create.assert_not_called() self.assertEqual(mock_host_ip_get_or_create.call_count, 0) From 56c253f4788352ba1aaed0ae63d4cb603fa5370b Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 21 Feb 2024 09:56:13 -0800 Subject: [PATCH 05/13] Update test for domain views --- src/registrar/tests/test_views_domain.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index 2c8e796ac..bd0fe11a9 100644 --- a/src/registrar/tests/test_views_domain.py +++ b/src/registrar/tests/test_views_domain.py @@ -821,6 +821,7 @@ class TestDomainNameservers(TestDomainOverview): nameserver1 = "ns1.igorville.gov" nameserver2 = "ns2.igorville.gov" valid_ip = "1.1. 1.1" + valid_ip_2 = "2.2. 2.2" # initial nameservers page has one server with two ips # have to throw an error in order to test that the whitespace has been stripped from ip nameservers_page = self.app.get(reverse("domain-dns-nameservers", kwargs={"pk": self.domain.id})) @@ -828,7 +829,8 @@ class TestDomainNameservers(TestDomainOverview): self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) # attempt to submit the form without one host and an ip with whitespace nameservers_page.form["form-0-server"] = nameserver1 - nameservers_page.form["form-1-ip"] = valid_ip + nameservers_page.form["form-0-ip"] = valid_ip + nameservers_page.form["form-1-ip"] = valid_ip_2 nameservers_page.form["form-1-server"] = nameserver2 with less_console_noise(): # swallow log warning message result = nameservers_page.form.submit() @@ -937,15 +939,15 @@ class TestDomainNameservers(TestDomainOverview): nameserver1 = "ns1.igorville.gov" nameserver2 = "ns2.igorville.gov" valid_ip = "127.0.0.1" + valid_ip_2 = "128.0.0.2" # initial nameservers page has one server with two ips nameservers_page = self.app.get(reverse("domain-dns-nameservers", kwargs={"pk": self.domain.id})) session_id = self.app.cookies[settings.SESSION_COOKIE_NAME] self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - # attempt to submit the form without two hosts, both subdomains, - # only one has ips nameservers_page.form["form-0-server"] = nameserver1 + nameservers_page.form["form-0-ip"] = valid_ip nameservers_page.form["form-1-server"] = nameserver2 - nameservers_page.form["form-1-ip"] = valid_ip + nameservers_page.form["form-1-ip"] = valid_ip_2 with less_console_noise(): # swallow log warning message result = nameservers_page.form.submit() # form submission was a successful post, response should be a 302 From c914c36096ca7558e0b756e6a7d825749d4eb791 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 21 Feb 2024 13:01:36 -0800 Subject: [PATCH 06/13] Testing if sandbox is updating --- src/registrar/templates/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index a79065f50..918a0defd 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -13,7 +13,7 @@ {% block messages %} {% include "includes/form_messages.html" %} {% endblock %} -

Manage your domains

+

Manage your domains -- TEST TEST 123

Date: Wed, 21 Feb 2024 13:55:52 -0800 Subject: [PATCH 07/13] Remove extraneous code for deployment testing --- src/registrar/templates/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index 918a0defd..a79065f50 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -13,7 +13,7 @@ {% block messages %} {% include "includes/form_messages.html" %} {% endblock %} -

Manage your domains -- TEST TEST 123

+

Manage your domains

Date: Wed, 21 Feb 2024 14:45:26 -0800 Subject: [PATCH 08/13] Adjust comments --- src/registrar/tests/test_views_domain.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index bd0fe11a9..59b5faaa9 100644 --- a/src/registrar/tests/test_views_domain.py +++ b/src/registrar/tests/test_views_domain.py @@ -822,7 +822,6 @@ class TestDomainNameservers(TestDomainOverview): nameserver2 = "ns2.igorville.gov" valid_ip = "1.1. 1.1" valid_ip_2 = "2.2. 2.2" - # initial nameservers page has one server with two ips # have to throw an error in order to test that the whitespace has been stripped from ip nameservers_page = self.app.get(reverse("domain-dns-nameservers", kwargs={"pk": self.domain.id})) session_id = self.app.cookies[settings.SESSION_COOKIE_NAME] @@ -940,7 +939,6 @@ class TestDomainNameservers(TestDomainOverview): nameserver2 = "ns2.igorville.gov" valid_ip = "127.0.0.1" valid_ip_2 = "128.0.0.2" - # initial nameservers page has one server with two ips nameservers_page = self.app.get(reverse("domain-dns-nameservers", kwargs={"pk": self.domain.id})) session_id = self.app.cookies[settings.SESSION_COOKIE_NAME] self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) From 1447156c0c03619c6b814d0c737e138fb947df98 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 21 Feb 2024 15:19:11 -0800 Subject: [PATCH 09/13] Just going to use this as a correct deployment holder --- src/registrar/templates/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index a79065f50..945f939a4 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -13,7 +13,7 @@ {% block messages %} {% include "includes/form_messages.html" %} {% endblock %} -

Manage your domains

+

Manage your domains - TESTING TESTING 123

Date: Wed, 21 Feb 2024 15:50:55 -0800 Subject: [PATCH 10/13] Remove extra comment --- src/registrar/tests/common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 2419c9687..9ce65626a 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -1073,7 +1073,6 @@ class MockEppLib(TestCase): code=ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY, ) - # default - mock send def mockInfoHostCommmands(self, _request, cleaned): request_name = getattr(_request, "name", None) From 68d321143f71d3ff78061a28b210bc85fb340f20 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 21 Feb 2024 18:04:57 -0800 Subject: [PATCH 11/13] Testing redeployment --- src/registrar/templates/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index 945f939a4..1f4cfc13b 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -13,7 +13,7 @@ {% block messages %} {% include "includes/form_messages.html" %} {% endblock %} -

Manage your domains - TESTING TESTING 123

+

Manage your domains - TESTING TESTING 1234

Date: Thu, 22 Feb 2024 11:44:30 -0800 Subject: [PATCH 12/13] Address feedback and remove head for deployment check --- src/registrar/models/domain.py | 4 ++-- src/registrar/templates/home.html | 2 +- src/registrar/tests/common.py | 3 ++- src/registrar/tests/test_models_domain.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index dca0693c2..500bf63be 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1779,8 +1779,8 @@ class Domain(TimeStampedModel, DomainHelper): host_in_db, host_created = Host.objects.get_or_create(domain=self, name=cleaned_host["name"]) # Check if the nameserver is a subdomain of the current domain # If it is NOT a subdomain, we remove the IP address - if not Domain.isSubdomain(self.name, cleaned_host["name"]): - cleaned_host["addrs"] = [] # or None + if not Domain.isSubdomain(self.name, host_in_db.name): + cleaned_host["addrs"] = [] # Get cleaned list of ips for update cleaned_ips = cleaned_host["addrs"] if not host_created: diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index 1f4cfc13b..a79065f50 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -13,7 +13,7 @@ {% block messages %} {% include "includes/form_messages.html" %} {% endblock %} -

Manage your domains - TESTING TESTING 1234

+

Manage your domains

Date: Thu, 22 Feb 2024 11:53:56 -0800 Subject: [PATCH 13/13] Point back to cleaned host --- 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 500bf63be..7f684e327 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1779,7 +1779,7 @@ class Domain(TimeStampedModel, DomainHelper): host_in_db, host_created = Host.objects.get_or_create(domain=self, name=cleaned_host["name"]) # Check if the nameserver is a subdomain of the current domain # If it is NOT a subdomain, we remove the IP address - if not Domain.isSubdomain(self.name, host_in_db.name): + if not Domain.isSubdomain(self.name, cleaned_host["name"]): cleaned_host["addrs"] = [] # Get cleaned list of ips for update cleaned_ips = cleaned_host["addrs"]