From d42b0691b2a3ea836ee4efc8ccb7ba287bedda8b Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Mon, 5 Apr 2021 17:13:32 -0400
Subject: [PATCH 01/11] Fix 'select all' widget

---
 netbox/templates/generic/object_list.html | 89 ++++++++++++-----------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 738cbca49..b3b9944bb 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load buttons %}
 {% load helpers %}
+{% load render_table from django_tables2 %}
 {% load static %}
 
 {% block content %}
@@ -28,54 +29,56 @@
                 {% block sidebar %}{% endblock %}
             </div>
         {% endif %}
+        <div class="table-responsive">
         {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
-        {% if permissions.change or permissions.delete %}
-            <form method="post" class="form form-horizontal">
-                {% csrf_token %}
-                <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
-                {% if table.paginator.num_pages > 1 %}
-                    <div id="select_all_box" class="hidden panel panel-default noprint">
-                        <div class="panel-body">
-                            <div class="checkbox-inline">
-                                <label for="select_all">
-                                    <input type="checkbox" id="select_all" name="_all" />
-                                    Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
-                                </label>
-                            </div>
-                            <div class="pull-right">
-                                {% if bulk_edit_url and permissions.change %}
-                                    <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
-                                        <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
-                                    </button>
-                                {% endif %}
-                                {% if bulk_delete_url and permissions.delete %}
-                                    <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled="disabled">
-                                        <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete All
-                                    </button>
-                                {% endif %}
+            {% if permissions.change or permissions.delete %}
+                <form method="post" class="form form-horizontal">
+                    {% csrf_token %}
+                    <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
+                    {% if table.paginator.num_pages > 1 %}
+                        <div id="select_all_box" class="hidden panel panel-default noprint">
+                            <div class="panel-body">
+                                <div class="checkbox-inline">
+                                    <label for="select_all">
+                                        <input type="checkbox" id="select_all" name="_all" />
+                                        Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
+                                    </label>
+                                </div>
+                                <div class="pull-right">
+                                    {% if bulk_edit_url and permissions.change %}
+                                        <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
+                                            <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
+                                        </button>
+                                    {% endif %}
+                                    {% if bulk_delete_url and permissions.delete %}
+                                        <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled="disabled">
+                                            <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete All
+                                        </button>
+                                    {% endif %}
+                                </div>
                             </div>
                         </div>
+                    {% endif %}
+                    {% render_table table 'inc/table.html' %}
+                    <div class="pull-left noprint">
+                        {% block bulk_buttons %}{% endblock %}
+                        {% if bulk_edit_url and permissions.change %}
+                            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm">
+                                <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit Selected
+                            </button>
+                        {% endif %}
+                        {% if bulk_delete_url and permissions.delete %}
+                            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm">
+                                <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected
+                            </button>
+                        {% endif %}
                     </div>
-                {% endif %}
-                {% include table_template|default:'responsive_table.html' %}
-                <div class="pull-left noprint">
-                    {% block bulk_buttons %}{% endblock %}
-                    {% if bulk_edit_url and permissions.change %}
-                        <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm">
-                            <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit Selected
-                        </button>
-                    {% endif %}
-                    {% if bulk_delete_url and permissions.delete %}
-                        <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm">
-                            <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected
-                        </button>
-                    {% endif %}
-                </div>
-            </form>
-        {% else %}
-            {% include table_template|default:'responsive_table.html' %}
-        {% endif %}
+                </form>
+            {% else %}
+                {% render_table table 'inc/table.html' %}
+            {% endif %}
         {% endwith %}
+        </div>
         {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
         <div class="clearfix"></div>
     </div>

From 85d0270af05af0efe9bcbf6db81141e2a47fec7e Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Wed, 7 Apr 2021 15:50:24 -0400
Subject: [PATCH 02/11] Fixes #6099: Correct example permission description

---
 docs/administration/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/administration/permissions.md b/docs/administration/permissions.md
index c66c65543..c7c8996dc 100644
--- a/docs/administration/permissions.md
+++ b/docs/administration/permissions.md
@@ -10,7 +10,7 @@ NetBox v2.9 introduced a new object-based permissions framework, which replace's
 | ----------- | ----------- |
 | `{"status": "active"}` | Status is active |
 | `{"status__in": ["planned", "reserved"]}` | Status is active **OR** reserved |
-| `{"status": "active", "role": "testing"}` | Status is active **OR** role is testing |
+| `{"status": "active", "role": "testing"}` | Status is active **AND** role is testing |
 | `{"name__startswith": "Foo"}` | Name starts with "Foo" (case-sensitive) |
 | `{"name__iendswith": "bar"}` | Name ends with "bar" (case-insensitive) |
 | `{"vid__gte": 100, "vid__lt": 200}` | VLAN ID is greater than or equal to 100 **AND** less than 200 |

From ae3527df164868585941d7b3cde095b24d24862d Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Wed, 7 Apr 2021 16:04:32 -0400
Subject: [PATCH 03/11] Fixes #6081: Fix interface connections REST API
 endpoint

---
 docs/release-notes/version-2.10.md | 1 +
 netbox/dcim/api/serializers.py     | 2 +-
 netbox/dcim/api/views.py           | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index 95f8bd8ab..f895e43f7 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -13,6 +13,7 @@
 
 * [#5805](https://github.com/netbox-community/netbox/issues/5805) - Fix missing custom field filters for cables, rack reservations
 * [#6073](https://github.com/netbox-community/netbox/issues/6073) - Permit users to manage their own REST API tokens without needing explicit permission
+* [#6081](https://github.com/netbox-community/netbox/issues/6081) - Fix interface connections REST API endpoint
 
 ---
 
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index dc730488c..73059cad3 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -779,7 +779,7 @@ class CablePathSerializer(serializers.ModelSerializer):
 
 class InterfaceConnectionSerializer(ValidatedModelSerializer):
     interface_a = serializers.SerializerMethodField()
-    interface_b = NestedInterfaceSerializer(source='connected_endpoint')
+    interface_b = NestedInterfaceSerializer(source='_path.destination')
     connected_endpoint_reachable = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index ae39f6ad0..9a090eddc 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -2,6 +2,7 @@ import socket
 from collections import OrderedDict
 
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import F
 from django.http import HttpResponseForbidden, HttpResponse
 from django.shortcuts import get_object_or_404
@@ -580,6 +581,7 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet):
 class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet):
     queryset = Interface.objects.prefetch_related('device', '_path').filter(
         # Avoid duplicate connections by only selecting the lower PK in a connected pair
+        _path__destination_type=ContentType.objects.get_by_natural_key('dcim', 'interface'),
         _path__destination_id__isnull=False,
         pk__lt=F('_path__destination_id')
     )

From 03b3f5937f49324db0639c73d5242cd0e9c2a548 Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Thu, 8 Apr 2021 13:50:06 -0400
Subject: [PATCH 04/11] Fixes #6108: Do not infer tenant assignment from parent
 objects for prefixes, IP addresses

---
 docs/release-notes/version-2.10.md |  1 +
 netbox/ipam/tables.py              | 28 ++++++++--------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index f895e43f7..36c9d3276 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -14,6 +14,7 @@
 * [#5805](https://github.com/netbox-community/netbox/issues/5805) - Fix missing custom field filters for cables, rack reservations
 * [#6073](https://github.com/netbox-community/netbox/issues/6073) - Permit users to manage their own REST API tokens without needing explicit permission
 * [#6081](https://github.com/netbox-community/netbox/issues/6081) - Fix interface connections REST API endpoint
+* [#6108](https://github.com/netbox-community/netbox/issues/6108) - Do not infer tenant assignment from parent objects for prefixes, IP addresses
 
 ---
 
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 04a5d130c..b16e180bd 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -109,18 +109,6 @@ VLAN_MEMBER_TAGGED = """
 {% endif %}
 """
 
-TENANT_LINK = """
-{% if record.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=record.tenant.slug %}" title="{{ record.tenant.description }}">{{ record.tenant }}</a>
-{% elif record.vrf.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=record.vrf.tenant.slug %}" title="{{ record.vrf.tenant.description }}">{{ record.vrf.tenant }}</a>*
-{% elif object.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=object.tenant.slug %}" title="{{ object.tenant.description }}">{{ object.tenant }}</a>
-{% else %}
-    &mdash;
-{% endif %}
-"""
-
 
 #
 # VRFs
@@ -210,8 +198,8 @@ class AggregateTable(BaseTable):
     prefix = tables.LinkColumn(
         verbose_name='Aggregate'
     )
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     date_added = tables.DateColumn(
         format="Y-m-d",
@@ -281,8 +269,8 @@ class PrefixTable(BaseTable):
         template_code=VRF_LINK,
         verbose_name='VRF'
     )
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     site = tables.Column(
         linkify=True
@@ -349,8 +337,8 @@ class IPAddressTable(BaseTable):
         default=AVAILABLE_LABEL
     )
     role = ChoiceFieldColumn()
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     assigned_object = tables.Column(
         linkify=True,
@@ -430,8 +418,8 @@ class InterfaceIPAddressTable(BaseTable):
         verbose_name='VRF'
     )
     status = ChoiceFieldColumn()
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     actions = ButtonsColumn(
         model=IPAddress

From f096c4a5d043033d3fef32ae8bf7f0920a6e7abd Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Thu, 8 Apr 2021 14:18:07 -0400
Subject: [PATCH 05/11] #6081: Tweak queryset filtering

---
 netbox/dcim/api/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 9a090eddc..3533f0230 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -581,7 +581,8 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet):
 class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet):
     queryset = Interface.objects.prefetch_related('device', '_path').filter(
         # Avoid duplicate connections by only selecting the lower PK in a connected pair
-        _path__destination_type=ContentType.objects.get_by_natural_key('dcim', 'interface'),
+        _path__destination_type__app_label='dcim',
+        _path__destination_type__model='interface',
         _path__destination_id__isnull=False,
         pk__lt=F('_path__destination_id')
     )

From e69251b21ae670ed8de857e3a03c20fedda42b70 Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Thu, 8 Apr 2021 14:22:45 -0400
Subject: [PATCH 06/11] Fixes #6070: Add missing 'count_ipaddresses' attribute
 to VMInterface serializer

---
 docs/release-notes/version-2.10.md       | 1 +
 netbox/dcim/models/device_components.py  | 8 ++++----
 netbox/virtualization/api/serializers.py | 3 ++-
 netbox/virtualization/api/views.py       | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index 36c9d3276..fad8f218b 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -12,6 +12,7 @@
 ### Bug Fixes
 
 * [#5805](https://github.com/netbox-community/netbox/issues/5805) - Fix missing custom field filters for cables, rack reservations
+* [#6070](https://github.com/netbox-community/netbox/issues/6070) - Add missing `count_ipaddresses` attribute to VMInterface serializer
 * [#6073](https://github.com/netbox-community/netbox/issues/6073) - Permit users to manage their own REST API tokens without needing explicit permission
 * [#6081](https://github.com/netbox-community/netbox/issues/6081) - Fix interface connections REST API endpoint
 * [#6108](https://github.com/netbox-community/netbox/issues/6108) - Do not infer tenant assignment from parent objects for prefixes, IP addresses
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 40063234f..1b997ec07 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -478,6 +478,10 @@ class BaseInterface(models.Model):
 
         return super().save(*args, **kwargs)
 
+    @property
+    def count_ipaddresses(self):
+        return self.ip_addresses.count()
+
 
 @extras_features('export_templates', 'webhooks', 'custom_links')
 class Interface(CableTermination, PathEndpoint, ComponentModel, BaseInterface):
@@ -615,10 +619,6 @@ class Interface(CableTermination, PathEndpoint, ComponentModel, BaseInterface):
     def is_lag(self):
         return self.type == InterfaceTypeChoices.TYPE_LAG
 
-    @property
-    def count_ipaddresses(self):
-        return self.ip_addresses.count()
-
 
 #
 # Pass-through ports
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index 518b7086c..a6e75e506 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -109,12 +109,13 @@ class VMInterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
         required=False,
         many=True
     )
+    count_ipaddresses = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = VMInterface
         fields = [
             'id', 'url', 'virtual_machine', 'name', 'enabled', 'mtu', 'mac_address', 'description', 'mode',
-            'untagged_vlan', 'tagged_vlans', 'tags',
+            'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses',
         ]
 
     def validate(self, data):
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 586ad5028..1bc40c2de 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -80,7 +80,7 @@ class VirtualMachineViewSet(ConfigContextQuerySetMixin, CustomFieldModelViewSet)
 
 class VMInterfaceViewSet(ModelViewSet):
     queryset = VMInterface.objects.prefetch_related(
-        'virtual_machine', 'tags', 'tagged_vlans'
+        'virtual_machine', 'tags', 'tagged_vlans', 'ip_addresses',
     )
     serializer_class = serializers.VMInterfaceSerializer
     filterset_class = filters.VMInterfaceFilterSet

From 4dfba3a2ada99c59b4684086cec0b061a7220305 Mon Sep 17 00:00:00 2001
From: tcaiazza <tim.caiazza@gmail.com>
Date: Fri, 9 Apr 2021 14:14:08 -0400
Subject: [PATCH 07/11] Update export-templates.md (#6091)

* Update export-templates.md

* Update export-templates.md

Co-authored-by: Jeremy Stretch <jeremy@netverity.dev>
---
 docs/additional-features/export-templates.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/additional-features/export-templates.md b/docs/additional-features/export-templates.md
index 1e0611f06..c9a7eea81 100644
--- a/docs/additional-features/export-templates.md
+++ b/docs/additional-features/export-templates.md
@@ -18,6 +18,14 @@ Height: {{ rack.u_height }}U
 
 To access custom fields of an object within a template, use the `cf` attribute. For example, `{{ obj.cf.color }}` will return the value (if any) for a custom field named `color` on `obj`.
 
+If you need to use the config context data in an export template, you'll should use the function `get_config_context` to get all the config context data. For example:
+```
+{% for server in queryset %}
+{% set data = server.get_config_context() %}
+{{ data.syslog }}
+{% endfor %}
+```
+
 A MIME type and file extension can optionally be defined for each export template. The default MIME type is `text/plain`.
 
 ## Example

From 2cc088c633990b5d81715597e54737fb4a6cd10d Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Fri, 9 Apr 2021 14:42:07 -0400
Subject: [PATCH 08/11] Fixes #6131: Correct handling of boolean fields when
 cloning objects

---
 docs/release-notes/version-2.10.md | 1 +
 netbox/utilities/utils.py          | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index fad8f218b..916af2d65 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -16,6 +16,7 @@
 * [#6073](https://github.com/netbox-community/netbox/issues/6073) - Permit users to manage their own REST API tokens without needing explicit permission
 * [#6081](https://github.com/netbox-community/netbox/issues/6081) - Fix interface connections REST API endpoint
 * [#6108](https://github.com/netbox-community/netbox/issues/6108) - Do not infer tenant assignment from parent objects for prefixes, IP addresses
+* [#6131](https://github.com/netbox-community/netbox/issues/6131) - Correct handling of boolean fields when cloning objects
 
 ---
 
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index d76b469b2..b7c5564ee 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -224,12 +224,12 @@ def prepare_cloned_fields(instance):
         field = instance._meta.get_field(field_name)
         field_value = field.value_from_object(instance)
 
-        # Swap out False with URL-friendly value
+        # Pass False as null for boolean fields
         if field_value is False:
-            field_value = ''
+            params.append((field_name, ''))
 
         # Omit empty values
-        if field_value not in (None, ''):
+        elif field_value not in (None, ''):
             params.append((field_name, field_value))
 
     # Copy tags

From 701ad8a4a966637759680aef3d3b1a70995f70ab Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Fri, 9 Apr 2021 20:51:58 +0200
Subject: [PATCH 09/11] Allow skipping TLS cert verification on Redis
 connection (#6084)

* Allow skipping redis tls cert verification

* Add config example
---
 netbox/netbox/configuration.example.py |  6 ++++++
 netbox/netbox/settings.py              | 26 +++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py
index 0dadb55bc..c40e280dd 100644
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -34,6 +34,9 @@ REDIS = {
         'PASSWORD': '',
         'DATABASE': 0,
         'SSL': False,
+        # Set this to True to skip TLS certificate verification
+        # This can expose the connection to attacks, be careful
+        # 'INSECURE_SKIP_TLS_VERIFY': False,
     },
     'caching': {
         'HOST': 'localhost',
@@ -44,6 +47,9 @@ REDIS = {
         'PASSWORD': '',
         'DATABASE': 1,
         'SSL': False,
+        # Set this to True to skip TLS certificate verification
+        # This can expose the connection to attacks, be careful
+        # 'INSECURE_SKIP_TLS_VERIFY': False,
     }
 }
 
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index ddc16e101..7fee45850 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -215,6 +215,7 @@ TASKS_REDIS_SENTINEL_TIMEOUT = TASKS_REDIS.get('SENTINEL_TIMEOUT', 10)
 TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '')
 TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)
 TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False)
+TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False)
 
 # Caching
 if 'caching' not in REDIS:
@@ -233,6 +234,7 @@ CACHING_REDIS_SENTINEL_SERVICE = CACHING_REDIS.get('SENTINEL_SERVICE', 'default'
 CACHING_REDIS_PASSWORD = CACHING_REDIS.get('PASSWORD', '')
 CACHING_REDIS_DATABASE = CACHING_REDIS.get('DATABASE', 0)
 CACHING_REDIS_SSL = CACHING_REDIS.get('SSL', False)
+CACHING_REDIS_SKIP_TLS_VERIFY = CACHING_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False)
 
 
 #
@@ -398,21 +400,14 @@ if CACHING_REDIS_USING_SENTINEL:
         'password': CACHING_REDIS_PASSWORD,
     }
 else:
-    if CACHING_REDIS_SSL:
-        REDIS_CACHE_CON_STRING = 'rediss://'
-    else:
-        REDIS_CACHE_CON_STRING = 'redis://'
-
-    if CACHING_REDIS_PASSWORD:
-        REDIS_CACHE_CON_STRING = '{}:{}@'.format(REDIS_CACHE_CON_STRING, CACHING_REDIS_PASSWORD)
-
-    REDIS_CACHE_CON_STRING = '{}{}:{}/{}'.format(
-        REDIS_CACHE_CON_STRING,
-        CACHING_REDIS_HOST,
-        CACHING_REDIS_PORT,
-        CACHING_REDIS_DATABASE
-    )
-    CACHEOPS_REDIS = REDIS_CACHE_CON_STRING
+    CACHEOPS_REDIS = {
+        'host': CACHING_REDIS_HOST,
+        'port': CACHING_REDIS_PORT,
+        'db': CACHING_REDIS_DATABASE,
+        'password': CACHING_REDIS_PASSWORD,
+        'ssl': CACHING_REDIS_SSL,
+        'ssl_cert_reqs': None if CACHING_REDIS_SKIP_TLS_VERIFY else 'required',
+    }
 
 if not CACHE_TIMEOUT:
     CACHEOPS_ENABLED = False
@@ -560,6 +555,7 @@ else:
         'DB': TASKS_REDIS_DATABASE,
         'PASSWORD': TASKS_REDIS_PASSWORD,
         'SSL': TASKS_REDIS_SSL,
+        'SSL_CERT_REQS': None if TASKS_REDIS_SKIP_TLS_VERIFY else 'required',
         'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT,
     }
 

From cc9b750eff5e239c75c1b111b46d7ca867991973 Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Fri, 9 Apr 2021 14:58:40 -0400
Subject: [PATCH 10/11] Changelog & docs for #6083

---
 docs/configuration/required-settings.md | 1 +
 docs/release-notes/version-2.10.md      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/configuration/required-settings.md b/docs/configuration/required-settings.md
index dba8cdc8c..3158fc73a 100644
--- a/docs/configuration/required-settings.md
+++ b/docs/configuration/required-settings.md
@@ -66,6 +66,7 @@ Redis is configured using a configuration setting similar to `DATABASE` and thes
 * `PASSWORD` - Redis password (if set)
 * `DATABASE` - Numeric database ID
 * `SSL` - Use SSL connection to Redis
+* `INSECURE_SKIP_TLS_VERIFY` - Set to `True` to **disable** TLS certificate verification (not recommended)
 
 An example configuration is provided below:
 
diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index 916af2d65..390c318f7 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -8,6 +8,7 @@
 * [#5756](https://github.com/netbox-community/netbox/issues/5756) - Omit child devices from non-racked devices list under rack view
 * [#5840](https://github.com/netbox-community/netbox/issues/5840) - Add column to cable termination objects to display cable color
 * [#6054](https://github.com/netbox-community/netbox/issues/6054) - Display NAPALM-enabled device tabs only when relevant
+* [#6083](https://github.com/netbox-community/netbox/issues/6083) - Support disabling TLS certificate validation for Redis
 
 ### Bug Fixes
 

From 348fca7e28c78df33996c8097b298881f9b7acc9 Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Sun, 11 Apr 2021 12:57:53 -0400
Subject: [PATCH 11/11] Fixes #6117: Handle exception when attempting to assign
 an MPTT-enabled model as its own parent

---
 docs/release-notes/version-2.10.md |  1 +
 netbox/dcim/models/racks.py        |  6 ++++++
 netbox/dcim/models/sites.py        | 10 ++++++++++
 netbox/tenancy/models.py           | 10 ++++++++++
 4 files changed, 27 insertions(+)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index 390c318f7..7d99959cc 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -17,6 +17,7 @@
 * [#6073](https://github.com/netbox-community/netbox/issues/6073) - Permit users to manage their own REST API tokens without needing explicit permission
 * [#6081](https://github.com/netbox-community/netbox/issues/6081) - Fix interface connections REST API endpoint
 * [#6108](https://github.com/netbox-community/netbox/issues/6108) - Do not infer tenant assignment from parent objects for prefixes, IP addresses
+* [#6117](https://github.com/netbox-community/netbox/issues/6117) - Handle exception when attempting to assign an MPTT-enabled model as its own parent
 * [#6131](https://github.com/netbox-community/netbox/issues/6131) - Correct handling of boolean fields when cloning objects
 
 ---
diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py
index dfaf7da61..0bd7e5afd 100644
--- a/netbox/dcim/models/racks.py
+++ b/netbox/dcim/models/racks.py
@@ -111,6 +111,12 @@ class RackGroup(MPTTModel, ChangeLoggedModel):
     def clean(self):
         super().clean()
 
+        # An MPTT model cannot be its own parent
+        if self.pk and self.parent_id == self.pk:
+            raise ValidationError({
+                "parent": "Cannot assign self as parent."
+            })
+
         # Parent RackGroup (if any) must belong to the same Site
         if self.parent and self.parent.site != self.site:
             raise ValidationError(f"Parent rack group ({self.parent}) must belong to the same site ({self.site})")
diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py
index 923b33124..908750905 100644
--- a/netbox/dcim/models/sites.py
+++ b/netbox/dcim/models/sites.py
@@ -7,6 +7,7 @@ from timezone_field import TimeZoneField
 
 from dcim.choices import *
 from dcim.constants import *
+from django.core.exceptions import ValidationError
 from dcim.fields import ASNField
 from extras.models import ChangeLoggedModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
@@ -87,6 +88,15 @@ class Region(MPTTModel, ChangeLoggedModel):
             object_data=serialize_object(self, exclude=['level', 'lft', 'rght', 'tree_id'])
         )
 
+    def clean(self):
+        super().clean()
+
+        # An MPTT model cannot be its own parent
+        if self.pk and self.parent_id == self.pk:
+            raise ValidationError({
+                "parent": "Cannot assign self as parent."
+            })
+
 
 #
 # Sites
diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py
index 3ba644c09..dbb8c4835 100644
--- a/netbox/tenancy/models.py
+++ b/netbox/tenancy/models.py
@@ -1,3 +1,4 @@
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
 from mptt.models import MPTTModel, TreeForeignKey
@@ -74,6 +75,15 @@ class TenantGroup(MPTTModel, ChangeLoggedModel):
             object_data=serialize_object(self, exclude=['level', 'lft', 'rght', 'tree_id'])
         )
 
+    def clean(self):
+        super().clean()
+
+        # An MPTT model cannot be its own parent
+        if self.pk and self.parent_id == self.pk:
+            raise ValidationError({
+                "parent": "Cannot assign self as parent."
+            })
+
 
 @extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
 class Tenant(ChangeLoggedModel, CustomFieldModel):