mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-12-10 05:37:46 +01:00
Compare commits
6 Commits
api-update
...
qrcode-tot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d41a13323 | ||
|
|
245a989042 | ||
|
|
b1a90e31f4 | ||
|
|
23fe15d982 | ||
|
|
f79961c2f5 | ||
|
|
c333709334 |
@@ -89,3 +89,11 @@ class OAuthSerializer(serializers.ModelSerializer):
|
||||
'note',
|
||||
'memberships',
|
||||
)
|
||||
|
||||
|
||||
class QRCodeCheckSerializer(serializers.Serializer):
|
||||
data = serializers.CharField(
|
||||
label="Données du QR Code",
|
||||
help_text="Le contenu brut lu depuis le QR Code (Username + Token)",
|
||||
required=True
|
||||
)
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
|
||||
from django.conf import settings
|
||||
from django.conf.urls import include
|
||||
from django.urls import re_path
|
||||
from django.urls import re_path, path
|
||||
from rest_framework import routers
|
||||
|
||||
from .views import UserInformationView
|
||||
from .viewsets import ContentTypeViewSet, UserViewSet
|
||||
from .viewsets import ContentTypeViewSet, UserViewSet, QRCodeVerificationViewSet
|
||||
|
||||
# Routers provide an easy way of automatically determining the URL conf.
|
||||
# Register each app API router and user viewset
|
||||
router = routers.DefaultRouter()
|
||||
router.register('models', ContentTypeViewSet)
|
||||
router.register('user', UserViewSet)
|
||||
router.register('check_qrcode', QRCodeVerificationViewSet, basename='check_qrcode')
|
||||
|
||||
if "activity" in settings.INSTALLED_APPS:
|
||||
from activity.api.urls import register_activity_urls
|
||||
@@ -61,6 +62,7 @@ app_name = 'api'
|
||||
# Additionally, we include login URLs for the browsable API.
|
||||
urlpatterns = [
|
||||
re_path('^', include(router.urls)),
|
||||
re_path('^me/', UserInformationView.as_view()),
|
||||
path('me/', UserInformationView.as_view({'get': 'retrieve'})),
|
||||
path('me/qrcode/', UserInformationView.as_view({'get': 'qrcode'})),
|
||||
re_path('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
|
||||
]
|
||||
|
||||
@@ -1,13 +1,19 @@
|
||||
# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
import base64
|
||||
import os
|
||||
from io import BytesIO
|
||||
|
||||
import qrcode
|
||||
import pyotp
|
||||
from django.contrib.auth.models import User
|
||||
from rest_framework.generics import RetrieveAPIView
|
||||
from django.http.response import HttpResponse
|
||||
from rest_framework import viewsets, mixins
|
||||
|
||||
from .serializers import OAuthSerializer
|
||||
|
||||
|
||||
class UserInformationView(RetrieveAPIView):
|
||||
class UserInformationView(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
|
||||
"""
|
||||
These fields are give to OAuth authenticators.
|
||||
"""
|
||||
@@ -18,3 +24,11 @@ class UserInformationView(RetrieveAPIView):
|
||||
|
||||
def get_object(self):
|
||||
return self.request.user
|
||||
|
||||
def qrcode(self, request, *args, **kwargs):
|
||||
secret = base64.b32encode(os.getenv("DJANGO_SECRET_KEY").encode())
|
||||
qr_img = qrcode.make(f"{str(request.user.note)}{pyotp.TOTP(secret, interval=30).now()}")
|
||||
buffer = BytesIO()
|
||||
qr_img.save(buffer, format="PNG")
|
||||
buffer.seek(0)
|
||||
return HttpResponse(buffer, content_type="image/png")
|
||||
|
||||
@@ -2,18 +2,22 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
import re
|
||||
import base64
|
||||
import os
|
||||
|
||||
import pyotp
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django_filters.rest_framework import DjangoFilterBackend
|
||||
from django.db.models import Q
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from rest_framework.viewsets import ReadOnlyModelViewSet, ModelViewSet
|
||||
from rest_framework.viewsets import ReadOnlyModelViewSet, ModelViewSet, GenericViewSet
|
||||
from rest_framework.response import Response
|
||||
from permission.backends import PermissionBackend
|
||||
from note.models import Alias
|
||||
|
||||
from .filters import RegexSafeSearchFilter
|
||||
from .serializers import UserSerializer, ContentTypeSerializer
|
||||
from .serializers import UserSerializer, ContentTypeSerializer, QRCodeCheckSerializer
|
||||
|
||||
|
||||
def is_regex(pattern):
|
||||
@@ -124,3 +128,17 @@ class ContentTypeViewSet(ReadOnlyModelViewSet):
|
||||
filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
|
||||
filterset_fields = ['id', 'app_label', 'model', ]
|
||||
search_fields = ['$app_label', '$model', ]
|
||||
|
||||
|
||||
class QRCodeVerificationViewSet(GenericViewSet):
|
||||
serializer_class = QRCodeCheckSerializer
|
||||
queryset = User.objects.none()
|
||||
|
||||
def get_view_name(self):
|
||||
return "Vérification QR Code"
|
||||
|
||||
def create(self, request, *args, **kwargs):
|
||||
serializer = self.get_serializer(data=request.data)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
secret = base64.b32encode(os.getenv("DJANGO_SECRET_KEY").encode())
|
||||
return Response({'valid': pyotp.TOTP(secret, interval=30).verify(serializer.validated_data['data'][-6:])})
|
||||
|
||||
@@ -20,3 +20,5 @@ python-memcached~=1.62
|
||||
phonenumbers~=9.0.8
|
||||
tablib~=3.8.0
|
||||
Pillow>=11.3.0
|
||||
pyotp~=2.9.0
|
||||
qrcode~=8.2
|
||||
Reference in New Issue
Block a user