trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: fix applications API not being same format as other APIs

This commit is contained in:
Jens Langhammer 2020-11-26 12:51:52 +01:00
parent 04f876af7b
commit 1432f0648f
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
passbook/admin/api/overview_metrics.py
View File

@ -20,21 +20,13 @@ from rest_framework.viewsets import ViewSet
from passbook.audit.models import Event, EventAction from passbook.audit.models import Event, EventAction
class AdministrationMetricsSerializer(Serializer): def get_events_per_1h(**filter_kwargs) -> List[Dict[str, int]]:
"""Overview View"""
logins_per_1h = SerializerMethodField()
logins_failed_per_1h = SerializerMethodField()
def get_events_per_1h(self, action: str) -> List[Dict[str, int]]:
"""Get event count by hour in the last day, fill with zeros""" """Get event count by hour in the last day, fill with zeros"""
date_from = now() - timedelta(days=1) date_from = now() - timedelta(days=1)
result = ( result = (
Event.objects.filter(action=action, created__gte=date_from) Event.objects.filter(created__gte=date_from, **filter_kwargs)
.annotate( .annotate(
age=ExpressionWrapper( age=ExpressionWrapper(now() - F("created"), output_field=DurationField())
now() - F("created"), output_field=DurationField()
)
) )
.annotate(age_hours=ExtractHour("age")) .annotate(age_hours=ExtractHour("age"))
.values("age_hours") .values("age_hours")
@ -53,13 +45,20 @@ class AdministrationMetricsSerializer(Serializer):
) )
return results return results
class AdministrationMetricsSerializer(Serializer):
"""Overview View"""
logins_per_1h = SerializerMethodField()
logins_failed_per_1h = SerializerMethodField()
def get_logins_per_1h(self, _): def get_logins_per_1h(self, _):
"""Get successful logins per hour for the last 24 hours""" """Get successful logins per hour for the last 24 hours"""
return self.get_events_per_1h(EventAction.LOGIN) return get_events_per_1h(action=EventAction.LOGIN)
def get_logins_failed_per_1h(self, _): def get_logins_failed_per_1h(self, _):
"""Get failed logins per hour for the last 24 hours""" """Get failed logins per hour for the last 24 hours"""
return self.get_events_per_1h(EventAction.LOGIN_FAILED) return get_events_per_1h(action=EventAction.LOGIN_FAILED)
def create(self, request: Request) -> response: def create(self, request: Request) -> response:
raise NotImplementedError raise NotImplementedError

8
passbook/core/api/applications.py
View File

@ -44,9 +44,13 @@ class ApplicationViewSet(ModelViewSet):
queryset = backend().filter_queryset(self.request, queryset, self) queryset = backend().filter_queryset(self.request, queryset, self)
return queryset return queryset
def list(self, request: Request, *_, **__) -> Response: def list(self, request: Request, *args, **kwargs) -> Response:
"""Custom list method that checks Policy based access instead of guardian""" """Custom list method that checks Policy based access instead of guardian"""
if request.user.is_superuser:
# pylint: disable=no-member
return super().list(request, *args, **kwargs)
queryset = self._filter_queryset_for_list(self.get_queryset()) queryset = self._filter_queryset_for_list(self.get_queryset())
self.paginate_queryset(queryset)
allowed_applications = [] allowed_applications = []
for application in queryset.order_by("name"): for application in queryset.order_by("name"):
engine = PolicyEngine(application, self.request.user, self.request) engine = PolicyEngine(application, self.request.user, self.request)
@ -54,4 +58,4 @@ class ApplicationViewSet(ModelViewSet):
if engine.passing: if engine.passing:
allowed_applications.append(application) allowed_applications.append(application)
serializer = self.get_serializer(allowed_applications, many=True) serializer = self.get_serializer(allowed_applications, many=True)
return Response(serializer.data) return self.get_paginated_response(serializer.data)