feat(passport): switch wsgi to asgi

Author: duanhongyi

.gitignore

@@ -14,6 +14,7 @@ develop-eggs
 lib
 lib64
 .env
+.vscode
 
 # coverage reports
 .coverage

rootfs/api/asgi.py

@@ -0,0 +1,16 @@
+"""
+ASGI config for passport project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.1/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'api.settings.production')
+
+application = get_asgi_application()

rootfs/api/settings/production.py

@@ -284,7 +284,7 @@
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 STATIC_URL = '/assets/'
 STATIC_ROOT = os.path.abspath(os.path.join(BASE_DIR, '..', 'web', 'dist', 'assets'))
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedStaticFilesStorage'
 
 # Avatar URL
 AVATAR_URL = "https://cravatar.cn/avatar/"

rootfs/api/urls.py

@@ -1,5 +1,4 @@
-from django.conf.urls import include
-from django.urls import re_path
+from django.urls import re_path, include
 from rest_framework.routers import DefaultRouter
 
 from api import views

rootfs/api/views.py

@@ -12,7 +12,7 @@
 from django.shortcuts import redirect, get_object_or_404, render
 from django.template.loader import render_to_string
 from django.http import HttpResponse, HttpResponseRedirect
-from django.utils.encoding import force_bytes, force_text
+from django.utils.encoding import force_bytes, force_str
 from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
 from django.views.generic import View
 from django.views.generic.edit import CreateView
@@ -109,7 +109,7 @@ class ActivateAccount(View):
 
     def get(self, request, uidb64, token, *args, **kwargs):
         try:
-            uid = force_text(urlsafe_base64_decode(uidb64))
+            uid = force_str(urlsafe_base64_decode(uidb64))
             user = User.objects.get(pk=uid)
         except (TypeError, ValueError, OverflowError, User.DoesNotExist):
             user = None
@@ -182,7 +182,7 @@ def update(self, request, *args, **kwargs):
 class UpdateAccount(View):
 
     def get(self, request, uidb64, token, *args, **kwargs):
-        user = get_object_or_404(User, pk=force_text(urlsafe_base64_decode(uidb64)))
+        user = get_object_or_404(User, pk=force_str(urlsafe_base64_decode(uidb64)))
         if user is not None and token_generator.check_token(user, token):
             cache_key = "user:serializer:%s" % user.pk
             data = cache.get(cache_key, None)

rootfs/api/wsgi.py

@@ -1,10 +1,10 @@
 """
-WSGI config for mysite project.
+WSGI config for passport project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/4.1/howto/deployment/wsgi/
 """
 
 import os

rootfs/bin/boot

@@ -43,7 +43,7 @@ python /workspace/manage.py create_oauth2_application
 # spawn a gunicorn server in the background
 echo ""
 echo "Starting up Gunicorn"
-gunicorn -c /workspace/passport/gunicorn/config.py api.wsgi &
+gunicorn -c /workspace/passport/gunicorn/config.py api.asgi &
 
 # smart shutdown on SIGTERM (SIGINT is handled by gunicorn)
 function on_exit() {

rootfs/passport/gunicorn/config.py

@@ -6,6 +6,7 @@
 
 bind = '0.0.0.0'
 workers = int(os.environ.get('GUNICORN_WORKERS', 4))
+worker_class = "uvicorn.workers.UvicornWorker"
 
 pythonpath = dirname(dirname(dirname(realpath(__file__))))
 timeout = 1200

rootfs/passport/urls.py

@@ -13,9 +13,8 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-from django.urls import path
+from django.urls import path, re_path, include
 from django.conf import settings
-from django.conf.urls import include, url, re_path
 from django.contrib import admin
 from django.views.generic.base import TemplateView
 from api.views import LivenessCheckView, ReadinessCheckView
@@ -27,8 +26,8 @@
     urlpatterns = []
 
 urlpatterns += [
-    url(r'^healthz$', LivenessCheckView.as_view()),
-    url(r'^readiness$', ReadinessCheckView.as_view()),
+    re_path(r'^healthz$', LivenessCheckView.as_view()),
+    re_path(r'^readiness$', ReadinessCheckView.as_view()),
     re_path(r"settings/?$", views.SettingsViewSet.as_view({'get': 'retrieve'})),
     re_path(r"^user/", include('api.urls')),
     re_path(r'^oauth/', include('oauth2_provider.urls', namespace='oauth2_provider')),

rootfs/requirements.txt

@@ -1,9 +1,12 @@
 # Drycc passport requirements
-django==3.2.5
+django==4.1
+pytz==2022.2.1
 django-auth-ldap==3.0.0
 django-cors-headers==3.7.0
 djangorestframework==3.12.4
 gunicorn==20.1.0
+uvicorn==0.18.2
+asgiref==3.5.2
 psycopg2-binary==2.9.1
 requests==2.26.0
 requests-toolbelt==0.9.1