Upgrade to Django 4 (and dependencies) (#80)

* Upgrade to Django 4 (and dependencies)

Provide upgrade to the latest Django version 4.1 and all
requirements. Modifications required to work correctly with the
deprecated methods or functions.

* Add DEFAULT_AUTO_FIELD and required context_processors

By switching to the latest Django version it's required to define a
default auto field model. Also the context_processor is required in this
version.

Author: drscream

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 SkyLime GmbH, All rights reserved.
+Copyright (c) 2022 SkyLime GmbH, All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cron/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 WHEN = (
 		('* * * * *',                                 _('every minute')),

cron/urls.py

@@ -1,9 +1,9 @@
-from django.conf.urls import url
+from django.urls import re_path
 from cron import views
 
 urlpatterns = [
-	url(r'^job/$',                            views.CronjobList.as_view(),     name='cronjob_list'),
-	url(r'^job/add$',                         views.CronjobCreate.as_view(),   name='cronjob_add'),
-	url(r'^job/(?P<pk>\d+)/update$',          views.CronjobUpdate.as_view(),   name='cronjob_update'),
-	url(r'^job/(?P<pk>\d+)/delete$',          views.CronjobDelete.as_view(),   name='cronjob_delete'),
+	re_path(r'^job/$',                            views.CronjobList.as_view(),     name='cronjob_list'),
+	re_path(r'^job/add$',                         views.CronjobCreate.as_view(),   name='cronjob_add'),
+	re_path(r'^job/(?P<pk>\d+)/update$',          views.CronjobUpdate.as_view(),   name='cronjob_update'),
+	re_path(r'^job/(?P<pk>\d+)/delete$',          views.CronjobDelete.as_view(),   name='cronjob_delete'),
 ]

cron/views.py

@@ -4,7 +4,7 @@
 from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib import messages
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from kumquat.utils import LoginRequiredMixin, SuccessActionFormMixin, SuccessActionDeleteMixin
 from cron.models import Cronjob
 

ftp/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from passlib.hash import sha512_crypt
 from web.models import VHost
 

ftp/urls.py

@@ -1,9 +1,9 @@
-from django.conf.urls import url
+from django.urls import re_path
 from ftp import views
 
 urlpatterns = [
-	url(r'^accounts/$',                   views.AccountList.as_view(),   name='ftp_account_list'),
-	url(r'^accounts/add$',                views.AccountCreate.as_view(), name='ftp_account_add'),
-	url(r'^accounts/(?P<pk>\d+)/update$', views.AccountUpdate.as_view(), name='ftp_account_update'),
-	url(r'^accounts/(?P<pk>\d+)/delete$', views.AccountDelete.as_view(), name='ftp_account_delete'),
-]
+	re_path(r'^accounts/$',                   views.AccountList.as_view(),   name='ftp_account_list'),
+	re_path(r'^accounts/add$',                views.AccountCreate.as_view(), name='ftp_account_add'),
+	re_path(r'^accounts/(?P<pk>\d+)/update$', views.AccountUpdate.as_view(), name='ftp_account_update'),
+	re_path(r'^accounts/(?P<pk>\d+)/delete$', views.AccountDelete.as_view(), name='ftp_account_delete'),
+]

ftp/views.py

@@ -1,7 +1,7 @@
 from django.urls import reverse_lazy
 from django.views.generic import ListView
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.contrib.messages.views import SuccessMessageMixin
 from kumquat.utils import LoginRequiredMixin
 from ftp.models import Account

kumquat/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from kumquat.utils import DomainNameValidator
 
 class Domain(models.Model):

kumquat/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.urls import re_path
 from kumquat import views
 
 urlpatterns = [
-	url(r'^domains/$',                   views.DomainList.as_view(),   name='domain_list'),
-	url(r'^domains/add$',                views.DomainCreate.as_view(), name='domain_add'),
-	url(r'^domains/(?P<pk>\d+)/delete$', views.DomainDelete.as_view(), name='domain_delete'),
-]
+	re_path(r'^domains/$',                   views.DomainList.as_view(),   name='domain_list'),
+	re_path(r'^domains/add$',                views.DomainCreate.as_view(), name='domain_add'),
+	re_path(r'^domains/(?P<pk>\d+)/delete$', views.DomainDelete.as_view(), name='domain_delete'),
+]

kumquat/utils.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
 import re
@@ -54,7 +54,7 @@ def __call__(self, value):
 			if not value: raise
 			# convert it unicode -> ascii
 			try:
-				asciival = smart_text(value).encode('idna').decode('ascii')
+				asciival = smart_str(value).encode('idna').decode('ascii')
 			except UnicodeError:
 				raise e # raise the original ASCII error
 			# validate the ascii encoding of it

kumquat/views.py

@@ -1,7 +1,7 @@
 from django.urls import reverse_lazy
 from django.views.generic import ListView
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.contrib.messages.views import SuccessMessageMixin
 from kumquat.models import Domain
 from kumquat.utils import LoginRequiredMixin

kumquat_web/settings.py

@@ -68,6 +68,7 @@
 			'debug': True,
 			'context_processors': [
 				'django.contrib.auth.context_processors.auth',
+				'django.template.context_processors.request',
 				'django.template.context_processors.debug',
 				'django.template.context_processors.i18n',
 				'django.template.context_processors.media',
@@ -124,6 +125,8 @@
 
 LOGIN_REDIRECT_URL = '/'
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Logging
 # https://docs.djangoproject.com/en/dev/topics/logging/
 LOGGING = {

kumquat_web/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
@@ -10,17 +10,17 @@
 
 
 urlpatterns = [
-	url(r'^$',       status, name='status'),
-	url(r'^system/', include('kumquat.urls')),
-	url(r'^ftp/',    include('ftp.urls')),
-	url(r'^mysql/',  include('mysql.urls')),
-	url(r'^web/',    include('web.urls')),
-	url(r'^mail/',   include('mail.urls')),
-	url(r'^cron/',   include('cron.urls')),
-	url(r'^admin/',  admin.site.urls),
+	re_path(r'^$',       status, name='status'),
+	re_path(r'^system/', include('kumquat.urls')),
+	re_path(r'^ftp/',    include('ftp.urls')),
+	re_path(r'^mysql/',  include('mysql.urls')),
+	re_path(r'^web/',    include('web.urls')),
+	re_path(r'^mail/',   include('mail.urls')),
+	re_path(r'^cron/',   include('cron.urls')),
+	re_path(r'^admin/',  admin.site.urls),
 
-	url(r'',         include('django.contrib.auth.urls')),
+	re_path(r'',         include('django.contrib.auth.urls')),
 
-	url(r'^accounts/login/$',  auth_views.LoginView.as_view(), name='login'),
-	url(r'^accounts/logout/$', logout_then_login, name='logout_then_login'),
+	re_path(r'^accounts/login/$',  auth_views.LoginView.as_view(), name='login'),
+	re_path(r'^accounts/logout/$', logout_then_login, name='logout_then_login'),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

mail/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from passlib.hash import sha512_crypt
 from kumquat.models import Domain
 

mail/urls.py

@@ -1,17 +1,17 @@
-from django.conf.urls import url
+from django.urls import re_path
 from mail import views
 
 urlpatterns = [
-	url(r'^accounts/$',                   views.AccountList.as_view(),    name='mail_account_list'),
-	url(r'^accounts/add$',                views.AccountCreate.as_view(),  name='mail_account_add'),
-	url(r'^accounts/(?P<pk>\d+)/update$', views.AccountUpdate.as_view(),  name='mail_account_update'),
-	url(r'^accounts/(?P<pk>\d+)/delete$', views.AccountDelete.as_view(),  name='mail_account_delete'),
+	re_path(r'^accounts/$',                   views.AccountList.as_view(),    name='mail_account_list'),
+	re_path(r'^accounts/add$',                views.AccountCreate.as_view(),  name='mail_account_add'),
+	re_path(r'^accounts/(?P<pk>\d+)/update$', views.AccountUpdate.as_view(),  name='mail_account_update'),
+	re_path(r'^accounts/(?P<pk>\d+)/delete$', views.AccountDelete.as_view(),  name='mail_account_delete'),
 
-	url(r'^redirect/$',                   views.RedirectList.as_view(),   name='mail_redirect_list'),
-	url(r'^redirect/add$',                views.RedirectCreate.as_view(), name='mail_redirect_add'),
-	url(r'^redirect/(?P<pk>\d+)/update$', views.RedirectUpdate.as_view(), name='mail_redirect_update'),
-	url(r'^redirect/(?P<pk>\d+)/delete$', views.RedirectDelete.as_view(), name='mail_redirect_delete'),
+	re_path(r'^redirect/$',                   views.RedirectList.as_view(),   name='mail_redirect_list'),
+	re_path(r'^redirect/add$',                views.RedirectCreate.as_view(), name='mail_redirect_add'),
+	re_path(r'^redirect/(?P<pk>\d+)/update$', views.RedirectUpdate.as_view(), name='mail_redirect_update'),
+	re_path(r'^redirect/(?P<pk>\d+)/delete$', views.RedirectDelete.as_view(), name='mail_redirect_delete'),
 
-	url(r'^export.json$', views.export, name='mail_export'),
+	re_path(r'^export.json$', views.export, name='mail_export'),
 
-]
+]

mail/views.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.views.generic import ListView
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.contrib.messages.views import SuccessMessageMixin
 from django.http import HttpResponse
 from kumquat.utils import LoginRequiredMixin

mysql/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.db import connections, transaction
 
 def dbname(username):

mysql/urls.py

@@ -1,9 +1,9 @@
-from django.conf.urls import url
+from django.urls import re_path
 from mysql import views
 
 urlpatterns = [
-	url(r'^databases/$',                   views.DatabaseList.as_view(),   name='mysql_database_list'),
-	url(r'^databases/add$',                views.DatabaseCreate.as_view(), name='mysql_database_add'),
-	url(r'^databases/(?P<slug>[a-z0-9_]+)/update$', views.databaseUpdate,    name='mysql_database_update'),
-	url(r'^databases/(?P<slug>[a-z0-9_]+)/delete$', views.databaseDelete,    name='mysql_database_delete'),
-]
+	re_path(r'^databases/$',                   views.DatabaseList.as_view(),   name='mysql_database_list'),
+	re_path(r'^databases/add$',                views.DatabaseCreate.as_view(), name='mysql_database_add'),
+	re_path(r'^databases/(?P<slug>[a-z0-9_]+)/update$', views.databaseUpdate,    name='mysql_database_update'),
+	re_path(r'^databases/(?P<slug>[a-z0-9_]+)/delete$', views.databaseDelete,    name='mysql_database_delete'),
+]

mysql/views.py

@@ -4,7 +4,7 @@
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import render, redirect
 from django.contrib.auth.decorators import login_required
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.contrib.messages.views import SuccessMessageMixin
 from django.db import connections, transaction
 from django.http import Http404

requirements.txt

@@ -1,11 +1,11 @@
-acme==1.10.1
+acme==1.22.0
 cryptography==3.3.2
-Django==2.2.28
-django-annoying==0.10.3
-django-bootstrap3==14.2.0
+Django==4.1.1
+django-annoying==0.10.6
+django-bootstrap3==22.1
 django-messagegroups==0.4.5
 django-settings-export==1.2.1
-mysqlclient==2.0.1
+mysqlclient==2.1.1
 passlib==1.7.4
-pyOpenSSL==19.1.0
+pyOpenSSL==21.0.0
 zerorpc==0.6.3

templates/base.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 {% load messagegroups %}
 <!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}">

web/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from OpenSSL import SSL, crypto
 from .models import VHostAlias
 

web/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 from OpenSSL import SSL, crypto
 from annoying.fields import AutoOneToOneField

web/urls.py

@@ -1,30 +1,30 @@
-from django.conf.urls import url
+from django.urls import re_path
 from web import views
 
 urlpatterns = [
-	url(r'^vhost/$',                            views.VHostList.as_view(),     name='web_vhost_list'),
-	url(r'^vhost/add$',                         views.VHostCreate.as_view(),   name='web_vhost_add'),
-	url(r'^vhost/(?P<pk>\d+)/update$',          views.VHostUpdate.as_view(),   name='web_vhost_update'),
-	url(r'^vhost/(?P<pk>\d+)/delete$',          views.VHostDelete.as_view(),   name='web_vhost_delete'),
+	re_path(r'^vhost/$',                            views.VHostList.as_view(),     name='web_vhost_list'),
+	re_path(r'^vhost/add$',                         views.VHostCreate.as_view(),   name='web_vhost_add'),
+	re_path(r'^vhost/(?P<pk>\d+)/update$',          views.VHostUpdate.as_view(),   name='web_vhost_update'),
+	re_path(r'^vhost/(?P<pk>\d+)/delete$',          views.VHostDelete.as_view(),   name='web_vhost_delete'),
 
-	url(r'^vhost/(?P<pk>\d+)/catchall$',        views.vhostCatchallSet,        name='web_vhost_catchall_set'),
-	url(r'^vhost/catchall/(?P<pk>\d+)/delete$', views.vhostCatchallDelete,     name='web_vhost_catchall_delete'),
+	re_path(r'^vhost/(?P<pk>\d+)/catchall$',        views.vhostCatchallSet,        name='web_vhost_catchall_set'),
+	re_path(r'^vhost/catchall/(?P<pk>\d+)/delete$', views.vhostCatchallDelete,     name='web_vhost_catchall_delete'),
 
-	url(r'^vhost/(?P<pk>\d+)/errorlog$',        views.vhostErrorLogList,       name='web_vhost_errorlog_list'),
+	re_path(r'^vhost/(?P<pk>\d+)/errorlog$',        views.vhostErrorLogList,       name='web_vhost_errorlog_list'),
 
-	url(r'^vhost/(?P<pk>\d+)/alias$',           views.vhostAliasList,       name='web_vhost_alias_list'),
-	url(r'^vhost/(?P<pk>\d+)/alias/add$',       views.vhostAliasAdd,        name='web_vhost_alias_add'),
-	url(r'^vhost/alias/(?P<pk>\d+)/delete$',    views.vhostAliasDelete,     name='web_vhost_alias_delete'),
+	re_path(r'^vhost/(?P<pk>\d+)/alias$',           views.vhostAliasList,       name='web_vhost_alias_list'),
+	re_path(r'^vhost/(?P<pk>\d+)/alias/add$',       views.vhostAliasAdd,        name='web_vhost_alias_add'),
+	re_path(r'^vhost/alias/(?P<pk>\d+)/delete$',    views.vhostAliasDelete,     name='web_vhost_alias_delete'),
 
-	url(r'^vhost/(?P<pk>\d+)/snapshot$',        views.vhostSnapshotList,       name='web_vhost_snapshot_list'),
-	url(r'^vhost/(?P<pk>\d+)/snapshot/add$',    views.vhostSnapshotCreate,     name='web_vhost_snapshot_add'),
-#	url(r'^vhost/(?P<pk>\d+)/snapshot/(?P<name>[A-Za-z0-9_-]+)/download$', views.vhostSnapshotDownload, name='web_vhost_snapshot_download'),
-	url(r'^vhost/(?P<pk>\d+)/snapshot/(?P<name>[A-Za-z0-9_-]+)/rollback$', views.vhostSnapshotRollback, name='web_vhost_snapshot_rollback'),
-	url(r'^vhost/(?P<pk>\d+)/snapshot/(?P<name>[A-Za-z0-9_-]+)/delete$',   views.vhostSnapshotDelete,   name='web_vhost_snapshot_delete'),
+	re_path(r'^vhost/(?P<pk>\d+)/snapshot$',        views.vhostSnapshotList,       name='web_vhost_snapshot_list'),
+	re_path(r'^vhost/(?P<pk>\d+)/snapshot/add$',    views.vhostSnapshotCreate,     name='web_vhost_snapshot_add'),
+#	re_path(r'^vhost/(?P<pk>\d+)/snapshot/(?P<name>[A-Za-z0-9_-]+)/download$', views.vhostSnapshotDownload, name='web_vhost_snapshot_download'),
+	re_path(r'^vhost/(?P<pk>\d+)/snapshot/(?P<name>[A-Za-z0-9_-]+)/rollback$', views.vhostSnapshotRollback, name='web_vhost_snapshot_rollback'),
+	re_path(r'^vhost/(?P<pk>\d+)/snapshot/(?P<name>[A-Za-z0-9_-]+)/delete$',   views.vhostSnapshotDelete,   name='web_vhost_snapshot_delete'),
 
-	url(r'^sslcert/$',                          views.SSLCertList.as_view(),        name='web_sslcert_list'),
-	url(r'^sslcert/expired/$',                  views.ExpiredSSLCertList.as_view(), name='web_sslcert_list_expired'),
-	url(r'^sslcert/add$',                       views.sslcertCreate,                name='web_sslcert_add'),
-	url(r'^sslcert/(?P<pk>\d+)/delete$',        views.SSLCertDelete.as_view(),      name='web_sslcert_delete'),
-	url(r'^sslcert/expired/delete/$',           views.sslcertDeleteExpired,         name='web_sslcert_delete_expired'),
+	re_path(r'^sslcert/$',                          views.SSLCertList.as_view(),        name='web_sslcert_list'),
+	re_path(r'^sslcert/expired/$',                  views.ExpiredSSLCertList.as_view(), name='web_sslcert_list_expired'),
+	re_path(r'^sslcert/add$',                       views.sslcertCreate,                name='web_sslcert_add'),
+	re_path(r'^sslcert/(?P<pk>\d+)/delete$',        views.SSLCertDelete.as_view(),      name='web_sslcert_delete'),
+	re_path(r'^sslcert/expired/delete/$',           views.sslcertDeleteExpired,         name='web_sslcert_delete_expired'),
 ]

web/views.py

@@ -4,7 +4,7 @@
 from django.shortcuts import render, redirect, get_object_or_404
 from django.views.decorators.http import require_POST
 from django.contrib.auth.decorators import login_required
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.timezone import now
 from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib import messages