nautobot 1.6.30__py3-none-any.whl → 1.6.32__py3-none-any.whl

nautobot/project-static/docs/user-guides/git-data-source.html

@@ -871,6 +871,68 @@
 
             
           
+            
+              
+  
+  
+  
+    
+    <li class="md-nav__item md-nav__item--nested">
+      
+      
+      
+      
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_5_7" >
+      
+      
+      
+        <label class="md-nav__link" for="__nav_2_5_7" id="__nav_2_5_7_label" tabindex="0">
+          Security
+          <span class="md-nav__icon md-icon"></span>
+        </label>
+      
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_5_7_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_5_7">
+          <span class="md-nav__icon md-icon"></span>
+          Security
+        </label>
+        <ul class="md-nav__list" data-md-scrollfix>
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/index.html" class="md-nav__link">
+        Nautobot Security
+      </a>
+    </li>
+  
+
+            
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/notices.html" class="md-nav__link">
+        Notices
+      </a>
+    </li>
+  
+
+            
+          
+        </ul>
+      </nav>
+    </li>
+  
+
+            
+          
         </ul>
       </nav>
     </li>

nautobot/project-static/docs/user-guides/graphql.html

@@ -871,6 +871,68 @@
 
             
           
+            
+              
+  
+  
+  
+    
+    <li class="md-nav__item md-nav__item--nested">
+      
+      
+      
+      
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_5_7" >
+      
+      
+      
+        <label class="md-nav__link" for="__nav_2_5_7" id="__nav_2_5_7_label" tabindex="0">
+          Security
+          <span class="md-nav__icon md-icon"></span>
+        </label>
+      
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_5_7_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_5_7">
+          <span class="md-nav__icon md-icon"></span>
+          Security
+        </label>
+        <ul class="md-nav__list" data-md-scrollfix>
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/index.html" class="md-nav__link">
+        Nautobot Security
+      </a>
+    </li>
+  
+
+            
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/notices.html" class="md-nav__link">
+        Notices
+      </a>
+    </li>
+  
+
+            
+          
+        </ul>
+      </nav>
+    </li>
+  
+
+            
+          
         </ul>
       </nav>
     </li>

nautobot/project-static/docs/user-guides/relationships.html

@@ -871,6 +871,68 @@
 
             
           
+            
+              
+  
+  
+  
+    
+    <li class="md-nav__item md-nav__item--nested">
+      
+      
+      
+      
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_5_7" >
+      
+      
+      
+        <label class="md-nav__link" for="__nav_2_5_7" id="__nav_2_5_7_label" tabindex="0">
+          Security
+          <span class="md-nav__icon md-icon"></span>
+        </label>
+      
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_5_7_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_5_7">
+          <span class="md-nav__icon md-icon"></span>
+          Security
+        </label>
+        <ul class="md-nav__list" data-md-scrollfix>
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/index.html" class="md-nav__link">
+        Nautobot Security
+      </a>
+    </li>
+  
+
+            
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/notices.html" class="md-nav__link">
+        Notices
+      </a>
+    </li>
+  
+
+            
+          
+        </ul>
+      </nav>
+    </li>
+  
+
+            
+          
         </ul>
       </nav>
     </li>

nautobot/project-static/docs/user-guides/s3-django-storage.html

@@ -871,6 +871,68 @@
 
             
           
+            
+              
+  
+  
+  
+    
+    <li class="md-nav__item md-nav__item--nested">
+      
+      
+      
+      
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_5_7" >
+      
+      
+      
+        <label class="md-nav__link" for="__nav_2_5_7" id="__nav_2_5_7_label" tabindex="0">
+          Security
+          <span class="md-nav__icon md-icon"></span>
+        </label>
+      
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_5_7_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_5_7">
+          <span class="md-nav__icon md-icon"></span>
+          Security
+        </label>
+        <ul class="md-nav__list" data-md-scrollfix>
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/index.html" class="md-nav__link">
+        Nautobot Security
+      </a>
+    </li>
+  
+
+            
+          
+            
+              
+  
+  
+  
+    <li class="md-nav__item">
+      <a href="../administration/security/notices.html" class="md-nav__link">
+        Notices
+      </a>
+    </li>
+  
+
+            
+          
+        </ul>
+      </nav>
+    </li>
+  
+
+            
+          
         </ul>
       </nav>
     </li>

nautobot/tenancy/forms.py

@@ -17,6 +17,9 @@ from nautobot.utilities.forms import (
 )
 from .models import Tenant, TenantGroup
 
+from nautobot.utilities.forms import StaticSelect2
+
+from nautobot.utilities.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
 
 #
 # Tenant groups
@@ -37,6 +40,13 @@ class TenantGroupForm(NautobotModelForm):
         ]
 
 
+class TenantGroupFilterForm(NautobotFilterForm):
+    model = TenantGroup
+    q = forms.CharField(required=False, label="Search")
+    parent = DynamicModelMultipleChoiceField(queryset=TenantGroup.objects.all(), to_field_name="name", required=False)
+    has_tenants = forms.NullBooleanField(required="False", widget=StaticSelect2(choices=BOOLEAN_WITH_BLANK_CHOICES))
+
+
 class TenantGroupCSVForm(CustomFieldModelCSVForm):
     parent = CSVModelChoiceField(
         queryset=TenantGroup.objects.all(),

nautobot/tenancy/views.py

@@ -20,6 +20,7 @@ class TenantGroupListView(generic.ObjectListView):
         TenantGroup.objects.all(), Tenant, "group", "tenant_count", cumulative=True
     )
     filterset = filters.TenantGroupFilterSet
+    filterset_form = forms.TenantGroupFilterForm
     table = tables.TenantGroupTable
 
 

nautobot/users/models.py

@@ -110,6 +110,8 @@ class User(BaseModel, AbstractUser):
         if commit:
             self.save()
 
+    set_config.alters_data = True
+
     def clear_config(self, path, commit=False):
         """
         Delete a configuration parameter specified by its dotted path. The key and any child keys will be deleted.
@@ -137,6 +139,8 @@ class User(BaseModel, AbstractUser):
         if commit:
             self.save()
 
+    clear_config.alters_data = True
+
 
 #
 # Proxy models for admin

nautobot/utilities/testing/views.py

@@ -24,7 +24,13 @@ from nautobot.extras.models.mixins import NotesMixin
 from nautobot.users.models import ObjectPermission
 from nautobot.utilities.templatetags.helpers import bettertitle, validated_viewname
 from nautobot.utilities.testing.mixins import NautobotTestCaseMixin
-from nautobot.utilities.utils import get_changes_for_model, get_filterset_for_model, get_form_for_model, csv_format
+from nautobot.utilities.utils import (
+    get_changes_for_model,
+    get_filterset_for_model,
+    get_form_for_model,
+    get_view_for_model,
+    csv_format,
+)
 from .utils import disable_warnings, extract_page_body, get_deletable_objects, post_data
 
 
@@ -662,6 +668,16 @@ class ViewTestCases:
         def get_title(self):
             return bettertitle(self.model._meta.verbose_name_plural)
 
+        def get_list_view(self):
+            return get_view_for_model(self.model, view_type="List")
+
+        def test_list_view_has_filter_form(self):
+            view = self.get_list_view()
+            if hasattr(view, "filterset_form"):  # ObjectListView
+                self.assertIsNotNone(view.filterset_form, "List view lacks a FilterForm")
+            if hasattr(view, "filterset_form_class"):  # ObjectListViewMixin
+                self.assertIsNotNone(view.filterset_form_class, "List viewset lacks a FilterForm")
+
         @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
         def test_list_objects_anonymous(self):
             # Make the request as an unauthenticated user

nautobot/utilities/tests/test_jinja_filters.py

@@ -3,7 +3,8 @@ from jinja2.exceptions import SecurityError, TemplateAssertionError
 from netutils.utils import jinja2_convenience_function
 
 from nautobot.utilities.utils import render_jinja2
-from nautobot.dcim.models import Site
+from nautobot.dcim import models as dcim_models
+from nautobot.extras import models as extras_models
 
 
 class NautobotJinjaFilterTest(TestCase):
@@ -73,7 +74,7 @@ class NautobotJinjaFilterTest(TestCase):
 
     def test_safe_render(self):
         """Assert that safe Jinja rendering still works."""
-        site = Site.objects.filter(region__isnull=False).first()
+        site = dcim_models.Site.objects.filter(region__isnull=False).first()
         template_code = "{{ obj.region.name }}"
         try:
             value = render_jinja2(template_code=template_code, context={"obj": site})
@@ -81,3 +82,26 @@ class NautobotJinjaFilterTest(TestCase):
             self.fail("SecurityError raised on safe Jinja template render")
         else:
             self.assertEqual(value, site.region.name)
+
+    def test_render_blocks_various_unsafe_methods(self):
+        """Assert that Jinja template rendering correctly blocks various unsafe Nautobot APIs."""
+        location = dcim_models.Location.objects.first()
+        secret = extras_models.Secret.objects.create(name="secret", provider="environment-variable")
+
+        context = {
+            "location": location,
+            "secret": secret,
+            "JobResult": extras_models.JobResult,
+        }
+
+        for call in [
+            # "device.create_components()",  # 1.6 lacks a Device factory
+            # "interface_template.instantiate(device)",  # 1.6 lacks an InterfaceTemplate factory
+            "location.validated_save()",
+            "secret.get_value()",
+            "JobResult.enqueue_job(None, None)",
+            "JobResult.log('hello world')",
+        ]:
+            with self.subTest(call=call):
+                with self.assertRaises(SecurityError):
+                    render_jinja2(template_code="{{ " + call + " }}", context=context)

nautobot/utilities/utils.py

@@ -693,6 +693,20 @@ def get_table_for_model(model):
     return get_related_class_for_model(model, module_name="tables", object_suffix="Table")
 
 
+def get_view_for_model(model, view_type=""):
+    """Return the `UIViewSet` or `<view_type>View` class associated with a given `model`.
+
+    The view class is expected to be in the `views` module within the app associated with the model,
+    and its name is expected to be either `{ModelName}UIViewSet` or `{ModelName}{view_type}View`.
+
+    If neither view class is found, this will return `None`.
+    """
+    result = get_related_class_for_model(model, module_name="views", object_suffix="UIViewSet")
+    if result is None:
+        result = get_related_class_for_model(model, module_name="views", object_suffix=f"{view_type}View")
+    return result
+
+
 def get_url_patterns(urlconf=None, patterns_list=None, base_path="/"):
     """
     Recursively yield a list of registered URL patterns.

nautobot/virtualization/forms.py

@@ -69,6 +69,12 @@ class ClusterTypeForm(NautobotModelForm):
         ]
 
 
+class ClusterTypeFilterForm(NautobotFilterForm):
+    model = ClusterType
+    q = forms.CharField(required=False, label="Search")
+    clusters = DynamicModelMultipleChoiceField(queryset=Cluster.objects.all(), to_field_name="name", required=False)
+
+
 class ClusterTypeCSVForm(CustomFieldModelCSVForm):
     class Meta:
         model = ClusterType
@@ -92,6 +98,12 @@ class ClusterGroupForm(NautobotModelForm):
         ]
 
 
+class ClusterGroupFilterForm(NautobotFilterForm):
+    model = ClusterGroup
+    q = forms.CharField(required=False, label="Search")
+    clusters = DynamicModelMultipleChoiceField(queryset=Cluster.objects.all(), to_field_name="name", required=False)
+
+
 class ClusterGroupCSVForm(CustomFieldModelCSVForm):
     class Meta:
         model = ClusterGroup

nautobot/virtualization/views.py

@@ -26,6 +26,7 @@ from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterf
 class ClusterTypeListView(generic.ObjectListView):
     queryset = ClusterType.objects.annotate(cluster_count=count_related(Cluster, "type"))
     filterset = filters.ClusterTypeFilterSet
+    filterset_form = forms.ClusterTypeFilterForm
     table = tables.ClusterTypeTable
 
 
@@ -85,6 +86,7 @@ class ClusterTypeBulkDeleteView(generic.BulkDeleteView):
 class ClusterGroupListView(generic.ObjectListView):
     queryset = ClusterGroup.objects.annotate(cluster_count=count_related(Cluster, "group"))
     filterset = filters.ClusterGroupFilterSet
+    filterset_form = forms.ClusterGroupFilterForm
     table = tables.ClusterGroupTable
 
 

{nautobot-1.6.30.dist-info → nautobot-1.6.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nautobot
-Version: 1.6.30
+Version: 1.6.32
 Summary: Source of truth and network automation platform.
 Home-page: https://nautobot.com
 License: Apache-2.0
@@ -24,7 +24,7 @@ Provides-Extra: remote-storage
 Provides-Extra: sso
 Requires-Dist: Django (>=3.2.25,<3.3.0)
 Requires-Dist: GitPython (>=3.1.41,<3.2.0)
-Requires-Dist: Jinja2 (>=3.1.5,<3.2.0)
+Requires-Dist: Jinja2 (>=3.1.6,<3.2.0)
 Requires-Dist: Markdown (>=3.3.7,<3.4.0)
 Requires-Dist: MarkupSafe (>=2.1.3,<2.2.0)
 Requires-Dist: Pillow (>=10.3.0,<10.4.0)