Add an IP address only when your name server's address includes your domain name (e.g., if your domain name is “example.gov” and your name server is “ns1.example.gov,” then an IP address is required). Multiple IP addresses must be separated with commas.
This step is uncommon unless you self-host your DNS or use custom addresses for your nameserver.
diff --git a/src/registrar/tests/data/test_domain_statuses.txt b/src/registrar/tests/data/test_domain_statuses.txt
index a5377f5fd..53342906d 100644
--- a/src/registrar/tests/data/test_domain_statuses.txt
+++ b/src/registrar/tests/data/test_domain_statuses.txt
@@ -2,4 +2,4 @@ Anomaly.gov|muahaha|
TestDomain.gov|ok|
FakeWebsite1.gov|serverHold|
FakeWebsite2.gov|Hold|
-FakeWebsite3.gov|ok|
\ No newline at end of file
+FakeWebsite3.gov|unknown|
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index bff27a83d..526a9ea2a 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -13,6 +13,7 @@ from registrar.admin import (
MyUserAdmin,
AuditedAdmin,
ContactAdmin,
+ UserDomainRoleAdmin,
)
from registrar.models import (
Domain,
@@ -21,6 +22,7 @@ from registrar.models import (
User,
DomainInvitation,
)
+from registrar.models.user_domain_role import UserDomainRole
from .common import (
completed_application,
generic_domain_object,
@@ -886,6 +888,86 @@ class DomainInvitationAdminTest(TestCase):
self.assertContains(response, retrieved_html, count=1)
+class UserDomainRoleAdminTest(TestCase):
+ def setUp(self):
+ """Setup environment for a mock admin user"""
+ self.site = AdminSite()
+ self.factory = RequestFactory()
+ self.admin = ListHeaderAdmin(model=UserDomainRoleAdmin, admin_site=None)
+ self.client = Client(HTTP_HOST="localhost:8080")
+ self.superuser = create_superuser()
+
+ def tearDown(self):
+ """Delete all Users, Domains, and UserDomainRoles"""
+ User.objects.all().delete()
+ Domain.objects.all().delete()
+ UserDomainRole.objects.all().delete()
+
+ def test_email_not_in_search(self):
+ """Tests the search bar in Django Admin for UserDomainRoleAdmin.
+ Should return no results for an invalid email."""
+ # Have to get creative to get past linter
+ p = "adminpass"
+ self.client.login(username="superuser", password=p)
+
+ fake_user = User.objects.create(
+ username="dummyuser", first_name="Stewart", last_name="Jones", email="AntarcticPolarBears@example.com"
+ )
+ fake_domain = Domain.objects.create(name="test123")
+ UserDomainRole.objects.create(user=fake_user, domain=fake_domain, role="manager")
+ # Make the request using the Client class
+ # which handles CSRF
+ # Follow=True handles the redirect
+ response = self.client.get(
+ "/admin/registrar/userdomainrole/",
+ {
+ "q": "testmail@igorville.com",
+ },
+ follow=True,
+ )
+
+ # Assert that the query is added to the extra_context
+ self.assertIn("search_query", response.context)
+ # Assert the content of filters and search_query
+ search_query = response.context["search_query"]
+ self.assertEqual(search_query, "testmail@igorville.com")
+
+ # We only need to check for the end of the HTML string
+ self.assertNotContains(response, "Stewart Jones AntarcticPolarBears@example.com")
+
+ def test_email_in_search(self):
+ """Tests the search bar in Django Admin for UserDomainRoleAdmin.
+ Should return results for an valid email."""
+ # Have to get creative to get past linter
+ p = "adminpass"
+ self.client.login(username="superuser", password=p)
+
+ fake_user = User.objects.create(
+ username="dummyuser", first_name="Joe", last_name="Jones", email="AntarcticPolarBears@example.com"
+ )
+ fake_domain = Domain.objects.create(name="fake")
+ UserDomainRole.objects.create(user=fake_user, domain=fake_domain, role="manager")
+ # Make the request using the Client class
+ # which handles CSRF
+ # Follow=True handles the redirect
+ response = self.client.get(
+ "/admin/registrar/userdomainrole/",
+ {
+ "q": "AntarcticPolarBears@example.com",
+ },
+ follow=True,
+ )
+
+ # Assert that the query is added to the extra_context
+ self.assertIn("search_query", response.context)
+
+ search_query = response.context["search_query"]
+ self.assertEqual(search_query, "AntarcticPolarBears@example.com")
+
+ # We only need to check for the end of the HTML string
+ self.assertContains(response, "Joe Jones AntarcticPolarBears@example.com", count=1)
+
+
class ListHeaderAdminTest(TestCase):
def setUp(self):
self.site = AdminSite()
diff --git a/src/registrar/tests/test_transition_domain_migrations.py b/src/registrar/tests/test_transition_domain_migrations.py
index 91625207d..4e549bdd6 100644
--- a/src/registrar/tests/test_transition_domain_migrations.py
+++ b/src/registrar/tests/test_transition_domain_migrations.py
@@ -193,6 +193,17 @@ class TestOrganizationMigration(TestCase):
self.assertEqual(transition, expected_transition_domain)
+ def test_transition_domain_status_unknown(self):
+ """
+ Test that a domain in unknown status can be loaded
+ """ # noqa - E501 (harder to read)
+ # == First, parse all existing data == #
+ self.run_load_domains()
+ self.run_transfer_domains()
+
+ domain_object = Domain.objects.get(name="fakewebsite3.gov")
+ self.assertEqual(domain_object.state, Domain.State.UNKNOWN)
+
def test_load_organization_data_domain_information(self):
"""
This test verifies the functionality of the load_organization_data method.
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 6599a2436..32c24817c 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -144,6 +144,18 @@ class DomainApplicationTests(TestWithUser, WebTest):
result = page.form.submit()
self.assertIn("What kind of U.S.-based government organization do you represent?", result)
+ def test_application_multiple_applications_exist(self):
+ """Test that an info message appears when user has multiple applications already"""
+ # create and submit an application
+ application = completed_application(user=self.user)
+ application.submit()
+ application.save()
+
+ # now, attempt to create another one
+ with less_console_noise():
+ page = self.app.get("/register/").follow()
+ self.assertContains(page, "You cannot submit this request yet")
+
@boto3_mocking.patching
def test_application_form_submission(self):
"""
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 52b1ea1d3..9463c1387 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -13,6 +13,10 @@ class DomainUnavailableError(ValueError):
pass
+class RegistrySystemError(ValueError):
+ pass
+
+
class ActionNotAllowed(Exception):
"""User accessed an action that is not
allowed by the current state"""
@@ -42,7 +46,7 @@ class GenericError(Exception):
GenericErrorCodes.CANNOT_CONTACT_REGISTRY: """
We’re experiencing a system connection error. Please wait a few minutes
and try again. If you continue to receive this error after a few tries,
-contact help@get.gov
+contact help@get.gov.
""",
GenericErrorCodes.GENERIC_ERROR: ("Value entered was wrong."),
}
@@ -56,6 +60,10 @@ contact help@get.gov
def __str__(self):
return f"{self.message}"
+ @classmethod
+ def get_error_message(self, code=None):
+ return self._error_mapping.get(code)
+
class NameserverErrorCodes(IntEnum):
"""Used in the NameserverError class for
diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index e907be8e5..f11c26b69 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -3,6 +3,7 @@ import logging
from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.shortcuts import redirect, render
from django.urls import resolve, reverse
+from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _
from django.views.generic import TemplateView
from django.contrib import messages
@@ -218,6 +219,23 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
self.steps.current = current_url
context = self.get_context_data()
context["forms"] = self.get_forms()
+
+ # if pending requests exist and user does not have approved domains,
+ # present message that domain application cannot be submitted
+ pending_requests = self.pending_requests()
+ if len(pending_requests) > 0:
+ message_header = "You cannot submit this request yet"
+ message_content = (
+ f"
{message_header}
"
+ "
New domain requests cannot be submitted until we have finished "
+ f"reviewing your pending request: {pending_requests[0].requested_domain}. "
+ "You can continue to fill out this request and save it as a draft to be submitted later. "
+ f"View your pending requests.
"
+ )
+ context["pending_requests_message"] = mark_safe(message_content) # nosec
+
+ context["pending_requests_exist"] = len(pending_requests) > 0
+
return render(request, self.template_name, context)
def get_all_forms(self, **kwargs) -> list:
@@ -266,6 +284,37 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
return instantiated
+ def pending_requests(self):
+ """return an array of pending requests if user has pending requests
+ and no approved requests"""
+ if self.approved_applications_exist() or self.approved_domains_exist():
+ return []
+ else:
+ return self.pending_applications()
+
+ def approved_applications_exist(self):
+ """Checks if user is creator of applications with APPROVED status"""
+ approved_application_count = DomainApplication.objects.filter(
+ creator=self.request.user, status=DomainApplication.APPROVED
+ ).count()
+ return approved_application_count > 0
+
+ def approved_domains_exist(self):
+ """Checks if user has permissions on approved domains
+
+ This additional check is necessary to account for domains which were migrated
+ and do not have an application"""
+ return self.request.user.permissions.count() > 0
+
+ def pending_applications(self):
+ """Returns a List of user's applications with one of the following states:
+ SUBMITTED, IN_REVIEW, ACTION_NEEDED"""
+ # if the current application has ACTION_NEEDED status, this check should not be performed
+ if self.application.status == DomainApplication.ACTION_NEEDED:
+ return []
+ check_statuses = [DomainApplication.SUBMITTED, DomainApplication.IN_REVIEW, DomainApplication.ACTION_NEEDED]
+ return DomainApplication.objects.filter(creator=self.request.user, status__in=check_statuses)
+
def get_context_data(self):
"""Define context for access on all wizard pages."""
return {
@@ -328,6 +377,10 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
if button == "save":
messages.success(request, "Your progress has been saved!")
return self.goto(self.steps.current)
+ # if user opted to save progress and return,
+ # return them to the home page
+ if button == "save_and_return":
+ return HttpResponseRedirect(reverse("home"))
# otherwise, proceed as normal
return self.goto_next_step()
diff --git a/src/requirements.txt b/src/requirements.txt
index dd19bf978..4d155cb61 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -8,7 +8,7 @@ certifi==2023.7.22; python_version >= '3.6'
cfenv==0.5.3
cffi==1.16.0; python_version >= '3.8'
charset-normalizer==3.3.2; python_full_version >= '3.7.0'
-cryptography==41.0.5; python_version >= '3.7'
+cryptography==41.0.6; python_version >= '3.7'
defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
dj-database-url==2.1.0
dj-email-url==1.0.6
diff --git a/src/zap.conf b/src/zap.conf
index 61b3c1886..e7dc980b0 100644
--- a/src/zap.conf
+++ b/src/zap.conf
@@ -64,7 +64,9 @@
10038 OUTOFSCOPE http://app:8080/withdrawconfirmed
10038 OUTOFSCOPE http://app:8080/dns
10038 OUTOFSCOPE http://app:8080/dnssec
+10038 OUTOFSCOPE http://app:8080/dns/nameservers
10038 OUTOFSCOPE http://app:8080/dns/dnssec
+10038 OUTOFSCOPE http://app:8080/dns/dnssec/dsdata
# This URL always returns 404, so include it as well.
10038 OUTOFSCOPE http://app:8080/todo
# OIDC isn't configured in the test environment and DEBUG=True so this gives a 500 without CSP headers