zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-26 12:38:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup + test on sandbox

Browse source
This commit is contained in:
zandercymatics 2024-12-06 10:49:19 -07:00
parent a17368be24
commit e1a37fbc35
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
4 changed files with 41 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/registrar/models/domain.py
View file

@ -1,11 +1,9 @@
from itertools import zip_longest
import logging
import ipaddress
import requests
import re
from datetime import date
from typing import Optional
from django.conf import settings
from django_fsm import FSMField, transition, TransitionNotAllowed # type: ignore
from django.db import models
@ -239,7 +237,6 @@ class Domain(TimeStampedModel, DomainHelper):
is called in the validate function on the request/domain page
throws- RegistryError or InvalidDomainError"""
return True
if not cls.string_could_be_domain(domain):
logger.warning("Not a valid domain: %s" % str(domain))
# throw invalid domain error so that it can be caught in

2
src/registrar/templates/domain_dns.html
View file

@ -36,7 +36,7 @@
{% url 'domain-dns-dnssec' pk=domain.id as url %}
<li><a href="{{ url }}">DNSSEC</a></li>
{% if dns_prototype_flag %}
{% if dns_prototype_flag and is_valid_domain_for_prototype %}
<li><a href="{% url 'prototype-domain-dns' pk=domain.id %}">Prototype DNS record creator</a></li>
{% endif %}
</ul>

9
src/registrar/templates/prototype_domain_dns.html
View file

@ -7,12 +7,15 @@
{% include "includes/form_errors.html" with form=form %}
<h1>Add a cloudflare DNS record</h1>
<h1>Add DNS records</h1>
<p>
This is a prototype that demonstrates adding an 'A' record to igorville.gov.
This is a prototype that demonstrates adding an 'A' record to a zone.
Do note that this just adds records, but does not update or delete existing ones.
<strong>You can only use this on igorville.gov, domainops.gov, and dns.gov.</strong>
<strong>
On non-production environments, you can only use this on igorville.gov, domainops.gov, and dns.gov.
On production environments, you can only use this on igorville.gov.
</strong>
</p>
<form class="usa-form usa-form--large" method="post" novalidate id="form-container">

61
src/registrar/views/domain.py
View file

@ -459,18 +459,22 @@ class DomainDNSView(DomainBaseView):
def get_context_data(self, **kwargs):
"""Adds custom context."""
context = super().get_context_data(**kwargs)
object = self.get_object()
context["dns_prototype_flag"] = flag_is_active_for_user(self.request.user, "dns_prototype_flag")
context["is_valid_domain_for_prototype"] = True
x = object.name == "igorville.gov"
print(f"what is the object? {object.name} and equal? {x}")
if settings.IS_PRODUCTION:
context["is_valid_domain_for_prototype"] = object.name == "igorville.gov"
return context
class PrototypeDomainDNSRecordForm(forms.Form):
"""Form for adding DNS records in prototype."""
name = forms.CharField(
label="DNS record name (A record)",
required=True,
help_text="DNS record name"
)
name = forms.CharField(label="DNS record name (A record)", required=True, help_text="DNS record name")
content = forms.GenericIPAddressField(
label="IPv4 Address",
@ -489,14 +493,16 @@ class PrototypeDomainDNSRecordForm(forms.Form):
(7200, "2 hours"),
(18000, "5 hours"),
(43200, "12 hours"),
(86400, "1 day")
(86400, "1 day"),
],
initial=1,
)
class PrototypeDomainDNSRecordView(DomainFormBaseView):
template_name = "prototype_domain_dns.html"
form_class = PrototypeDomainDNSRecordForm
def has_permission(self):
has_permission = super().has_permission()
if not has_permission:
@ -532,7 +538,7 @@ class PrototypeDomainDNSRecordView(DomainFormBaseView):
headers = {
"X-Auth-Email": settings.SECRET_REGISTRY_SERVICE_EMAIL,
"X-Auth-Key": settings.SECRET_REGISTRY_TENANT_KEY,
"Content-Type": "application/json"
"Content-Type": "application/json",
}
params = {"tenant_name": settings.SECRET_REGISTRY_TENANT_NAME}
@ -557,7 +563,7 @@ class PrototypeDomainDNSRecordView(DomainFormBaseView):
account_response.raise_for_status()
# See if we already made an account.
# This doesn't need to be a for loop (1 record or 0) but alas, here we are
# This maybe doesn't need to be a for loop (1 record or 0) but alas, here we are
account_id = None
accounts = account_response_json.get("result", [])
for account in accounts:
@ -571,11 +577,7 @@ class PrototypeDomainDNSRecordView(DomainFormBaseView):
account_response = requests.post(
f"{base_url}/accounts",
headers=headers,
json={
"name": account_name,
"type": "enterprise",
"unit": {"id": tenant_id}
}
json={"name": account_name, "type": "enterprise", "unit": {"id": tenant_id}},
)
account_response_json = account_response.json()
logger.info(f"Created account: {account_response_json}")
@ -608,17 +610,13 @@ class PrototypeDomainDNSRecordView(DomainFormBaseView):
zone_response = requests.post(
f"{base_url}/zones",
headers=headers,
json={
"name": zone_name,
"account": {"id": account_id},
"type": "full"
}
json={"name": zone_name, "account": {"id": account_id}, "type": "full"},
)
zone_response_json = zone_response.json()
logger.info(f"Created zone: {zone_response_json}")
zone_id = zone_response_json.get("result", {}).get("id")
errors = zone_response_json.get("errors", [])
zone_response.raise_for_status()
zone_id = zone_response_json.get("result", {}).get("id")
# 4. Add or get a zone subscription
@ -635,10 +633,7 @@ class PrototypeDomainDNSRecordView(DomainFormBaseView):
subscription_response = requests.post(
f"{base_url}/zones/{zone_id}/subscription",
headers=headers,
json={
"rate_plan": {"id": "PARTNERS_ENT"},
"frequency": "annual"
}
json={"rate_plan": {"id": "PARTNERS_ENT"}, "frequency": "annual"},
)
subscription_response.raise_for_status()
subscription_response_json = subscription_response.json()
@ -646,7 +641,6 @@ class PrototypeDomainDNSRecordView(DomainFormBaseView):
else:
subscription_response.raise_for_status()
# # 5. Create DNS record
# # Format the DNS record according to Cloudflare's API requirements
dns_response = requests.post(
@ -657,29 +651,20 @@ class PrototypeDomainDNSRecordView(DomainFormBaseView):
"name": form.cleaned_data["name"],
"content": form.cleaned_data["content"],
"ttl": int(form.cleaned_data["ttl"]),
"comment": "Test record (will need clean up)"
}
"comment": "Test record (will need clean up)",
},
)
dns_response_json = dns_response.json()
logger.info(f"Created DNS record: {dns_response_json}")
errors = dns_response_json.get("errors", [])
dns_response.raise_for_status()
messages.success(
request,
f"DNS A record '{form.cleaned_data['name']}' created successfully."
)
messages.success(request, f"DNS A record '{form.cleaned_data['name']}' created successfully.")
except Exception as err:
logger.error(f"Error creating DNS A record for {self.object.name}: {err}")
messages.error(
request,
f"An error occurred: {err}"
)
messages.error(request, f"An error occurred: {err}")
finally:
if errors:
messages.error(
request,
f"Request errors: {errors}"
)
messages.error(request, f"Request errors: {errors}")
return super().post(request)