added form validation

src/registrar/forms/domain.py

@@ -47,6 +47,8 @@ class IPAddressField(forms.CharField):
 class DomainNameserverForm(forms.Form):
     """Form for changing nameservers."""
 
+    domain = forms.CharField(widget=forms.HiddenInput, required=False)
+
     server = forms.CharField(label="Name server", strip=True)
 
     ip = IPAddressField(
@@ -58,21 +60,12 @@ class DomainNameserverForm(forms.Form):
         # ],
     )
     
-    def __init__(self, *args, **kwargs):
-        # Access the context object passed to the form
-        print(f"kwargs in __init__ {kwargs}")
-        self.domain = kwargs.pop('domain', None)
-        super().__init__(*args, **kwargs)
-    
-    # def __init__(self, request, *args, **kwargs):
-    #     # Pass the request object to the form during initialization
-    #     self.request = request
-    #     super().__init__(*args, **kwargs)
-    
     def clean(self):
         cleaned_data = super().clean()
         server = cleaned_data.get('server', '')
         ip = cleaned_data.get('ip', '')
+        domain = cleaned_data.get('domain', '')
+        print(f"clean is called on {domain} {server}")
 
         # make sure there's a nameserver if an ip is passed
         if ip:
@@ -82,15 +75,12 @@ class DomainNameserverForm(forms.Form):
                 raise forms.ValidationError("Name server must be provided to enter IP address.")
         
         # if there's a nameserver and an ip, validate nameserver/ip combo
-        domain, _ = Domain.objects.get_or_create(name="realize-shake-too.gov")
         
-        # Access session data from the request object
-        # session_data = self.request.session.get('nameservers_form_domain', None)
-        
-        print(f"domain in clean: {self.domain}")
-        
-        if server and ip:
+        if server:
+            if ip:
                 ip_list = [ip.strip() for ip in ip.split(",")]
+            else:
+                ip_list = ['']
             try:
                 Domain.checkHostIPCombo(domain, server, ip_list)
             except NameserverError as e:

src/registrar/models/domain.py

@@ -291,14 +291,16 @@ class Domain(TimeStampedModel, DomainHelper):
                 newDict[tup[0]] = tup[1]
         return newDict
 
-    def isSubdomain(self, nameserver: str):
+    @classmethod
+    def isSubdomain(cls, name: str, nameserver: str):
         """Returns boolean if the domain name is found in the argument passed"""
         subdomain_pattern = r"([\w-]+\.)*"
-        full_pattern = subdomain_pattern + self.name
+        full_pattern = subdomain_pattern + name
         regex = re.compile(full_pattern)
         return bool(regex.match(nameserver))
 
-    def checkHostIPCombo(self, nameserver: str, ip: list[str]):
+    @classmethod
+    def checkHostIPCombo(cls, name: str, nameserver: str, ip: list[str]):
         """Checks the parameters past for a valid combination
         raises error if:
             - nameserver is a subdomain but is missing ip
@@ -312,23 +314,27 @@ class Domain(TimeStampedModel, DomainHelper):
             NameserverError (if exception hit)
         Returns:
             None"""
-        if self.isSubdomain(nameserver) and (ip is None or ip == [] or ip == ['']):
+        logger.info("checkHostIPCombo is called on %s, %s", name, nameserver)
+        if cls.isSubdomain(name, nameserver) and (ip is None or ip == [] or ip == ['']):
+
             raise NameserverError(code=nsErrorCodes.MISSING_IP, nameserver=nameserver)
 
-        elif not self.isSubdomain(nameserver) and (ip is not None and ip != [] and ip != ['']):
+        elif not cls.isSubdomain(name, nameserver) and (ip is not None and ip != [] and ip != ['']):
             raise NameserverError(
                 code=nsErrorCodes.GLUE_RECORD_NOT_ALLOWED, nameserver=nameserver, ip=ip
             )
         elif ip is not None and ip != [] and ip != ['']:
             for addr in ip:
                 logger.info(f"ip address {addr}")
-                if not self._valid_ip_addr(addr):
+                if not cls._valid_ip_addr(addr):
                     raise NameserverError(
                         code=nsErrorCodes.INVALID_IP, nameserver=nameserver, ip=ip
                     )
+        logger.info("got no errors")
         return None
 
-    def _valid_ip_addr(self, ipToTest: str):
+    @classmethod
+    def _valid_ip_addr(cls, ipToTest: str):
         """returns boolean if valid ip address string
         We currently only accept v4 or v6 ips
         returns:
@@ -383,7 +389,7 @@ class Domain(TimeStampedModel, DomainHelper):
                 if newHostDict[prevHost] is not None and set(
                     newHostDict[prevHost]
                 ) != set(addrs):
-                    self.checkHostIPCombo(nameserver=prevHost, ip=newHostDict[prevHost])
+                    self.__class__.checkHostIPCombo(name=self.name, nameserver=prevHost, ip=newHostDict[prevHost])
                     updated_values.append((prevHost, newHostDict[prevHost]))
 
         new_values = {
@@ -393,7 +399,7 @@ class Domain(TimeStampedModel, DomainHelper):
         }
 
         for nameserver, ip in new_values.items():
-            self.checkHostIPCombo(nameserver=nameserver, ip=ip)
+            self.__class__.checkHostIPCombo(name=self.name, nameserver=nameserver, ip=ip)
 
         return (deleted_values, updated_values, new_values, previousHostDict)
 

src/registrar/templates/domain_nameservers.html

@@ -24,6 +24,7 @@
     <div class="server-form">
       <div class="grid-row grid-gap-2 flex-end">
         <div class="tablet:grid-col-6">
+          {{ form.domain }}
           {% with sublabel_text="Example: ns"|concat:forloop.counter|concat:".example.com" %}
             {% if forloop.counter <= 2 %}
               {% with attr_required=True add_group_class="usa-form-group--unstyled-error" %}

src/registrar/views/domain.py

@@ -221,13 +221,6 @@ class DomainNameserversView(DomainFormBaseView, BaseFormSet):
     form_class = NameserverFormset
     model = Domain
     
-    def get_formset_kwargs(self, index):
-        kwargs = super().get_formset_kwargs(index)
-        # kwargs['domain'] = self.object  # Pass the context data
-        kwargs.update({"domain", self.object})
-        print(f"kwargs in get_formset_kwargs {kwargs}")
-        return kwargs
-    
     def get_initial(self):
         """The initial value for the form (which is a formset here)."""
         nameservers = self.object.nameservers
@@ -257,7 +250,6 @@ class DomainNameserversView(DomainFormBaseView, BaseFormSet):
     def get_form(self, **kwargs):
         """Override the labels and required fields every time we get a formset."""
         # kwargs.update({"domain", self.object})
-        
         formset = super().get_form(**kwargs)    
         
         for i, form in enumerate(formset):
@@ -268,8 +260,22 @@ class DomainNameserversView(DomainFormBaseView, BaseFormSet):
                 form.fields["server"].required = True
             else:
                 form.fields["server"].required = False
+            form.fields["domain"].initial = self.object.name
+            print(f"domain in get_form {self.object.name}")
         return formset
         
+    def post(self, request, *args, **kwargs):
+        """Form submission posts to this view.
+
+        This post method harmonizes using DomainBaseView and FormMixin
+        """
+        self._get_domain(request)
+        form = self.get_form()
+        if form.is_valid():
+            return self.form_valid(form)
+        else:
+            return self.form_invalid(form)
+        
     def form_valid(self, formset):
         """The formset is valid, perform something with it."""