zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-06-11 06:54:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Raise system error message on EPP fail

Browse source
This commit is contained in:
Erin 2023-11-30 16:23:20 -08:00
parent 4588a02d44
commit 5f68677d7f
No known key found for this signature in database
GPG key ID: 1CAD275313C62460
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/registrar/forms/application_wizard.py
View file

@ -392,6 +392,7 @@ CurrentSitesFormSet = forms.formset_factory(
class AlternativeDomainForm(RegistrarForm): class AlternativeDomainForm(RegistrarForm):
def clean_alternative_domain(self): def clean_alternative_domain(self):
"""Validation code for domain names.""" """Validation code for domain names."""
try: try:
requested = self.cleaned_data.get("alternative_domain", None) requested = self.cleaned_data.get("alternative_domain", None)
validated = DraftDomain.validate(requested, blank_ok=True) validated = DraftDomain.validate(requested, blank_ok=True)
@ -399,6 +400,8 @@ class AlternativeDomainForm(RegistrarForm):
raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots") raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots")
except errors.DomainUnavailableError: except errors.DomainUnavailableError:
raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable") raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable")
except errors.RegistrySystemError:
raise forms.ValidationError(DOMAIN_API_MESSAGES["error"], code="error")
except ValueError: except ValueError:
raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid") raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
return validated return validated
@ -484,6 +487,8 @@ class DotGovDomainForm(RegistrarForm):
raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots") raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots")
except errors.DomainUnavailableError: except errors.DomainUnavailableError:
raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable") raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable")
except errors.RegistrySystemError:
raise forms.ValidationError(DOMAIN_API_MESSAGES["error"], code="error")
except ValueError: except ValueError:
raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid") raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
return validated return validated

8
src/registrar/models/utility/domain_helper.py
View file

@ -2,6 +2,7 @@ import re
from api.views import check_domain_available from api.views import check_domain_available
from registrar.utility import errors from registrar.utility import errors
from registrar.utility.errors import GenericError, GenericErrorCodes
class DomainHelper: class DomainHelper:
@ -40,8 +41,11 @@ class DomainHelper:
raise errors.ExtraDotsError() raise errors.ExtraDotsError()
if not DomainHelper.string_could_be_domain(domain + ".gov"): if not DomainHelper.string_could_be_domain(domain + ".gov"):
raise ValueError() raise ValueError()
if not check_domain_available(domain): try:
raise errors.DomainUnavailableError() if not check_domain_available(domain):
raise errors.DomainUnavailableError()
except Exception:
raise errors.RegistrySystemError()
return domain return domain
@classmethod @classmethod

4
src/registrar/utility/errors.py
View file

@ -13,6 +13,10 @@ class DomainUnavailableError(ValueError):
pass pass
class RegistrySystemError(ValueError):
pass
class ActionNotAllowed(Exception): class ActionNotAllowed(Exception):
"""User accessed an action that is not """User accessed an action that is not
allowed by the current state""" allowed by the current state"""