Merge pull request #5236 from netbox-community/develop

Release v2.9.7

docs/release-notes/version-2.9.md

@@ -1,5 +1,21 @@
 # NetBox v2.9
 
+## v2.9.7 (2020-10-12)
+
+### Bug Fixes
+
+* [#5231](https://github.com/netbox-community/netbox/issues/5231) - Fix KeyError exception when viewing object with custom link and debugging is disabled
+
+---
+
+## v2.9.6 (2020-10-09)
+
+### Bug Fixes
+
+* [#5229](https://github.com/netbox-community/netbox/issues/5229) - Fix AttributeError exception when LDAP authentication is enabled
+
+---
+
 ## v2.9.5 (2020-10-09)
 
 ### Enhancements

netbox/extras/templatetags/custom_links.py

@@ -33,7 +33,7 @@ def custom_links(context, obj):
     # Pass select context data when rendering the CustomLink
     link_context = {
         'obj': obj,
-        'debug': context['debug'],  # django.template.context_processors.debug
+        'debug': context.get('debug', False),  # django.template.context_processors.debug
         'request': context['request'],  # django.template.context_processors.request
         'user': context['user'],  # django.contrib.auth.context_processors.auth
         'perms': context['perms'],  # django.contrib.auth.context_processors.auth

netbox/extras/tests/test_views.py

@@ -2,11 +2,13 @@ import urllib.parse
 import uuid
 
 from django.contrib.auth.models import User
+from django.contrib.contenttypes.models import ContentType
+from django.test import override_settings
 from django.urls import reverse
 
 from dcim.models import Site
 from extras.choices import ObjectChangeActionChoices
-from extras.models import ConfigContext, ObjectChange, Tag
+from extras.models import ConfigContext, CustomLink, ObjectChange, Tag
 from utilities.testing import ViewTestCases, TestCase
 
 
@@ -124,3 +126,24 @@ class ObjectChangeTestCase(TestCase):
         objectchange = ObjectChange.objects.first()
         response = self.client.get(objectchange.get_absolute_url())
         self.assertHttpStatus(response, 200)
+
+
+class CustomLinkTest(TestCase):
+    user_permissions = ['dcim.view_site']
+
+    def test_view_object_with_custom_link(self):
+        customlink = CustomLink(
+            content_type=ContentType.objects.get_for_model(Site),
+            name='Test',
+            text='FOO {{ obj.name }} BAR',
+            url='http://example.com/?site={{ obj.slug }}',
+            new_window=False
+        )
+        customlink.save()
+
+        site = Site(name='Test Site', slug='test-site')
+        site.save()
+
+        response = self.client.get(site.get_absolute_url(), follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(f'FOO {site.name} BAR', str(response.content))

netbox/netbox/authentication.py

@@ -175,6 +175,6 @@ class LDAPBackend:
         # Enable logging for django_auth_ldap
         ldap_logger = logging.getLogger('django_auth_ldap')
         ldap_logger.addHandler(logging.StreamHandler())
-        ldap_logger.setLevel(logging.INFO if settings.DEBUG is False else logging.DEBUG)
+        ldap_logger.setLevel(logging.INFO)
 
         return obj

netbox/netbox/settings.py

@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '2.9.5'
+VERSION = '2.9.7'
 
 # Hostname
 HOSTNAME = platform.node()