From 2dc1b6571822897b7bd18ddc9957d5b9368759fb Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 6 Jul 2020 20:50:14 +0200 Subject: [PATCH 1/3] ui: fix modal layout --- passbook/admin/templates/administration/overview.html | 4 +++- .../providers/app_gw/templates/app_gw/setup_modal.html | 8 ++++++-- .../oauth/templates/providers/oauth/setup_url_modal.html | 4 +++- .../oidc/templates/oidc_provider/setup_url_modal.html | 4 +++- .../templates/providers/saml/admin_metadata_modal.html | 4 +++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/passbook/admin/templates/administration/overview.html b/passbook/admin/templates/administration/overview.html index 1c4cd1a4f..fb55b4ff1 100644 --- a/passbook/admin/templates/administration/overview.html +++ b/passbook/admin/templates/administration/overview.html @@ -173,7 +173,9 @@ -

{% trans 'Clear Cache' %}?

+
+

{% trans 'Clear Cache' %}?

+
{% csrf_token %} diff --git a/passbook/providers/app_gw/templates/app_gw/setup_modal.html b/passbook/providers/app_gw/templates/app_gw/setup_modal.html index db8000332..f4de2c203 100644 --- a/passbook/providers/app_gw/templates/app_gw/setup_modal.html +++ b/passbook/providers/app_gw/templates/app_gw/setup_modal.html @@ -21,7 +21,9 @@ -

{% trans 'Setup with docker-compose' %}

+
+

{% trans 'Setup with docker-compose' %}

+
{% trans 'Add the following snippet to your docker-compose file.' %} @@ -39,7 +41,9 @@ -

{% trans 'Setup with Kubernetes' %}

+
+

{% trans 'Setup with Kubernetes' %}

+

{% trans 'Download the manifest to create the Gatekeeper deployment and service:' %}

{% trans 'Here' %} diff --git a/passbook/providers/oauth/templates/providers/oauth/setup_url_modal.html b/passbook/providers/oauth/templates/providers/oauth/setup_url_modal.html index 555667ff6..26419ba45 100644 --- a/passbook/providers/oauth/templates/providers/oauth/setup_url_modal.html +++ b/passbook/providers/oauth/templates/providers/oauth/setup_url_modal.html @@ -7,7 +7,9 @@ -

{% trans 'Setup URLs' %}

+
+

{% trans 'Setup URLs' %}

+
diff --git a/passbook/providers/oidc/templates/oidc_provider/setup_url_modal.html b/passbook/providers/oidc/templates/oidc_provider/setup_url_modal.html index ccfd0cbe4..1805247f8 100644 --- a/passbook/providers/oidc/templates/oidc_provider/setup_url_modal.html +++ b/passbook/providers/oidc/templates/oidc_provider/setup_url_modal.html @@ -8,7 +8,9 @@ -

{% trans 'Setup URLs' %}

+
+

{% trans 'Setup URLs' %}

+
diff --git a/passbook/providers/saml/templates/providers/saml/admin_metadata_modal.html b/passbook/providers/saml/templates/providers/saml/admin_metadata_modal.html index c52518970..606711433 100644 --- a/passbook/providers/saml/templates/providers/saml/admin_metadata_modal.html +++ b/passbook/providers/saml/templates/providers/saml/admin_metadata_modal.html @@ -8,7 +8,9 @@ -

{% trans 'Metadata' %}

+
+

{% trans 'Metadata' %}

+
From d8f27f595aba6fbd48b9a49dfa38199136298cb0 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 7 Jul 2020 13:12:54 +0200 Subject: [PATCH 2/3] admin: use django cache for admin version (expiry) --- passbook/admin/views/overview.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/passbook/admin/views/overview.py b/passbook/admin/views/overview.py index 5c049cf7d..f969c6da8 100644 --- a/passbook/admin/views/overview.py +++ b/passbook/admin/views/overview.py @@ -1,6 +1,4 @@ """passbook administration overview""" -from functools import lru_cache - from django.core.cache import cache from django.shortcuts import redirect, reverse from django.views.generic import TemplateView @@ -15,18 +13,21 @@ from passbook.policies.models import Policy from passbook.root.celery import CELERY_APP from passbook.stages.invitation.models import Invitation +VERSION_CACHE_KEY = "passbook_latest_version" + -@lru_cache def latest_version() -> Version: """Get latest release from GitHub, cached""" - try: - data = get( - "https://api.github.com/repos/beryju/passbook/releases/latest" - ).json() - tag_name = data.get("tag_name") - return parse(tag_name.split("/")[1]) - except RequestException: - return parse("0.0.0") + if not cache.get(VERSION_CACHE_KEY): + try: + data = get( + "https://api.github.com/repos/beryju/passbook/releases/latest" + ).json() + tag_name = data.get("tag_name") + cache.set(VERSION_CACHE_KEY, tag_name.split("/")[1], 30) + except (RequestException, IndexError): + cache.set(VERSION_CACHE_KEY, "0.0.0", 30) + return parse(cache.get(VERSION_CACHE_KEY)) class AdministrationOverviewView(AdminRequiredMixin, TemplateView): From b12182c1d1fef6d78081c54e0eff0b0ff1270fab Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 7 Jul 2020 13:13:15 +0200 Subject: [PATCH 3/3] admin: improve overview layout --- .../templates/administration/overview.html | 119 +++++++++++++----- passbook/admin/views/overview.py | 1 + passbook/static/static/passbook/pf.css | 6 + 3 files changed, 94 insertions(+), 32 deletions(-) diff --git a/passbook/admin/templates/administration/overview.html b/passbook/admin/templates/administration/overview.html index fb55b4ff1..95da74a2e 100644 --- a/passbook/admin/templates/administration/overview.html +++ b/passbook/admin/templates/administration/overview.html @@ -10,29 +10,33 @@
- +
{% trans 'Applications' %}
- {{ application_count }} +

+ {{ application_count }} +

- +
{% trans 'Sources' %}
- {{ source_count }} +

+ {{ source_count }} +

- +
{% trans 'Providers' %} @@ -40,15 +44,19 @@
{% if providers_without_application.exists %} - {{ provider_count }} +

+ {{ provider_count }} +

{% trans 'Warning: At least one Provider has no application assigned.' %}

{% else %} - {{ provider_count }} +

+ {{ provider_count }} +

{% endif %}
- +
{% trans 'Stages' %} @@ -56,26 +64,32 @@
{% if stage_count < 1 %} - {{ stage_count }} +

+ {{ stage_count }} +

{% trans 'No Stages configured. No Users will be able to login.' %}">

{% else %} - {{ stage_count }} +

+ {{ stage_count }} +

{% endif %}
- +
{% trans 'Flows' %}
- {{ flow_count }} +

+ {{ flow_count }} +

- +
{% trans 'Policies' %} @@ -83,58 +97,71 @@
{% if policies_without_binding %} - {{ policy_count }} +

+ {{ policy_count }} +

{% trans 'Policies without binding exist.' %}

{% else %} - {{ policy_count }} +

+ {{ policy_count }} +

{% endif %}
- +
{% trans 'Invitation' %}
- {{ invitation_count }} +

+ {{ invitation_count }} +

- +
{% trans 'Users' %}
- {{ user_count }} +

+ {{ user_count }} +

-
+
{% trans 'Version' %}
+

+ {% if version >= version_latest %} + {{ version }} + {% else %} + {{ version }} + {% endif %} +

{% if version >= version_latest %} - - {% blocktrans with version=version %} - {{ version }} (Up-to-date!) + {% blocktrans %} + Up-to-date! {% endblocktrans %} {% else %} - - {% blocktrans with version=version latest=version_latest %} - {{ version }} ({{ latest }} is available!) + {% blocktrans with latest=version_latest %} + {{ latest }} is available! {% endblocktrans %} {% endif %}
-
+
{% trans 'Workers' %} @@ -142,15 +169,19 @@
{% if worker_count < 1 %} - {{ worker_count }} +

+ {{ worker_count }} +

{% trans 'No workers connected.' %}

{% else %} - {{ worker_count }} +

+ {{ worker_count }} +

{% endif %}
- +
{% trans 'Cached Policies' %} @@ -158,13 +189,37 @@
{% if cached_policies < 1 %} - {{ cached_policies }} +

+ {{ cached_policies }} +

{% trans 'No policies cached. Users may experience slow response times.' %}

{% else %} - {{ cached_policies }} +

+ {{ cached_policies }} +

{% endif %}
+ +
+
+
+ {% trans 'Cached Flows' %} +
+
+
+ {% if cached_flows < 1 %} +

+ {{ cached_flows }} +

+

{% trans 'No flows cached.' %}

+ {% else %} +

+ {{ cached_flows }} +

+ {% endif %} +
+