- {{ token.pk }}
+ {{ token.pk.hex }}
|
@@ -51,7 +51,11 @@
|
+ {% if not token.expiring %}
+ -
+ {% else %}
{{ token.expires }}
+ {% endif %}
|
diff --git a/passbook/admin/urls.py b/passbook/admin/urls.py
index 3c2771f5d..09d90d062 100644
--- a/passbook/admin/urls.py
+++ b/passbook/admin/urls.py
@@ -6,6 +6,7 @@ from passbook.admin.views import (
certificate_key_pair,
flows,
groups,
+ outposts,
overview,
policies,
policies_bindings,
@@ -271,4 +272,19 @@ urlpatterns = [
certificate_key_pair.CertificateKeyPairDeleteView.as_view(),
name="certificatekeypair-delete",
),
+ # Outposts
+ path("outposts/", outposts.OutpostListView.as_view(), name="outposts",),
+ path(
+ "outposts/create/", outposts.OutpostCreateView.as_view(), name="outpost-create",
+ ),
+ path(
+ "outposts//update/",
+ outposts.OutpostUpdateView.as_view(),
+ name="outpost-update",
+ ),
+ path(
+ "outposts//delete/",
+ outposts.OutpostDeleteView.as_view(),
+ name="outpost-delete",
+ ),
]
diff --git a/passbook/admin/views/outposts.py b/passbook/admin/views/outposts.py
new file mode 100644
index 000000000..b3ecd555e
--- /dev/null
+++ b/passbook/admin/views/outposts.py
@@ -0,0 +1,67 @@
+"""passbook Outpost administration"""
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.mixins import (
+ PermissionRequiredMixin as DjangoPermissionRequiredMixin,
+)
+from django.contrib.messages.views import SuccessMessageMixin
+from django.urls import reverse_lazy
+from django.utils.translation import ugettext as _
+from django.views.generic import ListView, UpdateView
+from guardian.mixins import PermissionListMixin, PermissionRequiredMixin
+
+from passbook.admin.views.utils import DeleteMessageView
+from passbook.lib.views import CreateAssignPermView
+from passbook.outposts.forms import OutpostForm
+from passbook.outposts.models import Outpost
+
+
+class OutpostListView(LoginRequiredMixin, PermissionListMixin, ListView):
+ """Show list of all outposts"""
+
+ model = Outpost
+ permission_required = "passbook_outposts.view_outpost"
+ ordering = "name"
+ paginate_by = 40
+ template_name = "administration/outpost/list.html"
+
+
+class OutpostCreateView(
+ SuccessMessageMixin,
+ LoginRequiredMixin,
+ DjangoPermissionRequiredMixin,
+ CreateAssignPermView,
+):
+ """Create new Outpost"""
+
+ model = Outpost
+ form_class = OutpostForm
+ permission_required = "passbook_outposts.add_outpost"
+
+ template_name = "generic/create.html"
+ success_url = reverse_lazy("passbook_admin:outposts")
+ success_message = _("Successfully created Outpost")
+
+
+class OutpostUpdateView(
+ SuccessMessageMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView
+):
+ """Update outpost"""
+
+ model = Outpost
+ form_class = OutpostForm
+ permission_required = "passbook_outposts.change_outpost"
+
+ template_name = "generic/update.html"
+ success_url = reverse_lazy("passbook_admin:outposts")
+ success_message = _("Successfully updated Certificate-Key Pair")
+
+
+class OutpostDeleteView(LoginRequiredMixin, PermissionRequiredMixin, DeleteMessageView):
+ """Delete outpost"""
+
+ model = Outpost
+ permission_required = "passbook_outposts.delete_outpost"
+
+ template_name = "generic/delete.html"
+ success_url = reverse_lazy("passbook_admin:outposts")
+ success_message = _("Successfully deleted Certificate-Key Pair")
diff --git a/passbook/core/api/messages.py b/passbook/api/v2/messages.py
similarity index 100%
rename from passbook/core/api/messages.py
rename to passbook/api/v2/messages.py
diff --git a/passbook/api/v2/urls.py b/passbook/api/v2/urls.py
index 1fa630d22..2acadd0c3 100644
--- a/passbook/api/v2/urls.py
+++ b/passbook/api/v2/urls.py
@@ -6,15 +6,17 @@ from drf_yasg.views import get_schema_view
from rest_framework import routers
from passbook.api.permissions import CustomObjectPermissions
+from passbook.api.v2.messages import MessagesViewSet
from passbook.audit.api import EventViewSet
from passbook.core.api.applications import ApplicationViewSet
from passbook.core.api.groups import GroupViewSet
-from passbook.core.api.messages import MessagesViewSet
from passbook.core.api.propertymappings import PropertyMappingViewSet
from passbook.core.api.providers import ProviderViewSet
from passbook.core.api.sources import SourceViewSet
from passbook.core.api.users import UserViewSet
+from passbook.crypto.api import CertificateKeyPairViewSet
from passbook.flows.api import FlowStageBindingViewSet, FlowViewSet, StageViewSet
+from passbook.outposts.api import OutpostViewSet
from passbook.policies.api import PolicyBindingViewSet, PolicyViewSet
from passbook.policies.dummy.api import DummyPolicyViewSet
from passbook.policies.expiry.api import PasswordExpiryPolicyViewSet
@@ -24,7 +26,7 @@ from passbook.policies.hibp.api import HaveIBeenPwendPolicyViewSet
from passbook.policies.password.api import PasswordPolicyViewSet
from passbook.policies.reputation.api import ReputationPolicyViewSet
from passbook.providers.oauth2.api import OAuth2ProviderViewSet, ScopeMappingViewSet
-from passbook.providers.proxy.api import ProxyProviderViewSet
+from passbook.providers.proxy.api import OutpostConfigViewSet, ProxyProviderViewSet
from passbook.providers.saml.api import SAMLPropertyMappingViewSet, SAMLProviderViewSet
from passbook.sources.ldap.api import LDAPPropertyMappingViewSet, LDAPSourceViewSet
from passbook.sources.oauth.api import OAuthSourceViewSet
@@ -47,10 +49,14 @@ from passbook.stages.user_write.api import UserWriteStageViewSet
router = routers.DefaultRouter()
+router.register("root/messages", MessagesViewSet, basename="messages")
router.register("core/applications", ApplicationViewSet)
router.register("core/groups", GroupViewSet)
router.register("core/users", UserViewSet)
-router.register("core/messages", MessagesViewSet, basename="messages")
+router.register("outposts/outposts", OutpostViewSet)
+router.register("outposts/proxy", OutpostConfigViewSet)
+
+router.register("crypto/certificatekeypairs", CertificateKeyPairViewSet)
router.register("audit/events", EventViewSet)
diff --git a/passbook/core/forms/applications.py b/passbook/core/forms/applications.py
index bf796ad1f..c35a6bf7c 100644
--- a/passbook/core/forms/applications.py
+++ b/passbook/core/forms/applications.py
@@ -9,10 +9,11 @@ from passbook.lib.widgets import GroupedModelChoiceField
class ApplicationForm(forms.ModelForm):
"""Application Form"""
- provider = GroupedModelChoiceField(
- queryset=Provider.objects.all().order_by("pk").select_subclasses(),
- required=False,
- )
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.fields["provider"].queryset = (
+ Provider.objects.all().order_by("pk").select_subclasses()
+ )
class Meta:
@@ -32,6 +33,7 @@ class ApplicationForm(forms.ModelForm):
"meta_icon_url": forms.TextInput(),
"meta_publisher": forms.TextInput(),
}
+ field_classes = {"provider": GroupedModelChoiceField}
labels = {
"meta_launch_url": _("Launch URL"),
"meta_icon_url": _("Icon URL"),
diff --git a/passbook/core/migrations/0008_auto_20200824_1532.py b/passbook/core/migrations/0008_auto_20200824_1532.py
new file mode 100644
index 000000000..23ac85430
--- /dev/null
+++ b/passbook/core/migrations/0008_auto_20200824_1532.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.1 on 2020-08-24 15:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("auth", "0012_alter_user_first_name_max_length"),
+ ("passbook_core", "0007_auto_20200815_1841"),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name="user",
+ name="groups",
+ field=models.ManyToManyField(to="passbook_core.Group"),
+ ),
+ migrations.AddField(
+ model_name="user",
+ name="groups",
+ field=models.ManyToManyField(
+ blank=True,
+ help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+ related_name="user_set",
+ related_query_name="user",
+ to="auth.Group",
+ verbose_name="groups",
+ ),
+ ),
+ migrations.AddField(
+ model_name="user",
+ name="pb_groups",
+ field=models.ManyToManyField(to="passbook_core.Group"),
+ ),
+ ]
diff --git a/passbook/core/models.py b/passbook/core/models.py
index 756bbe1b1..db93f8b10 100644
--- a/passbook/core/models.py
+++ b/passbook/core/models.py
@@ -58,7 +58,7 @@ class User(GuardianUserMixin, AbstractUser):
name = models.TextField(help_text=_("User's display name."))
sources = models.ManyToManyField("Source", through="UserSourceConnection")
- groups = models.ManyToManyField("Group")
+ pb_groups = models.ManyToManyField("Group")
password_change_date = models.DateTimeField(auto_now_add=True)
attributes = models.JSONField(default=dict, blank=True)
diff --git a/passbook/core/templates/error/generic.html b/passbook/core/templates/error/generic.html
index 30b7e9386..8dd8d13da 100644
--- a/passbook/core/templates/error/generic.html
+++ b/passbook/core/templates/error/generic.html
@@ -8,6 +8,10 @@
{% trans card_title %}
{% endblock %}
+{% block card_title %}
+{% trans card_title %}
+{% endblock %}
+
{% block card %}
|