mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #6467: Fix access to metrics on custom BASE_PATH when login is required

Browse Source
This commit is contained in:
jeremystretch
2021-05-21 15:56:22 -04:00
parent 239fddcac2
commit a6eeed4061
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.11.md
View File

@ -15,6 +15,7 @@
* [#6426](https://github.com/netbox-community/netbox/issues/6426) - Allow assigning virtual chassis member interfaces to LAG on VC master * [#6426](https://github.com/netbox-community/netbox/issues/6426) - Allow assigning virtual chassis member interfaces to LAG on VC master
* [#6438](https://github.com/netbox-community/netbox/issues/6438) - Fix missing descriptions and label for device type imports and exports * [#6438](https://github.com/netbox-community/netbox/issues/6438) - Fix missing descriptions and label for device type imports and exports
* [#6465](https://github.com/netbox-community/netbox/issues/6465) - Fix typo in installed plugins REST API endpoint * [#6465](https://github.com/netbox-community/netbox/issues/6465) - Fix typo in installed plugins REST API endpoint
* [#6467](https://github.com/netbox-community/netbox/issues/6467) - Fix access to metrics on custom `BASE_PATH` when login is required
* [#6468](https://github.com/netbox-community/netbox/issues/6468) - Disable ordering VLAN groups list by scope object * [#6468](https://github.com/netbox-community/netbox/issues/6468) - Disable ordering VLAN groups list by scope object
--- ---

23
netbox/netbox/middleware.py
View File

@ -20,17 +20,20 @@ class LoginRequiredMiddleware(object):
self.get_response = get_response self.get_response = get_response
def __call__(self, request): def __call__(self, request):
# Redirect unauthenticated requests (except those exempted) to the login page if LOGIN_REQUIRED is true
if settings.LOGIN_REQUIRED and not request.user.is_authenticated: if settings.LOGIN_REQUIRED and not request.user.is_authenticated:
# Redirect unauthenticated requests to the login page. API requests are exempt from redirection as the API # Determine exempt paths
# performs its own authentication. Also metrics can be read without login. exempt_paths = [
api_path = reverse('api-root') reverse('api-root')
if not request.path_info.startswith((api_path, '/metrics')) and request.path_info != settings.LOGIN_URL: ]
return HttpResponseRedirect( if settings.METRICS_ENABLED:
'{}?next={}'.format( exempt_paths.append(reverse('prometheus-django-metrics'))
settings.LOGIN_URL,
parse.quote(request.get_full_path_info()) # Redirect unauthenticated requests
) if not request.path_info.startswith(tuple(exempt_paths)) and request.path_info != settings.LOGIN_URL:
) login_url = f'{settings.LOGIN_URL}?next={parse.quote(request.get_full_path_info())}'
return HttpResponseRedirect(login_url)
return self.get_response(request) return self.get_response(request)