nautobot 2.1.8__py3-none-any.whl → 2.1.9__py3-none-any.whl

nautobot/apps/api.py

@@ -19,7 +19,7 @@ from nautobot.core.api.fields import (
 )
 from nautobot.core.api.mixins import WritableSerializerMixin
 from nautobot.core.api.parsers import NautobotCSVParser
-from nautobot.core.api.routers import OrderedDefaultRouter
+from nautobot.core.api.routers import AuthenticatedAPIRootView as APIRootView, OrderedDefaultRouter
 from nautobot.core.api.schema import NautobotAutoSchema
 from nautobot.core.api.serializers import (
     OptInFieldsMixin,
@@ -36,7 +36,6 @@ from nautobot.core.api.utils import (
     versioned_serializer_selector,
 )
 from nautobot.core.api.views import (
-    APIRootView,
     BulkDestroyModelMixin,
     BulkUpdateModelMixin,
     GetObjectCountsView,

nautobot/apps/utils.py

@@ -32,6 +32,8 @@ from nautobot.core.utils.lookup import (
     get_related_class_for_model,
     get_route_for_model,
     get_table_for_model,
+    get_url_for_url_pattern,
+    get_url_patterns,
 )
 from nautobot.core.utils.navigation import (
     get_all_new_ui_ready_routes,
@@ -110,6 +112,8 @@ __all__ = (
     "get_route_for_model",
     "get_settings_or_config",
     "get_table_for_model",
+    "get_url_for_url_pattern",
+    "get_url_patterns",
     "get_worker_count",
     "GitRepo",
     "hex_to_rgb",

nautobot/apps/views.py

@@ -8,6 +8,7 @@ from nautobot.core.views.generic import (
     BulkImportView,
     BulkRenameView,
     ComponentCreateView,
+    GenericView,
     ObjectDeleteView,
     ObjectEditView,
     ObjectImportView,
@@ -57,6 +58,7 @@ __all__ = (
     "csv_format",
     "EnhancedPage",
     "EnhancedPaginator",
+    "GenericView",
     "get_csv_form_fields_from_serializer_class",
     "get_paginate_count",
     "GetReturnURLMixin",

nautobot/circuits/api/urls.py

@@ -2,8 +2,7 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter()
-router.APIRootView = views.CircuitsRootView
+router = OrderedDefaultRouter(view_name="Circuits")
 
 # Providers
 router.register("providers", views.ProviderViewSet)

nautobot/circuits/api/views.py

@@ -1,5 +1,3 @@
-from rest_framework.routers import APIRootView
-
 from nautobot.circuits import filters
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.models.querysets import count_related
@@ -8,16 +6,6 @@ from nautobot.extras.api.views import NautobotModelViewSet
 
 from . import serializers
 
-
-class CircuitsRootView(APIRootView):
-    """
-    Circuits API root view
-    """
-
-    def get_view_name(self):
-        return "Circuits"
-
-
 #
 # Providers
 #

nautobot/core/api/routers.py

@@ -1,12 +1,23 @@
-from collections import OrderedDict
+import logging
 
 from rest_framework.routers import DefaultRouter
 
+from nautobot.core.api.views import AuthenticatedAPIRootView
+
+logger = logging.getLogger(__name__)
+
 
 class OrderedDefaultRouter(DefaultRouter):
-    def __init__(self, *args, **kwargs):
+    APIRootView = AuthenticatedAPIRootView
+
+    def __init__(self, *args, view_name=None, view_description=None, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self.view_name = view_name
+        if view_name and not view_description:
+            view_description = f"{view_name} API root view"
+        self.view_description = view_description
+
         # Extend the list view mappings to support the DELETE operation
         self.routes[0].mapping.update(
             {
@@ -20,9 +31,20 @@ class OrderedDefaultRouter(DefaultRouter):
         """
         Wrap DRF's DefaultRouter to return an alphabetized list of endpoints.
         """
-        api_root_dict = OrderedDict()
+        api_root_dict = {}
         list_name = self.routes[0].name
+
         for prefix, _viewset, basename in sorted(self.registry, key=lambda x: x[0]):
             api_root_dict[prefix] = list_name.format(basename=basename)
 
+        if issubclass(self.APIRootView, AuthenticatedAPIRootView):
+            return self.APIRootView.as_view(
+                api_root_dict=api_root_dict, name=self.view_name, description=self.view_description
+            )
+        # Fallback for the established practice of overriding self.APIRootView with a custom class
+        logger.warning(
+            "Something has changed an OrderedDefaultRouter's APIRootView attribute to a custom class. "
+            "Please verify that class %s implements appropriate authentication controls.",
+            self.APIRootView.__name__,
+        )
         return self.APIRootView.as_view(api_root_dict=api_root_dict)

nautobot/core/api/utils.py

@@ -178,6 +178,10 @@ def get_view_name(view, suffix=None):
 
     else:
         # Replicate DRF's built-in behavior.
+        name = getattr(view, "name", None)
+        if name is not None:
+            return view.name
+
         name = view.__class__.__name__
         name = formatting.remove_trailing_string(name, "View")
         name = formatting.remove_trailing_string(name, "ViewSet")

nautobot/core/api/views.py

@@ -22,9 +22,9 @@ from graphql import get_default_backend
 from graphql.execution import ExecutionResult
 from graphql.execution.middleware import MiddlewareManager
 from graphql.type.schema import GraphQLSchema
-from rest_framework import status
+from rest_framework import routers, status
 from rest_framework.exceptions import ParseError, PermissionDenied
-from rest_framework.permissions import AllowAny, IsAuthenticated
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.views import APIView
@@ -341,15 +341,25 @@ class ReadOnlyModelViewSet(NautobotAPIVersionMixin, ModelViewSetMixin, ReadOnlyM
 #
 
 
-class APIRootView(NautobotAPIVersionMixin, APIView):
+class AuthenticatedAPIRootView(NautobotAPIVersionMixin, routers.APIRootView):
     """
-    This is the root of the REST API. API endpoints are arranged by app and model name; e.g. `/api/dcim/locations/`.
+    Extends DRF's base APIRootView class to enforce user authentication.
     """
 
-    _ignore_model_permissions = True
+    permission_classes = [IsAuthenticated]
+
+    name = None
+    description = None
+
+
+class APIRootView(AuthenticatedAPIRootView):
+    """
+    This is the root of the REST API.
 
-    def get_view_name(self):
-        return "API Root"
+    API endpoints are arranged by app and model name; e.g. `/api/dcim/locations/`.
+    """
+
+    name = "API Root"
 
     @extend_schema(exclude=True)
     def get(self, request, format=None):  # pylint: disable=redefined-builtin
@@ -492,11 +502,6 @@ class NautobotSpectacularSwaggerView(APIVersioningGetSchemaURLMixin, Spectacular
     @extend_schema(exclude=True)
     def get(self, request, *args, **kwargs):
         """Fix up the rendering of the Swagger UI to work with Nautobot's UI."""
-        if not request.user.is_authenticated:
-            doc_url = reverse("api_docs")
-            login_url = reverse(settings.LOGIN_URL)
-            return redirect(f"{login_url}?next={doc_url}")
-
         # For backward compatibility wtih drf-yasg, `/api/docs/?format=openapi` is a redirect to the JSON schema.
         if request.GET.get("format") == "openapi":
             return redirect("schema_json", permanent=True)
@@ -525,11 +530,12 @@ class NautobotSpectacularRedocView(APIVersioningGetSchemaURLMixin, SpectacularRe
 class GraphQLDRFAPIView(NautobotAPIVersionMixin, APIView):
     """
     API View for GraphQL to integrate properly with DRF authentication mechanism.
-    The code is a stripped down version of graphene-django default View
-    https://github.com/graphql-python/graphene-django/blob/main/graphene_django/views.py#L57
     """
 
-    permission_classes = [AllowAny]
+    # The code is a stripped down version of graphene-django default View
+    # https://github.com/graphql-python/graphene-django/blob/main/graphene_django/views.py#L57
+
+    permission_classes = [IsAuthenticated]
     graphql_schema = None
     executor = None
     backend = None

nautobot/core/settings.py

@@ -242,6 +242,7 @@ SPECTACULAR_SETTINGS = {
     # trim it from all of the individual paths correspondingly.
     # See also https://github.com/nautobot/nautobot-ansible/pull/135 for an example of why this is desirable.
     "SERVERS": [{"url": "/api"}],
+    "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAuthenticated"],
     "SCHEMA_PATH_PREFIX": "/api",
     "SCHEMA_PATH_PREFIX_TRIM": True,
     # use sidecar - locally packaged UI files, not CDN

nautobot/core/templates/admin/base.html

@@ -8,55 +8,7 @@
 <html lang="en"{% if request.COOKIES|get_item:"theme" == 'dark' %} data-theme="dark"{% endif %}>
 <head>
     <title>{% block title %}Admin Home{% endblock %} - Nautobot</title>
-    <link rel="stylesheet"
-          href="{% static 'bootstrap-3.4.1-dist/css/bootstrap.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/css/bootstrap.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'materialdesignicons-6.5.95/css/materialdesignicons.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-6.5.95/css/materialdesignicons.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'jquery-ui-1.13.1/jquery-ui.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'select2-4.0.13/select2.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'flatpickr-4.6.9/themes/light.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/themes/light.min.css'">
-    <link rel="stylesheet" id="dark-theme"
-          href="{% versioned_static 'css/dark.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=css/dark.css'"{% if request.COOKIES|get_item:"theme" != 'dark' %} disabled="disabled"{% endif %} />
-    <link rel="stylesheet" id="base-theme"
-          href="{% versioned_static 'css/base.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=css/base.css'">
-    <link rel="apple-touch-icon" sizes="180x180" href="{%  custom_branding_or_static 'icon_180' 'img/nautobot_icon_180x180.png' %}">
-    <link rel="icon" type="image/png" sizes="32x32" href="{% custom_branding_or_static 'icon_32' 'img/nautobot_icon_32x32.png' %}">
-    <link rel="icon" type="image/png" sizes="16x16" href="{% custom_branding_or_static 'icon_16' 'img/nautobot_icon_16x16.png' %}">
-    <link rel="icon" type="image/png" href="{% custom_branding_or_static 'icon_192' 'img/nautobot_icon_192x192.png' %}" sizes="192x192">
-    <link rel="mask-icon" href="{% custom_branding_or_static 'icon_mask' 'img/nautobot_icon_monochrome.svg' %}" color="#0097ff">
-    <link rel="shortcut icon" href="{% custom_branding_or_static 'favicon' 'img/favicon.ico' %}">
-
-    <script src="{% static 'jquery/jquery-3.6.0.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery/jquery-3.6.0.min.js'"></script>
-    <script src="{% static 'jquery-ui-1.13.1/jquery-ui.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.js'"></script>
-    <script src="{% static 'bootstrap-3.4.1-dist/js/bootstrap.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/js/bootstrap.min.js'"></script>
-    <script src="{% static 'select2-4.0.13/select2.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.js'"></script>
-    <script src="{% static 'flatpickr-4.6.9/flatpickr.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/flatpickr.min.js'"></script>
-    <script src="{% static 'js/forms.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=js/forms.js'"></script>
-
-    <meta name="msapplication-TileColor" content="#2d89ef">
-    <meta name="theme-color" content="#ffffff">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-
+    {% include 'inc/media.html' %}
     {% block extrahead %}{% endblock %}
     {% block extrastyle %}{% endblock %}
 
@@ -94,23 +46,27 @@
         }
     </style>
 </head>
-<body {% if is_popup %}style="padding-top: 0px;"{% endif %}>
+<body {% if is_popup %}style="padding-left: 0px;"{% endif %}>
+
 {% if not is_popup %}
     {% include 'inc/nav_menu.html' %}
 {% endif %}
-<div class="container-fluid wrapper" {% if is_popup %}style="padding-bottom: 0px;"{% endif %}>
-    {% if "BANNER_TOP"|settings_or_config %}
-        <div class="alert alert-info text-center" role="alert">
-            {{ "BANNER_TOP"|settings_or_config|safe }}
-        </div>
-    {% endif %}
-    {% if settings.MAINTENANCE_MODE %}
-        <div class="alert alert-warning text-center" role="alert">
-            <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
-            <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
-        </div>
+
+<div class="container-fluid wrapper" id="main-content" {% if is_popup %}style="padding-bottom: 0px;"{% endif %}>
+    {% if not is_popup %}
+        {% if "BANNER_TOP"|settings_or_config %}
+            <div class="alert alert-info text-center" role="alert">
+                {{ "BANNER_TOP"|settings_or_config|safe }}
+            </div>
+        {% endif %}
+        {% if settings.MAINTENANCE_MODE %}
+            <div class="alert alert-warning text-center" role="alert">
+                <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
+                <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
+            </div>
+        {% endif %}
+        {% plugin_banners %}
     {% endif %}
-    {% plugin_banners %}
     {% for message in messages %}
         <div class="alert alert-{{ message.tags }} alert-dismissable" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -148,8 +104,6 @@
             {% block content %}{{ content }}{% endblock %}
         </div>
     </div>
-
-    {% block footer %}<footer id="footer"></footer>{% endblock %}
     <div class="push"></div>
     {% if "BANNER_BOTTOM"|settings_or_config %}
         <div class="alert alert-info text-center banner-bottom" role="alert">
@@ -158,37 +112,12 @@
     {% endif %}
 </div>
 {% if not is_popup %}
-    <footer class="footer">
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col-xs-4">
-                    <p class="text-muted">{{ settings.HOSTNAME }} (v{{ settings.VERSION }})</p>
-                </div>
-                <div class="col-xs-4 text-center">
-                    <p class="text-muted">{% now 'Y-m-d H:i:s T' %}</p>
-                </div>
-                <div class="col-xs-4 text-right noprint">
-                    <p class="text-muted">
-                        <a href="#theme_modal" data-toggle="modal" data-target="#theme_modal" id="btn-theme-modal"><i class="mdi mdi-theme-light-dark text-primary"></i>Theme</a> &middot;
-                        <i class="mdi mdi-book-open-page-variant text-primary"></i>
-                        {% if settings.BRANDING_URLS.docs %}
-                            <a href="{{ settings.BRANDING_URLS.docs }}">Docs</a>
-                        {% else %}
-                            <a href="{% static 'docs/index.html' %}">Docs</a>
-                        {% endif %}
-                        &middot;
-                        <i class="mdi mdi-cloud-braces text-primary"></i> <a href="{% url 'api_docs' %}">API</a> &middot;
-                        <i class="mdi mdi-graphql text-primary"></i> <a href="{% url 'graphql' %}">GraphQL</a> &middot;
-                        <i class="mdi mdi-xml text-primary"></i> <a href="{{ settings.BRANDING_URLS.code }}">Code</a> &middot;
-                        <i class="mdi mdi-lifebuoy text-primary"></i> <a href="{{ settings.BRANDING_URLS.help }}">Help</a>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </footer>
+    {% include 'inc/footer.html' %}
 {% endif %}
 {% include 'modals/modal_theme.html' with name='theme'%}
-<script src="{% versioned_static 'js/theme.js' %}"></script>
-{% block javascript %}{% endblock %}
+
+{% block javascript %}
+    {% include 'inc/javascript.html' %}
+{% endblock %}
 </body>
 </html>

nautobot/core/templates/graphene/graphiql.html

@@ -10,53 +10,31 @@ add "&raw" to the end of the URL within a browser.
 <!DOCTYPE html>
 <html>
 <head>
+  {% include 'inc/media.html' %}
+  {% block extra_styles %}{% endblock %}
   <!-- Nautobot template requirements -->
   <title>{% block title %}GraphiQL{% endblock %} - {{ settings.BRANDING_TITLE }}</title>
-  <link rel="stylesheet"
-        href="{% static 'bootstrap-3.4.1-dist/css/bootstrap.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/css/bootstrap.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'materialdesignicons-6.5.95/css/materialdesignicons.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-6.5.95/css/materialdesignicons.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'jquery-ui-1.13.1/jquery-ui.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'select2-4.0.13/select2.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'flatpickr-4.6.9/themes/light.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/themes/light.min.css'">
-  <link rel="stylesheet" id="dark-theme"
-        href="{% versioned_static 'css/dark.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=css/dark.css'" disabled="disabled" />
-  <link rel="stylesheet"
-        href="{% versioned_static 'css/base.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=css/base.css'">
-  <link rel="apple-touch-icon" sizes="180x180" href="{% custom_branding_or_static 'icon_180' 'img/nautobot_icon_180x180.png' %}">
-  <link rel="icon" type="image/png" sizes="32x32" href="{% custom_branding_or_static 'icon_32' 'img/nautobot_icon_32x32.png' %}">
-  <link rel="icon" type="image/png" sizes="16x16" href="{% custom_branding_or_static 'icon_16' 'img/nautobot_icon_16x16.png' %}">
-  <link rel="icon" type="image/png" sizes="192x192" href="{% custom_branding_or_static 'icon_192' 'img/nautobot_icon_192x192.png' %}">
-  <link rel="mask-icon" type="image/png" color="#0097ff" href="{% custom_branding_or_static 'icon_mask' 'img/nautobot_icon_monochrome.png' %}">
-  <link rel="shortcut icon" href="{% custom_branding_or_static 'favicon' 'img/favicon.ico' %}">
-  <meta name="msapplication-TileColor" content="#2d89ef">
-  <meta name="theme-color" content="#ffffff">
-  <meta charset="UTF-8">
-  <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
+
   <!-- GraphiQL template requirements -->
   <style>
-    html, body, #editor {
-      height: 100%;
+    #editor {
       margin: 0;
       width: 100%;
+      height: calc(100vh - 56px - 3rem);
     }
     .toolbar .dropdown-menu > li > a {
         clear: left;
         margin-right: 120px;  /* leave room for the "Save Changes" button if present */
     }
+    .graphiql-container .doc-explorer-title-bar {
+      box-sizing: content-box;
+  }
+    .graphiql-container .history-title-bar {
+      box-sizing: content-box;
+  }
+  .graphiql-container .docExplorerShow {
+    white-space: nowrap;
+  }
   </style>
   <!-- As Nautobot may be run without internet access, we source these files locally rather than from an online CDN -->
   <link rel="stylesheet"
@@ -72,23 +50,16 @@ add "&raw" to the end of the URL within a browser.
           onerror="window.location='{% url 'media_failure' %}?filename=graphiql-1.5.16/graphiql.min.js'"></script>
   <script src="{% static 'subscriptions-transport-ws-0.9.18/client.min.js' %}"
       onerror="window.location='{% url 'media_failure' %}?filename=subscriptions-transport-ws-0.9.18/client.min.js'"></script>
-  <!-- Custom CSS to address some conflicts between the two -->
-  <style>
-    body {
-      padding-top: 54px;
-    }
-    .graphiql-container .doc-explorer-title-bar {
-        box-sizing: content-box;
-    }
-  </style>
 </head>
 <body>
   <!-- Nautobot page contents -->
   {% include 'inc/nav_menu.html' %}
   {% include 'modals/modal_theme.html' with name='theme'%}
   {% include 'inc/javascript.html' %}
-  <!-- GraphiQL page contents -->
-  <div id="editor"></div>
+  <div class="container-fluid wrapper" id="main-content">
+    <!-- GraphiQL page contents -->
+    <div id="editor"></div>
+  </div>
   {% include 'inc/footer.html' %}
   {% csrf_token %}
   <script type="application/javascript">

nautobot/core/templates/inc/footer.html

@@ -3,8 +3,8 @@
 {% load plugins %}
 
 <style>
-    /* Styles for viewports narrower than 1007px */
-    @media (max-width: 1007px) {
+    /* Styles for viewports narrower than 1232px, i.e. bootstrap 'xs' and 'sm' layouts */
+    @media (max-width: 1232px) {
         .footer-col-1, .footer-col-2, .footer-col-3 {
             text-align: center !important;
         }
@@ -19,7 +19,7 @@
     <footer class="footer" id="footer">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-3 col-xs-12 text-left footer-col-1 no-wrap">
+                <div class="col-xl-4 col-lg-4 col-md-3 col-sm-12 col-xs-12 text-left footer-col-1 no-wrap">
                     {% if request.user.is_authenticated  %}
                         <p class="text-muted">
                             {% if settings.BRANDING_FILEPATHS.logo and settings.BRANDING_POWERED_BY_URL %}<a href="{{ settings.BRANDING_POWERED_BY_URL }}"><img src="{% static 'img/nautobot_logo.svg' %}" height="20" /> Powered</a> &middot;{% endif %}
@@ -27,10 +27,10 @@
                         </p>
                     {% endif %}
                 </div>
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-3 col-xs-12 text-center footer-col-2">
+                <div class="col-xl-4 col-lg-3 col-md-3 col-sm-12 col-xs-12 text-center footer-col-2">
                     <p class="text-muted">{% now 'Y-m-d H:i:s T' %}</p>
                 </div>
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-6 col-xs-12 text-right footer-col-3 noprint">
+                <div class="col-xl-4 col-lg-5 col-md-6 col-sm-12 col-xs-12 text-right footer-col-3 noprint">
                     {% if request.user.is_authenticated  %}
                     <p class="text-muted footer-links">
                         <a href="#theme_modal" data-toggle="modal" data-target="#theme_modal" id="btn-theme-modal"><i class="mdi mdi-theme-light-dark text-primary"></i>Theme</a> &middot;

nautobot/core/templates/inc/nav_menu.html

@@ -121,9 +121,6 @@
     document.addEventListener('DOMContentLoaded', function() {
         const navbar = document.querySelector('.navbar-fixed-left');
         const navbarHeader = document.querySelector('.navbar-header');
-        const breadcrumb = document.querySelector('.breadcrumb');
-        const bannerAlertArea = document.querySelector('.banner-alert-area');
-        const bannerAlert = document.querySelector('.plugin-banner') !== null;
         const mainContent = document.querySelector('#main-content');
         const footer = document.querySelector('#footer');
         const dropdownToggles = document.querySelectorAll('.navbar-fixed-left .navbar-nav > .dropdown > a[data-toggle="collapse"]');
@@ -180,10 +177,6 @@
         function adjustElementsForNavbarState(isCollapsed) {
             const marginLeftValue = isCollapsed ? '-240px' : '0px';
             mainContent.style.marginLeft = marginLeftValue;
-            bannerAlertArea.classList.toggle('collapsed', isCollapsed);
-            if(!bannerAlert && breadcrumb) {
-                breadcrumb.classList.toggle('collapsed', isCollapsed);
-            };
             if(footer) footer.style.marginLeft = marginLeftValue;
             toggler.style.left = isCollapsed ? '-5px' : '225px';
         }

nautobot/core/templates/rest_framework/api.html

@@ -7,13 +7,20 @@
     {% include 'inc/media.html' %}
 {% endblock bootstrap_theme %}
 
-{% block navbar %}
-    {% include 'inc/nav_menu.html' %}
-{% endblock navbar %}
-
 {% block body %}
-    {{ block.super }}
+    {% include 'inc/nav_menu.html' %}
+    <div class="container-fluid" id="main-content">
+        {{ block.super }}
+    </div>
     {% include 'inc/footer.html' %}
+    <style>
+        .navbar-static-top {
+            display: none;
+        }
+        #main-content {
+            min-height: calc(100vh - 70px);
+        }
+    </style>
 {% endblock body %}
 
 {% block script %}

nautobot/core/tests/integration/test_view_authentication.py

@@ -0,0 +1,67 @@
+from django.test import tag
+
+from nautobot.core.testing import TestCase
+from nautobot.core.utils.lookup import get_url_for_url_pattern, get_url_patterns
+
+
+@tag("integration")
+class AuthenticationEnforcedTestCase(TestCase):
+    r"""
+    Test that all\* registered views require authentication to access.
+
+    \* with a very small number of known exceptions such as login and logout views.
+    """
+
+    def test_all_views_require_authentication(self):
+        self.client.logout()
+        url_patterns = get_url_patterns()
+
+        for url_pattern in url_patterns:
+            with self.subTest(url_pattern=url_pattern):
+                url = get_url_for_url_pattern(url_pattern)
+                response = self.client.get(url, follow=True)
+
+                if response.status_code == 405:  # Method not allowed
+                    response = self.client.post(url, follow=True)
+
+                # Is a view that *should* be open to unauthenticated users?
+                if url in [
+                    "/admin/login/",
+                    "/api/plugins/example-plugin/webhook/",
+                    "/health/",
+                    "/login/",
+                    "/media-failure/",
+                    "/template.css",
+                ]:
+                    self.assertHttpStatus(response, 200, msg=url)
+                elif response.status_code == 200:
+                    # UI views generally should redirect unauthenticated users to the appropriate login page
+                    if url.startswith("/admin"):
+                        if "logout" in url:
+                            # /admin/logout/ sets next=/admin/ because having login redirect to logout would be silly
+                            redirect_url = "/admin/login/?next=/admin/"
+                        else:
+                            redirect_url = f"/admin/login/?next={url}"
+                    else:
+                        if "logout" in url:
+                            # /logout/ sets next=/ because having login redirect back to logout would be silly
+                            redirect_url = "/login/?next=/"
+                        else:
+                            redirect_url = f"/login/?next={url}"
+                    self.assertRedirects(response, redirect_url)
+                elif response.status_code != 403:
+                    if any(
+                        url.startswith(path)
+                        for path in [
+                            "/complete/",  # social auth
+                            "/login/",  # social auth
+                            "/media/",  # MEDIA_ROOT
+                            "/plugins/example-plugin/docs/",  # STATIC_ROOT
+                        ]
+                    ):
+                        self.assertEqual(response.status_code, 404)
+                    else:
+                        self.fail(
+                            f"Unexpected {response.status_code} response at {url}: "
+                            + response.content.decode(response.charset)
+                        )

nautobot/core/tests/test_graphql.py

@@ -630,21 +630,9 @@ class GraphQLAPIPermissionTest(GraphQLTestCaseBase):
         self.assertEqual(names, ["Rack 1-1", "Rack 1-2", "Rack 2-1", "Rack 2-2"])
 
     def test_graphql_api_no_token(self):
-        """Validate unauthenticated users are not able to query anything by default."""
+        """Validate unauthenticated users are not able to query anything."""
         response = self.client.post(self.api_url, {"query": self.get_racks_query}, format="json")
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIsInstance(response.data["data"]["racks"], list)
-        names = [item["name"] for item in response.data["data"]["racks"]]
-        self.assertEqual(names, [])
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
-    def test_graphql_api_no_token_exempt(self):
-        """Validate unauthenticated users are able to query based on the exempt permissions."""
-        response = self.client.post(self.api_url, {"query": self.get_racks_query}, format="json")
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIsInstance(response.data["data"]["racks"], list)
-        names = [item["name"] for item in response.data["data"]["racks"]]
-        self.assertEqual(names, ["Rack 1-1", "Rack 1-2", "Rack 2-1", "Rack 2-2"])
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
     def test_graphql_api_wrong_token(self):
         """Validate a wrong token return 403."""