diff --git a/accounts/templates/login.html b/accounts/templates/login.html index c55a07a..d8281b0 100644 --- a/accounts/templates/login.html +++ b/accounts/templates/login.html @@ -15,9 +15,9 @@ {% endif %}
diff --git a/accounts/views.py b/accounts/views.py index d109d31..56f2c02 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -2,7 +2,6 @@ from django.shortcuts import render from django.http import HttpResponseRedirect from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from django.contrib.auth.decorators import login_required from accounts.models import * from instances.models import Instance from accounts.forms import UserAddForm @@ -10,7 +9,6 @@ from django.conf import settings from django.core.validators import ValidationError -@login_required def profile(request): """ :param request: @@ -69,7 +67,6 @@ def profile(request): return render(request, 'profile.html', locals()) -@login_required def accounts(request): """ :param request: @@ -149,7 +146,6 @@ def accounts(request): return render(request, accounts_template_file, locals()) -@login_required def account(request, user_id): """ :param request: diff --git a/computes/views.py b/computes/views.py index 90e6569..77c9d05 100644 --- a/computes/views.py +++ b/computes/views.py @@ -3,7 +3,6 @@ from django.utils import timezone from django.http import HttpResponse, HttpResponseRedirect from django.urls import reverse from django.shortcuts import render, get_object_or_404 -from django.contrib.auth.decorators import login_required from computes.models import Compute from instances.models import Instance from accounts.models import UserInstance @@ -13,7 +12,6 @@ from vrtManager.connection import CONN_SSH, CONN_TCP, CONN_TLS, CONN_SOCKET, con from libvirt import libvirtError -@login_required def computes(request): """ :param request: @@ -135,7 +133,6 @@ def computes(request): return render(request, 'computes.html', locals()) -@login_required def overview(request, compute_id): """ :param request: @@ -167,7 +164,6 @@ def overview(request, compute_id): return render(request, 'overview.html', locals()) -@login_required def compute_graph(request, compute_id): """ :param request: @@ -197,7 +193,6 @@ def compute_graph(request, compute_id): return response -@login_required def get_compute_disk_buses(request, compute_id, arch, machine, disk): data = dict() compute = get_object_or_404(Compute, pk=compute_id) @@ -224,7 +219,6 @@ def get_compute_disk_buses(request, compute_id, arch, machine, disk): return HttpResponse(json.dumps(data)) -@login_required def get_compute_machine_types(request, compute_id, arch): data = dict() try: @@ -240,7 +234,6 @@ def get_compute_machine_types(request, compute_id, arch): return HttpResponse(json.dumps(data)) -@login_required def get_compute_video_models(request, compute_id, arch, machine): data = dict() try: @@ -256,7 +249,6 @@ def get_compute_video_models(request, compute_id, arch, machine): return HttpResponse(json.dumps(data)) -@login_required def get_dom_capabilities(request, compute_id, arch, machine): data = dict() try: diff --git a/conf/requirements.txt b/conf/requirements.txt index 18cdc3c..b831e22 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,8 +1,11 @@ Django==2.2.12 -websockify==0.9.0 +django-login-required-middleware==0.5.0 gunicorn==20.0.4 -lxml==4.5.0 libvirt-python==6.1.0 -six -pytz -rwlock +lxml==4.5.0 +numpy==1.18.4 +pytz==2020.1 +rwlock==0.0.7 +six==1.15.0 +sqlparse==0.3.1 +websockify==0.9.0 diff --git a/console/views.py b/console/views.py index a27a562..cc4358a 100644 --- a/console/views.py +++ b/console/views.py @@ -1,6 +1,5 @@ import re from django.shortcuts import render -from django.contrib.auth.decorators import login_required from instances.models import Instance from vrtManager.instance import wvmInstance from webvirtcloud.settings import WS_PUBLIC_PORT @@ -8,7 +7,6 @@ from webvirtcloud.settings import WS_PUBLIC_HOST from libvirt import libvirtError -@login_required def console(request): """ :param request: diff --git a/create/views.py b/create/views.py index e2e81fb..384d6eb 100644 --- a/create/views.py +++ b/create/views.py @@ -2,7 +2,6 @@ from django.shortcuts import render, get_object_or_404 from django.http import HttpResponseRedirect from django.utils.translation import ugettext_lazy as _ from django.urls import reverse -from django.contrib.auth.decorators import login_required from computes.models import Compute from create.models import Flavor from create.forms import FlavorAddForm, NewVMForm @@ -26,7 +25,6 @@ from django.contrib import messages from logs.views import addlogmsg -@login_required def create_instance_select_type(request, compute_id): if not request.user.is_superuser: @@ -76,7 +74,6 @@ def create_instance_select_type(request, compute_id): return render(request, 'create_instance_w1.html', locals()) -@login_required def create_instance(request, compute_id, arch, machine): """ :param request: diff --git a/instances/views.py b/instances/views.py index 7cf56da..28e78e4 100644 --- a/instances/views.py +++ b/instances/views.py @@ -11,7 +11,6 @@ from django.http import HttpResponse, HttpResponseRedirect from django.urls import reverse from django.shortcuts import render, get_object_or_404 from django.utils.translation import ugettext_lazy as _ -from django.contrib.auth.decorators import login_required from computes.models import Compute from instances.models import Instance from django.contrib.auth.models import User @@ -29,7 +28,6 @@ from django.contrib import messages from collections import OrderedDict -@login_required def index(request): """ :param request: @@ -38,7 +36,6 @@ def index(request): return HttpResponseRedirect(reverse('allinstances')) -@login_required def allinstances(request): """ INSTANCES LIST FOR ALL HOSTS @@ -70,7 +67,6 @@ def allinstances(request): return render(request, 'allinstances.html', locals()) -@login_required def instances(request, compute_id): """ :param request: @@ -99,7 +95,6 @@ def instances(request, compute_id): return render(request, 'instances.html', locals()) -@login_required def instance(request, compute_id, vname): """ :param request: @@ -1081,7 +1076,6 @@ def instance(request, compute_id, vname): return render(request, 'instance.html', locals()) -@login_required def inst_status(request, compute_id, vname): """ :param request: @@ -1276,7 +1270,6 @@ def instances_actions(request): return HttpResponseRedirect(request.get_full_path()) -@login_required def inst_graph(request, compute_id, vname): """ :param request: @@ -1339,7 +1332,6 @@ def _get_dhcp_mac_address(vname): return mac -@login_required def guess_mac_address(request, vname): data = {'vname': vname} mac = _get_dhcp_mac_address(vname) @@ -1358,14 +1350,12 @@ def _get_random_mac_address(): return mac -@login_required def random_mac_address(request): data = dict() data['mac'] = _get_random_mac_address() return HttpResponse(json.dumps(data)) -@login_required def guess_clone_name(request): dhcp_file = '/srv/webvirtcloud/dhcpd.conf' prefix = settings.CLONE_INSTANCE_DEFAULT_PREFIX @@ -1382,7 +1372,6 @@ def guess_clone_name(request): return HttpResponse(json.dumps({})) -@login_required def check_instance(request, vname): instance = Instance.objects.filter(name=vname) data = {'vname': vname, 'exists': False} diff --git a/interfaces/views.py b/interfaces/views.py index 13b65e5..cd9f43f 100644 --- a/interfaces/views.py +++ b/interfaces/views.py @@ -1,14 +1,12 @@ from django.shortcuts import render, get_object_or_404 from django.http import HttpResponseRedirect from django.urls import reverse -from django.contrib.auth.decorators import login_required from computes.models import Compute from interfaces.forms import AddInterface from vrtManager.interface import wvmInterface, wvmInterfaces from libvirt import libvirtError -@login_required def interfaces(request, compute_id): """ :param request: @@ -57,7 +55,6 @@ def interfaces(request, compute_id): return render(request, 'interfaces.html', locals()) -@login_required def interface(request, compute_id, iface): """ :param request: diff --git a/logs/views.py b/logs/views.py index a276226..45569b0 100644 --- a/logs/views.py +++ b/logs/views.py @@ -1,7 +1,6 @@ from django.shortcuts import render from django.http import HttpResponse, HttpResponseRedirect from django.urls import reverse -from django.contrib.auth.decorators import login_required from instances.models import Instance from logs.models import Logs from django.conf import settings @@ -19,7 +18,6 @@ def addlogmsg(user, instance, message): add_log_msg.save() -@login_required def showlogs(request, page=1): """ :param request: @@ -40,7 +38,6 @@ def showlogs(request, page=1): return render(request, 'showlogs.html', locals()) -@login_required def vm_logs(request, vname): """ :param request: diff --git a/networks/views.py b/networks/views.py index a883be8..39b648d 100644 --- a/networks/views.py +++ b/networks/views.py @@ -2,7 +2,6 @@ from django.shortcuts import render, get_object_or_404 from django.http import HttpResponseRedirect from django.utils.translation import ugettext_lazy as _ from django.urls import reverse -from django.contrib.auth.decorators import login_required from computes.models import Compute from networks.forms import AddNetPool from vrtManager.network import wvmNetwork, wvmNetworks @@ -11,7 +10,6 @@ from libvirt import libvirtError from django.contrib import messages -@login_required def networks(request, compute_id): """ :param request: @@ -70,7 +68,6 @@ def networks(request, compute_id): return render(request, 'networks.html', locals()) -@login_required def network(request, compute_id, pool): """ :param request: diff --git a/nwfilters/views.py b/nwfilters/views.py index 3ee9163..897db7e 100644 --- a/nwfilters/views.py +++ b/nwfilters/views.py @@ -5,7 +5,6 @@ from django.http import HttpResponseRedirect from django.shortcuts import render, get_object_or_404 from django.utils.translation import ugettext_lazy as _ from django.urls import reverse -from django.contrib.auth.decorators import login_required from computes.models import Compute from vrtManager import util from vrtManager.nwfilters import wvmNWFilters, wvmNWFilter @@ -14,7 +13,6 @@ from libvirt import libvirtError from logs.views import addlogmsg -@login_required def nwfilters(request, compute_id): """ :param request: @@ -112,7 +110,6 @@ def nwfilters(request, compute_id): 'compute': compute}) -@login_required def nwfilter(request, compute_id, nwfltr): error_messages = [] diff --git a/secrets/views.py b/secrets/views.py index d519ad9..d40eda0 100644 --- a/secrets/views.py +++ b/secrets/views.py @@ -1,14 +1,12 @@ from django.shortcuts import render, get_object_or_404 from django.http import HttpResponseRedirect from django.urls import reverse -from django.contrib.auth.decorators import login_required from computes.models import Compute from secrets.forms import AddSecret from vrtManager.secrets import wvmSecrets from libvirt import libvirtError -@login_required def secrets(request, compute_id): """ :param request: diff --git a/storages/views.py b/storages/views.py index b7f6c25..76749a4 100644 --- a/storages/views.py +++ b/storages/views.py @@ -2,7 +2,6 @@ from django.shortcuts import render, get_object_or_404 from django.http import HttpResponseRedirect, HttpResponse from django.utils.translation import ugettext_lazy as _ from django.urls import reverse -from django.contrib.auth.decorators import login_required from computes.models import Compute from storages.forms import AddStgPool, AddImage, CloneImage from vrtManager.storage import wvmStorage, wvmStorages @@ -11,7 +10,6 @@ from django.contrib import messages import json -@login_required def storages(request, compute_id): """ :param request: @@ -70,7 +68,6 @@ def storages(request, compute_id): return render(request, 'storages.html', locals()) -@login_required def storage(request, compute_id, pool): """ :param request: @@ -215,7 +212,6 @@ def storage(request, compute_id, pool): return render(request, 'storage.html', locals()) -@login_required def get_volumes(request, compute_id, pool): data = {} compute = get_object_or_404(Compute, pk=compute_id) diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template index 8e93ac9..ad2b200 100644 --- a/webvirtcloud/settings.py.template +++ b/webvirtcloud/settings.py.template @@ -44,6 +44,7 @@ MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'login_required.middleware.LoginRequiredMiddleware', 'django.contrib.auth.middleware.RemoteUserMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',