/sharing/", include(workspace_sharing_patterns)),
+ ],
+ "workspaces",
+)
+
+urlpatterns = [
+ path("billing_projects/", include(billing_project_patterns)),
+ path("accounts/", include(account_patterns)),
+ path("managed_groups/", include(managed_group_patterns)),
+ path("workspaces/", include(workspace_patterns)),
+]
diff --git a/anvil_consortium_manager/auditor/viewmixins.py b/anvil_consortium_manager/auditor/viewmixins.py
new file mode 100644
index 00000000..72cc9342
--- /dev/null
+++ b/anvil_consortium_manager/auditor/viewmixins.py
@@ -0,0 +1,36 @@
+from django.core.exceptions import ImproperlyConfigured
+from django.utils import timezone
+
+
+class AnVILAuditMixin:
+ """Mixin to display AnVIL audit results."""
+
+ audit_class = None
+
+ def get_audit_instance(self):
+ if not self.audit_class:
+ raise ImproperlyConfigured(
+ "%(cls)s is missing an audit class. Define %(cls)s.audit_class or override "
+ "%(cls)s.get_audit_instance()." % {"cls": self.__class__.__name__}
+ )
+ else:
+ return self.audit_class()
+
+ def run_audit(self):
+ self.audit_results = self.get_audit_instance()
+ self.audit_results.run_audit()
+
+ def get(self, request, *args, **kwargs):
+ self.run_audit()
+ return super().get(request, *args, **kwargs)
+
+ def get_context_data(self, *args, **kwargs):
+ """Add audit results to the context data."""
+ context = super().get_context_data(*args, **kwargs)
+ context["audit_timestamp"] = timezone.now()
+ context["audit_ok"] = self.audit_results.ok()
+ context["verified_table"] = self.audit_results.get_verified_table()
+ context["error_table"] = self.audit_results.get_error_table()
+ context["not_in_app_table"] = self.audit_results.get_not_in_app_table()
+ context["ignored_table"] = self.audit_results.get_ignored_table()
+ return context
diff --git a/anvil_consortium_manager/auditor/views.py b/anvil_consortium_manager/auditor/views.py
new file mode 100644
index 00000000..4b914311
--- /dev/null
+++ b/anvil_consortium_manager/auditor/views.py
@@ -0,0 +1,280 @@
+from django.contrib import messages
+from django.contrib.messages.views import SuccessMessageMixin
+from django.forms import HiddenInput
+from django.http import Http404, HttpResponseRedirect
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import CreateView, DeleteView, DetailView, TemplateView, UpdateView
+from django.views.generic.detail import SingleObjectMixin
+from django_filters.views import FilterView
+from django_tables2.views import SingleTableMixin
+
+from anvil_consortium_manager import auth
+from anvil_consortium_manager.models import ManagedGroup, Workspace
+
+from . import filters, forms, models, tables, viewmixins
+from .audit import accounts as account_audit
+from .audit import billing_projects as billing_project_audit
+from .audit import managed_groups as managed_group_audit
+from .audit import workspaces as workspace_audit
+
+
+class BillingProjectAudit(auth.AnVILConsortiumManagerStaffViewRequired, viewmixins.AnVILAuditMixin, TemplateView):
+ """View to run an audit on Workspaces and display the results."""
+
+ template_name = "anvil_consortium_manager/billing_project_audit.html"
+ audit_class = billing_project_audit.BillingProjectAudit
+
+
+class AccountAudit(auth.AnVILConsortiumManagerStaffViewRequired, viewmixins.AnVILAuditMixin, TemplateView):
+ """View to run an audit on Accounts and display the results."""
+
+ template_name = "anvil_consortium_manager/account_audit.html"
+ audit_class = account_audit.AccountAudit
+
+
+class ManagedGroupAudit(auth.AnVILConsortiumManagerStaffViewRequired, viewmixins.AnVILAuditMixin, TemplateView):
+ """View to run an audit on ManagedGroups and display the results."""
+
+ template_name = "anvil_consortium_manager/managedgroup_audit.html"
+ audit_class = managed_group_audit.ManagedGroupAudit
+
+
+class ManagedGroupMembershipAudit(
+ auth.AnVILConsortiumManagerStaffViewRequired,
+ SingleObjectMixin,
+ viewmixins.AnVILAuditMixin,
+ TemplateView,
+):
+ """View to run an audit on ManagedGroups and display the results."""
+
+ model = ManagedGroup
+ slug_field = "name"
+ template_name = "anvil_consortium_manager/managedgroup_membership_audit.html"
+ message_not_managed_by_app = "Cannot audit membership because group is not managed by this app."
+
+ def get(self, request, *args, **kwargs):
+ self.object = self.get_object()
+ # Check if managed by the app.
+ if not self.object.is_managed_by_app:
+ messages.add_message(
+ self.request,
+ messages.ERROR,
+ self.message_not_managed_by_app,
+ )
+ # Redirect to the object detail page.
+ return HttpResponseRedirect(self.object.get_absolute_url())
+ # Otherwise, return the response.
+ return super().get(request, *args, **kwargs)
+
+ def get_audit_instance(self):
+ return managed_group_audit.ManagedGroupMembershipAudit(self.object)
+
+
+class IgnoredManagedGroupMembershipDetail(auth.AnVILConsortiumManagerStaffViewRequired, DetailView):
+ """View to display the details of an models.IgnoredManagedGroupMembership."""
+
+ model = models.IgnoredManagedGroupMembership
+
+ def get_object(self, queryset=None):
+ """Return the object the view is displaying."""
+ if queryset is None:
+ queryset = self.get_queryset()
+ # Filter the queryset based on kwargs.
+ group_slug = self.kwargs.get("slug", None)
+ email = self.kwargs.get("email", None)
+ queryset = queryset.filter(group__name=group_slug, ignored_email=email)
+ try:
+ # Get the single item from the filtered queryset
+ obj = queryset.get()
+ except queryset.model.DoesNotExist:
+ raise Http404(
+ _("No %(verbose_name)s found matching the query") % {"verbose_name": queryset.model._meta.verbose_name}
+ )
+ return obj
+
+
+class IgnoredManagedGroupMembershipCreate(
+ auth.AnVILConsortiumManagerStaffEditRequired, SuccessMessageMixin, CreateView
+):
+ """View to create a new models.IgnoredManagedGroupMembership."""
+
+ model = models.IgnoredManagedGroupMembership
+ form_class = forms.IgnoredManagedGroupMembershipForm
+ message_already_exists = "Record already exists for this group and email."
+ success_message = "Successfully ignored managed group membership."
+
+ def get_group(self):
+ try:
+ name = self.kwargs["slug"]
+ group = ManagedGroup.objects.get(name=name)
+ except ManagedGroup.DoesNotExist:
+ raise Http404("ManagedGroup not found.")
+ return group
+
+ def get_email(self):
+ return self.kwargs["email"]
+
+ def get(self, request, *args, **kwargs):
+ self.group = self.get_group()
+ self.email = self.get_email()
+ try:
+ obj = models.IgnoredManagedGroupMembership.objects.get(group=self.group, ignored_email=self.email)
+ messages.error(self.request, self.message_already_exists)
+ return HttpResponseRedirect(obj.get_absolute_url())
+ except models.IgnoredManagedGroupMembership.DoesNotExist:
+ return super().get(request, *args, **kwargs)
+
+ def post(self, request, *args, **kwargs):
+ self.group = self.get_group()
+ self.email = self.get_email()
+ try:
+ obj = models.IgnoredManagedGroupMembership.objects.get(group=self.group, ignored_email=self.email)
+ messages.error(self.request, self.message_already_exists)
+ return HttpResponseRedirect(obj.get_absolute_url())
+ except models.IgnoredManagedGroupMembership.DoesNotExist:
+ return super().post(request, *args, **kwargs)
+
+ def get_initial(self):
+ initial = super().get_initial()
+ initial["group"] = self.group
+ initial["ignored_email"] = self.email
+ return initial
+
+ def get_form(self, **kwargs):
+ """Get the form and set the inputs to use a hidden widget."""
+ form = super().get_form(**kwargs)
+ form.fields["group"].widget = HiddenInput()
+ form.fields["ignored_email"].widget = HiddenInput()
+ return form
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context["group"] = self.group
+ context["email"] = self.email
+ return context
+
+ def form_valid(self, form):
+ """If the form is valid, save the associated model."""
+ form.instance.added_by = self.request.user
+ return super().form_valid(form)
+
+
+class IgnoredManagedGroupMembershipList(auth.AnVILConsortiumManagerStaffViewRequired, SingleTableMixin, FilterView):
+ """View to display a list of models.IgnoredManagedGroupMembership."""
+
+ model = models.IgnoredManagedGroupMembership
+ table_class = tables.IgnoredManagedGroupMembershipTable
+ template_name = "auditor/ignoredmanagedgroupmembership_list.html"
+ filterset_class = filters.IgnoredManagedGroupMembershipFilter
+
+
+class IgnoredManagedGroupMembershipUpdate(
+ auth.AnVILConsortiumManagerStaffEditRequired, SuccessMessageMixin, UpdateView
+):
+ """View to update an existing models.IgnoredManagedGroupMembership."""
+
+ model = models.IgnoredManagedGroupMembership
+ fields = ("note",)
+ success_message = "Successfully updated ignored record."
+
+ def get_object(self, queryset=None):
+ if queryset is None:
+ queryset = self.get_queryset()
+ # Filter the queryset based on kwargs.
+ group_slug = self.kwargs.get("slug", None)
+ email = self.kwargs.get("email", None)
+ queryset = queryset.filter(group__name=group_slug, ignored_email=email)
+ try:
+ # Get the single item from the filtered queryset
+ obj = queryset.get()
+ except queryset.model.DoesNotExist:
+ raise Http404(
+ _("No %(verbose_name)s found matching the query") % {"verbose_name": queryset.model._meta.verbose_name}
+ )
+ return obj
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context["group"] = self.object.group
+ context["email"] = self.object.ignored_email
+ return context
+
+
+class IgnoredManagedGroupMembershipDelete(
+ auth.AnVILConsortiumManagerStaffEditRequired, SuccessMessageMixin, DeleteView
+):
+ model = models.IgnoredManagedGroupMembership
+ success_message = "Successfully stopped ignoring managed group membership record."
+
+ def get_object(self, queryset=None):
+ """Return the object the view is displaying."""
+
+ # Use a custom queryset if provided; this is required for subclasses
+ # like DateDetailView
+ if queryset is None:
+ queryset = self.get_queryset()
+ # Filter the queryset based on kwargs.
+ group_slug = self.kwargs.get("slug", None)
+ email = self.kwargs.get("email", None)
+ queryset = queryset.filter(
+ group__name=group_slug,
+ ignored_email=email,
+ )
+ try:
+ # Get the single item from the filtered queryset
+ obj = queryset.get()
+ except queryset.model.DoesNotExist:
+ raise Http404(
+ _("No %(verbose_name)s found matching the query") % {"verbose_name": queryset.model._meta.verbose_name}
+ )
+ return obj
+
+ def get_success_url(self):
+ return self.object.group.get_absolute_url()
+
+
+class WorkspaceAudit(auth.AnVILConsortiumManagerStaffViewRequired, viewmixins.AnVILAuditMixin, TemplateView):
+ """View to run an audit on Workspaces and display the results."""
+
+ template_name = "anvil_consortium_manager/workspace_audit.html"
+ audit_class = workspace_audit.WorkspaceAudit
+
+
+class WorkspaceSharingAudit(
+ auth.AnVILConsortiumManagerStaffViewRequired,
+ SingleObjectMixin,
+ viewmixins.AnVILAuditMixin,
+ TemplateView,
+):
+ """View to run an audit on access to a specific Workspace and display the results."""
+
+ model = Workspace
+ template_name = "anvil_consortium_manager/workspace_sharing_audit.html"
+
+ def get_object(self, queryset=None):
+ """Return the object the view is displaying."""
+
+ # Use a custom queryset if provided; this is required for subclasses
+ # like DateDetailView
+ if queryset is None:
+ queryset = self.get_queryset()
+ # Filter the queryset based on kwargs.
+ billing_project_slug = self.kwargs.get("billing_project_slug", None)
+ workspace_slug = self.kwargs.get("workspace_slug", None)
+ queryset = queryset.filter(billing_project__name=billing_project_slug, name=workspace_slug)
+ try:
+ # Get the single item from the filtered queryset
+ obj = queryset.get()
+ except queryset.model.DoesNotExist:
+ raise Http404(
+ _("No %(verbose_name)s found matching the query") % {"verbose_name": queryset.model._meta.verbose_name}
+ )
+ return obj
+
+ def get(self, request, *args, **kwargs):
+ self.object = self.get_object()
+ # Otherwise, return the response.
+ return super().get(request, *args, **kwargs)
+
+ def get_audit_instance(self):
+ return workspace_audit.WorkspaceSharingAudit(self.object)
diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/audit.html b/anvil_consortium_manager/templates/anvil_consortium_manager/audit.html
index 7491206b..0a3b1647 100644
--- a/anvil_consortium_manager/templates/anvil_consortium_manager/audit.html
+++ b/anvil_consortium_manager/templates/anvil_consortium_manager/audit.html
@@ -103,5 +103,30 @@
- Audit billing projects
-
-
@@ -72,10 +68,6 @@
{% endif %}
-
- Audit accounts
-
-
@@ -112,10 +104,6 @@
- Audit groups
-
-
@@ -146,12 +134,48 @@
- Audit membership
+ Audit membership
{% if show_edit_links %}
diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html b/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html
index 57687f0d..25bf9906 100644
--- a/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html
+++ b/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html
@@ -34,10 +34,6 @@
{% endif %}
-
- Audit billing projects
-
-
@@ -57,9 +53,6 @@
{% endif %}
-
- Audit accounts
-
@@ -85,9 +78,7 @@
Add a group to a group
{% endif %}
-
- Audit groups
-
+
@@ -110,13 +101,11 @@
{% endif %}
-
- Audit workspaces
-
-
+ {% include 'auditor/nav_items.html' %}
+
{% endblock anvil_consortium_manager_nav_items %}
diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/snippets/audit_managedgroupmembership_notinapp_ignore_button.html b/anvil_consortium_manager/templates/anvil_consortium_manager/snippets/audit_managedgroupmembership_notinapp_ignore_button.html
new file mode 100644
index 00000000..62df9e72
--- /dev/null
+++ b/anvil_consortium_manager/templates/anvil_consortium_manager/snippets/audit_managedgroupmembership_notinapp_ignore_button.html
@@ -0,0 +1,8 @@
+
+
+ Add ignored result
+
diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/workspace_detail.html b/anvil_consortium_manager/templates/anvil_consortium_manager/workspace_detail.html
index 10b5754d..4914e9e4 100644
--- a/anvil_consortium_manager/templates/anvil_consortium_manager/workspace_detail.html
+++ b/anvil_consortium_manager/templates/anvil_consortium_manager/workspace_detail.html
@@ -112,7 +112,7 @@
{% if perms.anvil_consortium_manager.anvil_consortium_manager_staff_view %}
- Audit sharing
+ Audit sharing
{% endif %}
{% if show_edit_links %}
diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/email_audit_report.html b/anvil_consortium_manager/templates/auditor/email_audit_report.html
similarity index 82%
rename from anvil_consortium_manager/templates/anvil_consortium_manager/email_audit_report.html
rename to anvil_consortium_manager/templates/auditor/email_audit_report.html
index 28434835..90ea23f6 100644
--- a/anvil_consortium_manager/templates/anvil_consortium_manager/email_audit_report.html
+++ b/anvil_consortium_manager/templates/auditor/email_audit_report.html
@@ -17,7 +17,12 @@
Audit report - {{ model_name }}
Verified
-
{{ verified_results|length }} instance(s) verified.
+
{{ audit_results.get_verified_results|length }} instance(s) verified.
+
Ignored
+
+
Ignoring {{ n_ignored }} record(s)
Errors
diff --git a/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_confirm_delete.html b/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_confirm_delete.html
new file mode 100644
index 00000000..704d8b5e
--- /dev/null
+++ b/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_confirm_delete.html
@@ -0,0 +1,29 @@
+{% extends "anvil_consortium_manager/base.html" %}
+{% load static %}
+
+{% block title %}Stop ignoring Managed Group Membership Audit result{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
+
Stop ignoring Managed Group Membership Audit result
+
+
Are you sure you want to remove {{ object }} on AnVIL?
+
+
+
+
+
+
+
+
+ - Managed Group
-
+ {{ object.group }}
+
+ - Ignored email
- {{ object.ignored_email }}
+ - Added by
-
+ {% if object.added_by.get_absolute_url %}
+ {{ object.added_by }}
+ {% else %}
+ {{ object.added_by }}
+ {% endif %}
+
+ - Date created
- {{ object.created }}
+ - Date modified
- {{ object.modified }}
+
+{% endblock panel %}
+
+
+{% block action_buttons %}
+
+{% if perms.anvil_consortium_manager.anvil_consortium_manager_staff_edit %}
+
+ Update
+ Stop ignoring
+
+{% endif %}
+{% endblock action_buttons %}
diff --git a/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_form.html b/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_form.html
new file mode 100644
index 00000000..7429345d
--- /dev/null
+++ b/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_form.html
@@ -0,0 +1,26 @@
+{% extends "anvil_consortium_manager/__object_detail.html" %}
+{% load static %}
+{% load crispy_forms_tags %}
+
+{% block title %}Ignore Managed Group Membership audit result{% endblock title %}
+
+{% block panel %}
+
+ - Managed group
-
+ {{ group }}
+
+ - Ignored email
- {{ email }}
+{% endblock panel %}
+
+{% block after_panel %}
+
+
+{% endblock after_panel %}
+
+{% block inline_javascript %}
+ {{ form.media }}
+{% endblock inline_javascript %}
diff --git a/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_list.html b/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_list.html
new file mode 100644
index 00000000..e4dcdf0d
--- /dev/null
+++ b/anvil_consortium_manager/templates/auditor/ignoredmanagedgroupmembership_list.html
@@ -0,0 +1,32 @@
+{% extends "anvil_consortium_manager/base.html" %}
+{% load static %}
+
+{% load render_table from django_tables2 %}
+{% load crispy_forms_tags %}
+
+{% block title %}Ignored Managed Group membership audit records{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
Ignored Managed Group membership audit records
+
+
+ The following records will be ignored when running AnVIL audits for group membership.
+
+
+
+ {% crispy filter.form %}
+
+
+ {% render_table table %}
+
+
+
+
+