From b2e0241b1274f390a049a4d314a612d59859227e Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 1 Mar 2022 00:57:53 +1100
Subject: [PATCH 1/2] Adds option to "obfuscate" the admin URL

- By default, uses '/admin/'
- Can be set in config yaml file
- Can be set by environment variable
---
 InvenTree/InvenTree/settings.py | 8 ++++++++
 InvenTree/InvenTree/urls.py     | 8 ++++----
 InvenTree/templates/navbar.html | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py
index c45be06f4b..121f1b6383 100644
--- a/InvenTree/InvenTree/settings.py
+++ b/InvenTree/InvenTree/settings.py
@@ -309,6 +309,14 @@ if DEBUG and CONFIG.get('debug_toolbar', False):  # pragma: no cover
     INSTALLED_APPS.append('debug_toolbar')
     MIDDLEWARE.append('debug_toolbar.middleware.DebugToolbarMiddleware')
 
+# InvenTree URL configuration
+
+# Base URL for admin pages (default="admin")
+INVENTREE_ADMIN_URL = get_setting(
+    'INVENTREE_ADMIN_URL',
+    CONFIG.get('admin_url', 'admin'),
+)
+
 ROOT_URLCONF = 'InvenTree.urls'
 
 TEMPLATES = [
diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index b1941da8db..6c444497b9 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -4,7 +4,7 @@ Top-level URL lookup for InvenTree application.
 Passes URL lookup downstream to each app as required.
 """
 
-
+from django.conf import settings
 from django.conf.urls import url, include
 from django.urls import path
 from django.contrib import admin
@@ -169,9 +169,9 @@ frontendpatterns = [
     url(r'^stats/', DatabaseStatsView.as_view(), name='stats'),
 
     # admin sites
-    url(r'^admin/error_log/', include('error_report.urls')),
-    url(r'^admin/shell/', include('django_admin_shell.urls')),
-    url(r'^admin/', admin.site.urls, name='inventree-admin'),
+    url(f'^{settings.INVENTREE_ADMIN_URL}/error_log/', include('error_report.urls')),
+    url(f'^{settings.INVENTREE_ADMIN_URL}/shell/', include('django_admin_shell.urls')),
+    url(f'^{settings.INVENTREE_ADMIN_URL}/', admin.site.urls, name='inventree-admin'),
 
     # DB user sessions
     url(r'^accounts/sessions/other/delete/$', view=CustomSessionDeleteOtherView.as_view(), name='session_delete_other', ),
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index 7fd4a76eff..e898b5fafa 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -108,7 +108,7 @@
         <ul class='dropdown-menu dropdown-menu-end inventree-navbar-menu'>
           {% if user.is_authenticated %}
           {% if user.is_staff and not demo %}
-          <li><a class='dropdown-item' href="/admin/"><span class="fas fa-user-shield"></span> {% trans "Admin" %}</a></li>
+          <li><a class='dropdown-item' href="{% url 'admin:index' %}"><span class="fas fa-user-shield"></span> {% trans "Admin" %}</a></li>
           {% endif %}
           <li><a class='dropdown-item' href="{% url 'settings' %}"><span class="fas fa-cog"></span> {% trans "Settings" %}</a></li>
           <li><a class='dropdown-item' href="{% url 'account_logout' %}"><span class="fas fa-sign-out-alt"></span> {% trans "Logout" %}</a></li>

From 9d3f6ea41888336163aa983d303d30021b58731c Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 1 Mar 2022 00:58:20 +1100
Subject: [PATCH 2/2] PEP fix

---
 InvenTree/InvenTree/urls.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 6c444497b9..cf996547df 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -4,7 +4,6 @@ Top-level URL lookup for InvenTree application.
 Passes URL lookup downstream to each app as required.
 """
 
-from django.conf import settings
 from django.conf.urls import url, include
 from django.urls import path
 from django.contrib import admin