+ {% bootstrap_form_errors form %}
+
+ {% endif %}
+
+
+ + +```html login: admin password: admin -+``` + +### Configuring Compute SSH connection + +This is a short example of configuring cloud and compute side of the ssh connection. + +On the webvirtcloud machine you need to generate ssh keys and optionally disable StrictHostKeyChecking. -### How To Update ```bash +chown www-data -R ~www-data +sudo -u www-data ssh-keygen +cat > ~www-data/.ssh/config << EOF +Host * +StrictHostKeyChecking no +EOF +chown www-data -R ~www-data/.ssh/config +``` + +You need to put cloud public key into authorized keys on the compute node. Simpliest way of doing this is to use ssh tool from the webvirtcloud server. + +```bash +sudo -u www-data ssh-copy-id root@compute1 +``` + +### Host SMBIOS information is not available + +If you see warning + +```bash +Unsupported configuration: Host SMBIOS information is not available +``` + +Then you need to install `dmidecode` package on your host using your package manager and restart libvirt daemon. + +Debian/Ubuntu like: + +```bash +sudo apt-get install dmidecode +sudo service libvirt-bin restart +``` + +Arch Linux + +```bash +sudo pacman -S dmidecode +systemctl restart libvirtd +``` + +### Cloud-init + +Currently supports only root ssh authorized keys and hostname. Example configuration of the cloud-init client follows. + +```bash +datasource: + OpenStack: + metadata_urls: [ "http://webvirtcloud.domain.com/datasource" ] +``` + +### Reverse-Proxy + +Edit WS_PUBLIC_PORT at settings.py file to expose redirect to 80 or 443. Default: 6080 + +```bash +WS_PUBLIC_PORT = 80 +``` + +## How To Update + +```bash +# Go to Installation Directory +cd /srv/webvirtcloud +source venv/bin/activate git pull -python manage.py migrate +pip3 install -U -r conf/requirements.txt +python3 manage.py migrate +python3 manage.py collectstatic --noinput sudo service supervisor restart ``` -### License +### Running tests + +Server on which tests will be performed must have libvirt up and running. +It must not contain vms. +It must have `default` storage which not contain any disk images. +It must have `default` network which must be on. +Setup venv + +```bash +python -m venv venv +source venv/bin/activate +pip install -r conf/requirements.txt +``` + +Run tests + +```bash +python manage.py test +``` + +## LDAP Configuration + +The config options below can be changed in `webvirtcloud/settings.py` file. Variants for Active Directory and OpenLDAP are shown. This is a minimal config to get LDAP running, for further info read the [django-auth-ldap documentation](https://django-auth-ldap.readthedocs.io). + +Enable LDAP + +```bash +sudo sed -i "s~#\"django_auth_ldap.backend.LDAPBackend\",~\"django_auth_ldap.backend.LDAPBackend\",~g" /srv/webvirtcloud/webvirtcloud/settings.py +``` + +Set the LDAP server name and bind DN + +```python +# Active Directory +AUTH_LDAP_SERVER_URI = "ldap://example.com" +AUTH_LDAP_BIND_DN = "username@example.com" +AUTH_LDAP_BIND_PASSWORD = "password" + +# OpenLDAP +AUTH_LDAP_SERVER_URI = "ldap://example.com" +AUTH_LDAP_BIND_DN = "CN=username,CN=Users,OU=example,OU=com" +AUTH_LDAP_BIND_PASSWORD = "password" +``` + +Set the user filter and user and group search base and filter + +```python +# Active Directory +AUTH_LDAP_USER_SEARCH = LDAPSearch( + "CN=Users,DC=example,DC=com", ldap.SCOPE_SUBTREE, "(sAMAccountName=%(user)s)" +) +AUTH_LDAP_GROUP_SEARCH = LDAPSearch( + "CN=Users,DC=example,DC=com", ldap.SCOPE_SUBTREE, "(objectClass=group)" +) +AUTH_LDAP_GROUP_TYPE = NestedActiveDirectoryGroupType() + +# OpenLDAP +AUTH_LDAP_USER_SEARCH = LDAPSearch( + "CN=Users,DC=example,DC=com", ldap.SCOPE_SUBTREE, "(cn=%(user)s)" +) +AUTH_LDAP_GROUP_SEARCH = LDAPSearch( + "CN=Users,DC=example,DC=com", ldap.SCOPE_SUBTREE, "(objectClass=groupOfUniqueNames)" +) +AUTH_LDAP_GROUP_TYPE = GroupOfUniqueNamesType() # import needs to be changed at the top of settings.py +``` + +Set group which is required to access WebVirtCloud. You may set this to `False` to disable this filter. + +```python +AUTH_LDAP_REQUIRE_GROUP = "CN=WebVirtCloud Access,CN=Users,DC=example,DC=com" +``` + +Populate user fields with values from LDAP + +```python +AUTH_LDAP_USER_FLAGS_BY_GROUP = { + "is_staff": "CN=WebVirtCloud Staff,CN=Users,DC=example,DC=com", + "is_superuser": "CN=WebVirtCloud Admins,CN=Users,DC=example,DC=com", +} +AUTH_LDAP_USER_ATTR_MAP = { + "first_name": "givenName", + "last_name": "sn", + "email": "mail", +} +``` + +Now when you login with an LDAP user it will be assigned the rights defined. The user will be authenticated then with LDAP and authorized through the WebVirtCloud permissions. + +If you'd like to move a user from ldap to WebVirtCloud, just change its password from the UI and (eventually) remove from the group in LDAP. + + +## REST API / BETA +Webvirtcloud provides a REST API for programmatic access. +To access API methods open your browser and check them with Swagger interface +```bash +http://
+Instance List:
+
+
+Other:
+
+
+
+## License
WebVirtCloud is licensed under the [Apache Licence, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
diff --git a/Vagrantfile b/Vagrantfile
index 539468d..51522bb 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,17 +2,55 @@
# vi: set ft=ruby :
Vagrant.configure(2) do |config|
- config.vm.box = "ubuntu/trusty64"
- config.vm.hostname = "webvirtcloud"
- config.vm.network "private_network", ip: "192.168.33.10"
- config.vm.provision "shell", inline: <<-SHELL
+ # Default machine, if name not specified...
+ config.vm.define "dev", primary: true do |dev|
+ dev.vm.box = "ubuntu/bionic64"
+ dev.vm.hostname = "webvirtcloud"
+ dev.vm.network "private_network", ip: "192.168.33.10"
+ dev.vm.provision "shell", inline: <<-SHELL
sudo sh /vagrant/dev/libvirt-bootstrap.sh
sudo sed -i 's/auth_tcp = \"sasl\"/auth_tcp = \"none\"/g' /etc/libvirt/libvirtd.conf
sudo service libvirt-bin restart
sudo adduser vagrant libvirtd
- sudo apt-get -y install python-virtualenv python-dev libxml2-dev libvirt-dev zlib1g-dev
- virtualenv /vagrant/venv
+ sudo apt-get -y install python3-virtualenv virtualenv python3-pip python3-dev python3-lxml libvirt-dev zlib1g-dev python3-guestfs
+ virtualenv -p python3 /vagrant/venv
source /vagrant/venv/bin/activate
- pip install -r /vagrant/dev/requirements.txt
- SHELL
+ pip3 install -r /vagrant/dev/requirements.txt
+ SHELL
+ end
+ # To start this machine run "vagrant up prod"
+ # To enter this machine run "vagrant ssh prod"
+ config.vm.define "prod", autostart: false do |prod|
+ prod.vm.box = "ubuntu/bionic64"
+ prod.vm.hostname = "webvirtcloud"
+ prod.vm.network "private_network", ip: "192.168.33.11"
+ prod.vm.network "forwarded_port", guest: 80, host: 8081
+ #prod.vm.synced_folder ".", "/srv/webvirtcloud"
+ prod.vm.provision "shell", inline: <<-SHELL
+ sudo mkdir /srv/webvirtcloud
+ sudo cp -R /vagrant/* /srv/webvirtcloud
+ sudo sh /srv/webvirtcloud/dev/libvirt-bootstrap.sh
+ sudo sed -i 's/auth_tcp = \"sasl\"/auth_tcp = \"none\"/g' /etc/libvirt/libvirtd.conf
+ sudo service libvirt-bin restart
+ sudo adduser vagrant libvirtd
+ sudo chown -R vagrant:vagrant /srv/webvirtcloud
+ sudo apt-get -y install python3-virtualenv python3-dev python3-lxml python3-pip virtualenv libvirt-dev zlib1g-dev libxslt1-dev nginx supervisor libsasl2-modules gcc pkg-config python3-guestfs
+ virtualenv -p python3 /srv/webvirtcloud/venv
+ source /srv/webvirtcloud/venv/bin/activate
+ pip3 install -r /srv/webvirtcloud/requirements.txt
+ sudo cp /srv/webvirtcloud/conf/supervisor/webvirtcloud.conf /etc/supervisor/conf.d
+ sudo cp /srv/webvirtcloud/conf/nginx/webvirtcloud.conf /etc/nginx/conf.d
+ sudo cp /srv/webvirtcloud/webvirtcloud/settings.py.template /srv/webvirtcloud/webvirtcloud/settings.py
+ sudo sed "s/SECRET_KEY = ''/SECRET_KEY = '"`python3 /srv/webvirtcloud/conf/runit/secret_generator.py`"'/" -i /srv/webvirtcloud/webvirtcloud/settings.py
+ python3 /srv/webvirtcloud/manage.py makemigrations
+ python3 /srv/webvirtcloud/manage.py migrate
+ python3 /srv/webvirtcloud/manage.py collectstatic --noinput
+ sudo rm /etc/nginx/sites-enabled/default
+ sudo chown -R www-data:www-data /srv/webvirtcloud
+ sudo service nginx restart
+ sudo service supervisor restart
+ SHELL
+ end
end
+
+
diff --git a/_config.yml b/_config.yml
new file mode 100644
index 0000000..c419263
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
\ No newline at end of file
diff --git a/accounts/__init__.py b/accounts/__init__.py
index e69de29..8319823 100644
--- a/accounts/__init__.py
+++ b/accounts/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'accounts.apps.AccountsConfig'
diff --git a/accounts/admin.py b/accounts/admin.py
deleted file mode 100644
index 8c38f3f..0000000
--- a/accounts/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/accounts/apps.py b/accounts/apps.py
new file mode 100644
index 0000000..2a6f631
--- /dev/null
+++ b/accounts/apps.py
@@ -0,0 +1,63 @@
+from django.apps import AppConfig
+from django.db.models.signals import post_migrate
+
+
+def apply_change_password(sender, **kwargs):
+ """
+ Apply new change_password permission for all users
+ Depending on settings SHOW_PROFILE_EDIT_PASSWORD
+ """
+ from django.conf import settings
+ from django.contrib.auth.models import Permission, User
+
+ if hasattr(settings, "SHOW_PROFILE_EDIT_PASSWORD"):
+ print("\033[1m! \033[92mSHOW_PROFILE_EDIT_PASSWORD is found inside settings.py\033[0m")
+ print("\033[1m* \033[92mApplying permission can_change_password for all users\033[0m")
+ users = User.objects.all()
+ permission = Permission.objects.get(codename="change_password")
+ if settings.SHOW_PROFILE_EDIT_PASSWORD:
+ print("\033[1m! \033[91mWarning!!! Setting to True for all users\033[0m")
+ for user in users:
+ user.user_permissions.add(permission)
+ else:
+ print("\033[1m* \033[91mWarning!!! Setting to False for all users\033[0m")
+ for user in users:
+ user.user_permissions.remove(permission)
+ print("\033[1m! Don`t forget to remove the option from settings.py\033[0m")
+
+
+def create_admin(sender, **kwargs):
+ """
+ Create initial admin user
+ """
+ from django.contrib.auth.models import User
+
+ from accounts.models import UserAttributes
+
+ plan = kwargs.get("plan", [])
+ for migration, rolled_back in plan:
+ if (
+ migration.app_label == "accounts"
+ and migration.name == "0001_initial"
+ and not rolled_back
+ ):
+ if User.objects.count() == 0:
+ print("\033[1m* \033[92mCreating default admin user\033[0m")
+ admin = User.objects.create_superuser("admin", None, "admin")
+ UserAttributes(
+ user=admin,
+ max_instances=-1,
+ max_cpus=-1,
+ max_memory=-1,
+ max_disk_size=-1,
+ ).save()
+ break
+
+
+class AccountsConfig(AppConfig):
+ name = "accounts"
+ verbose_name = "Accounts"
+
+ def ready(self):
+ post_migrate.connect(create_admin, sender=self)
+ post_migrate.connect(apply_change_password, sender=self)
diff --git a/accounts/forms.py b/accounts/forms.py
index 55d5c29..d4c7e56 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -1,24 +1,75 @@
-import re
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.models import User
+from appsettings.settings import app_settings
+from django.contrib.auth import get_user_model
+from django.forms import EmailField, Form, ModelForm, ValidationError
+from django.utils.translation import gettext_lazy as _
+
+from .models import UserInstance, UserSSHKey
+from .utils import validate_ssh_key
-class UserAddForm(forms.Form):
- name = forms.CharField(label="Name",
- error_messages={'required': _('No User name has been entered')},
- max_length=20)
- password = forms.CharField(required=True, error_messages={'required': _('No password has been entered')},)
+class UserInstanceForm(ModelForm):
+ def __init__(self, *args, **kwargs):
+ super(UserInstanceForm, self).__init__(*args, **kwargs)
- def clean_name(self):
- name = self.cleaned_data['name']
- have_symbol = re.match('^[a-z0-9]+$', name)
- if not have_symbol:
- raise forms.ValidationError(_('The flavor name must not contain any special characters'))
- elif len(name) > 20:
- raise forms.ValidationError(_('The flavor name must not exceed 20 characters'))
- try:
- User.objects.get(username=name)
- except User.DoesNotExist:
- return name
- raise forms.ValidationError(_('Flavor name is already use'))
+ # Make user and instance fields not editable after creation
+ instance = getattr(self, "instance", None)
+ if instance and instance.id is not None:
+ self.fields["user"].disabled = True
+ self.fields["instance"].disabled = True
+
+ def clean_instance(self):
+ instance = self.cleaned_data["instance"]
+ if app_settings.ALLOW_INSTANCE_MULTIPLE_OWNER == "False":
+ exists = UserInstance.objects.filter(instance=instance)
+ if exists:
+ raise ValidationError(_("Instance owned by another user"))
+
+ return instance
+
+ class Meta:
+ model = UserInstance
+ fields = "__all__"
+
+
+class ProfileForm(ModelForm):
+ class Meta:
+ model = get_user_model()
+ fields = ("first_name", "last_name", "email")
+
+
+class UserSSHKeyForm(ModelForm):
+ def __init__(self, *args, **kwargs):
+ self.user = kwargs.pop("user", None)
+ self.publickeys = UserSSHKey.objects.filter(user=self.user)
+ super().__init__(*args, **kwargs)
+
+ def clean_keyname(self):
+ for key in self.publickeys:
+ if self.cleaned_data["keyname"] == key.keyname:
+ raise ValidationError(_("Key name already exist"))
+
+ return self.cleaned_data["keyname"]
+
+ def clean_keypublic(self):
+ for key in self.publickeys:
+ if self.cleaned_data["keypublic"] == key.keypublic:
+ raise ValidationError(_("Public key already exist"))
+
+ if not validate_ssh_key(self.cleaned_data["keypublic"]):
+ raise ValidationError(_("Invalid key"))
+ return self.cleaned_data["keypublic"]
+
+ def save(self, commit=True):
+ ssh_key = super().save(commit=False)
+ ssh_key.user = self.user
+ if commit:
+ ssh_key.save()
+ return ssh_key
+
+ class Meta:
+ model = UserSSHKey
+ fields = ("keyname", "keypublic")
+
+
+class EmailOTPForm(Form):
+ email = EmailField(label=_("Email"))
diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py
index 3989532..6c41032 100644
--- a/accounts/migrations/0001_initial.py
+++ b/accounts/migrations/0001_initial.py
@@ -1,29 +1,50 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
+# Generated by Django 2.2.10 on 2020-01-28 07:01
+import django.core.validators
+import django.db.models.deletion
from django.conf import settings
+from django.db import migrations, models
class Migration(migrations.Migration):
+ initial = True
+
dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('instances', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
+ migrations.CreateModel(
+ name='UserSSHKey',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('keyname', models.CharField(max_length=25)),
+ ('keypublic', models.CharField(max_length=500)),
+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
migrations.CreateModel(
name='UserInstance',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('is_change', models.BooleanField(default=False)),
('is_delete', models.BooleanField(default=False)),
- ('instance', models.ForeignKey(to='instances.Instance')),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+ ('is_vnc', models.BooleanField(default=False)),
+ ('instance', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='instances.Instance')),
+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='UserAttributes',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('can_clone_instances', models.BooleanField(default=True)),
+ ('max_instances', models.IntegerField(default=1, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)])),
+ ('max_cpus', models.IntegerField(default=1, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)])),
+ ('max_memory', models.IntegerField(default=2048, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)])),
+ ('max_disk_size', models.IntegerField(default=20, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)])),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
- options={
- },
- bases=(models.Model,),
),
]
diff --git a/accounts/migrations/0002_auto_20150325_0846.py b/accounts/migrations/0002_auto_20150325_0846.py
deleted file mode 100644
index 8780f97..0000000
--- a/accounts/migrations/0002_auto_20150325_0846.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-def add_useradmin(apps, schema_editor):
- from django.utils import timezone
- from django.contrib.auth.models import User
-
- User.objects.create_superuser('admin', None, 'admin',
- last_login=timezone.now()
- )
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('accounts', '0001_initial'),
- ]
-
- operations = [
- migrations.RunPython(add_useradmin),
- ]
diff --git a/accounts/migrations/0002_permissionset.py b/accounts/migrations/0002_permissionset.py
new file mode 100644
index 0000000..5b36210
--- /dev/null
+++ b/accounts/migrations/0002_permissionset.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.12 on 2020-05-27 12:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('accounts', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='PermissionSet',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ],
+ options={
+ 'permissions': (('change_password', 'Can change password'), ),
+ 'managed': False,
+ 'default_permissions': (),
+ },
+ ),
+ ]
diff --git a/accounts/migrations/0003_auto_20200604_0930.py b/accounts/migrations/0003_auto_20200604_0930.py
new file mode 100644
index 0000000..05c9232
--- /dev/null
+++ b/accounts/migrations/0003_auto_20200604_0930.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.12 on 2020-06-04 09:30
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('accounts', '0002_permissionset'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='userattributes',
+ name='max_cpus',
+ field=models.IntegerField(default=2, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)]),
+ ),
+ migrations.AlterField(
+ model_name='userattributes',
+ name='max_instances',
+ field=models.IntegerField(default=2, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)]),
+ ),
+ ]
diff --git a/accounts/migrations/0003_usersshkey.py b/accounts/migrations/0003_usersshkey.py
deleted file mode 100644
index b00bc62..0000000
--- a/accounts/migrations/0003_usersshkey.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('accounts', '0002_auto_20150325_0846'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='UserSSHKey',
- fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('keyname', models.CharField(max_length=25)),
- ('keypublic', models.CharField(max_length=500)),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
- ],
- ),
- ]
diff --git a/accounts/migrations/0004_auto_20200615_0637.py b/accounts/migrations/0004_auto_20200615_0637.py
new file mode 100644
index 0000000..c24bd98
--- /dev/null
+++ b/accounts/migrations/0004_auto_20200615_0637.py
@@ -0,0 +1,44 @@
+# Generated by Django 2.2.13 on 2020-06-15 06:37
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('accounts', '0003_auto_20200604_0930'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='userattributes',
+ name='max_cpus',
+ field=models.IntegerField(default=2, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)], verbose_name='max CPUs'),
+ ),
+ migrations.AlterField(
+ model_name='userattributes',
+ name='max_disk_size',
+ field=models.IntegerField(default=20, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)], verbose_name='max disk size'),
+ ),
+ migrations.AlterField(
+ model_name='userattributes',
+ name='max_instances',
+ field=models.IntegerField(default=2, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)], verbose_name='max instances'),
+ ),
+ migrations.AlterField(
+ model_name='userattributes',
+ name='max_memory',
+ field=models.IntegerField(default=2048, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)], verbose_name='max memory'),
+ ),
+ migrations.AlterField(
+ model_name='usersshkey',
+ name='keyname',
+ field=models.CharField(max_length=25, verbose_name='key name'),
+ ),
+ migrations.AlterField(
+ model_name='usersshkey',
+ name='keypublic',
+ field=models.CharField(max_length=500, verbose_name='public key'),
+ ),
+ ]
diff --git a/accounts/migrations/0005_auto_20200616_1039.py b/accounts/migrations/0005_auto_20200616_1039.py
new file mode 100644
index 0000000..bf48ddc
--- /dev/null
+++ b/accounts/migrations/0005_auto_20200616_1039.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.13 on 2020-06-16 10:39
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('instances', '0003_auto_20200615_0637'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('accounts', '0004_auto_20200615_0637'),
+ ]
+
+ operations = [
+ migrations.AlterUniqueTogether(
+ name='userinstance',
+ unique_together={('user', 'instance')},
+ ),
+ ]
diff --git a/accounts/models.py b/accounts/models.py
index 15cedee..88cbb23 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -1,22 +1,82 @@
-from django.db import models
from django.contrib.auth.models import User
+from django.core.validators import MinValueValidator
+from django.db import models
+from django.utils.translation import gettext_lazy as _
from instances.models import Instance
+class UserInstanceManager(models.Manager):
+ def get_queryset(self):
+ return super().get_queryset().select_related("instance", "user")
+
+
class UserInstance(models.Model):
- user = models.ForeignKey(User)
- instance = models.ForeignKey(Instance)
+ user = models.ForeignKey(User, on_delete=models.CASCADE)
+ instance = models.ForeignKey(Instance, on_delete=models.CASCADE)
is_change = models.BooleanField(default=False)
is_delete = models.BooleanField(default=False)
+ is_vnc = models.BooleanField(default=False)
- def __unicode__(self):
- return self.instance.name
+ objects = UserInstanceManager()
+
+ def __str__(self):
+ return _('Instance "%(inst)s" of user %(user)s') % {
+ "inst": self.instance,
+ "user": self.user,
+ }
+
+ class Meta:
+ unique_together = ["user", "instance"]
class UserSSHKey(models.Model):
- user = models.ForeignKey(User)
- keyname = models.CharField(max_length=25)
- keypublic = models.CharField(max_length=500)
+ user = models.ForeignKey(User, on_delete=models.DO_NOTHING)
+ keyname = models.CharField(_("key name"), max_length=25)
+ keypublic = models.CharField(_("public key"), max_length=500)
- def __unicode__(self):
+ def __str__(self):
return self.keyname
+
+
+class UserAttributes(models.Model):
+ user = models.OneToOneField(User, on_delete=models.CASCADE)
+ can_clone_instances = models.BooleanField(default=True)
+ max_instances = models.IntegerField(
+ _("max instances"),
+ default=2,
+ help_text=_("-1 for unlimited. Any integer value"),
+ validators=[MinValueValidator(-1)],
+ )
+ max_cpus = models.IntegerField(
+ _("max CPUs"),
+ default=2,
+ help_text=_("-1 for unlimited. Any integer value"),
+ validators=[MinValueValidator(-1)],
+ )
+ max_memory = models.IntegerField(
+ _("max memory"),
+ default=2048,
+ help_text=_("-1 for unlimited. Any integer value"),
+ validators=[MinValueValidator(-1)],
+ )
+ max_disk_size = models.IntegerField(
+ _("max disk size"),
+ default=20,
+ help_text=_("-1 for unlimited. Any integer value"),
+ validators=[MinValueValidator(-1)],
+ )
+
+ def __str__(self):
+ return self.user.username
+
+
+class PermissionSet(models.Model):
+ """
+ Dummy model for holding set of permissions we need to be automatically added by Django
+ """
+
+ class Meta:
+ default_permissions = ()
+ permissions = (("change_password", _("Can change password")),)
+
+ managed = False
diff --git a/accounts/templates/account.html b/accounts/templates/account.html
index b6a8b6c..3dc7768 100644
--- a/accounts/templates/account.html
+++ b/accounts/templates/account.html
@@ -1,104 +1,93 @@
{% extends "base.html" %}
+
{% load i18n %}
-{% block title %}{% trans "User" %} - {{ user }}{% endblock %}
+{% load bootstrap_icons %}
+{% load qr_code %}
+
+{% block title %}{% trans "User Profile" %} - {{ user }}{% endblock %}
+{% block page_heading %}{% trans "User Profile" %}: {{ user }}{% endblock page_heading %}
+
+{% block page_heading_extra %}
+{% if otp_enabled %}
+
+ {% bs_icon 'qr-code' %}
+
+{% endif %}
+
+ {% bs_icon 'pencil' %}
+
+
+ {% bs_icon 'plus-circle-fill' %}
+
+{% endblock page_heading_extra %}
+
{% block content %}
-
-
-
-
+
- {% include 'errors_block.html' %}
-
-
- {% include 'create_user_inst_block.html' %}
-
- {{ user }}
-
-
-{% endblock %}
\ No newline at end of file
+
- {% if not user_insts %}
-
-
-
- {% else %}
-
-
- {% trans "Warning:" %} {% trans "User doesn't have any Instace" %}
-
-
-
-
-
-
- {% endif %}
- | # | -{% trans "Instance" %} | -{% trans "Resize" %} | -{% trans "Delete" %} | -{% trans "Action" %} | -|
|---|---|---|---|---|---|
| {{ forloop.counter }} | -{{ inst.instance.name }} | -{{ inst.is_change }} | -{{ inst.is_delete }} | -- - - - - - - | -- - | -
+
+{% endblock content %}
diff --git a/accounts/templates/accounts.html b/accounts/templates/accounts.html
deleted file mode 100644
index 9ebff0b..0000000
--- a/accounts/templates/accounts.html
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block title %}{% trans "Users" %}{% endblock %}
-{% block content %}
-
-
+
+
+
+
+ | # | +{% trans "Instance" %} | +{% trans "VNC" %} | +{% trans "Resize" %} | +{% trans "Delete" %} | +{% trans "Action" %} | +|
|---|---|---|---|---|---|---|
| {{ forloop.counter }} | +{{ inst.instance.name }} | +{{ inst.is_vnc }} | +{{ inst.is_change }} | +{{ inst.is_delete }} | ++ + {% bs_icon 'pencil' %} + + | ++ + {% bs_icon 'trash' %} + + | +
+
+
+
+
+ | {% trans "Key name" %} | +{% trans "Public key" %} | +
|---|---|
| {{ publickey.keyname }} | +{{ publickey.keypublic|truncatechars:64 }} | +
-
-
-
- {% include 'errors_block.html' %}
-
-
- {% include 'create_user_block.html' %}
-
- {% trans "Users" %}
-
- {% if not users %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/accounts/templates/accounts/change_password_form.html b/accounts/templates/accounts/change_password_form.html
new file mode 100644
index 0000000..3df2d0e
--- /dev/null
+++ b/accounts/templates/accounts/change_password_form.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+
+{% load django_bootstrap5 %}
+{% load i18n %}
+{% load bootstrap_icons %}
+
+{% block title %}{%trans "Change Password" %}{% endblock title %}
+
+{% block content %}
+
-
- {% else %}
- {% for user in users %}
-
-
- {% trans "Warning:" %} {% trans "You don't have any User" %}
-
-
-
-
-
-
- {% endfor %}
- {% endif %}
-
-
-
-
- - {{ user.username }} - - - -
-
-
-
-
- {% trans "Status:" %}
-
- {% if user.is_active %}
-
- {% trans "Active" %}
- {% else %} -{% trans "Blocked" %}
- {% endif %} -
+
+{% endblock content %}
\ No newline at end of file
diff --git a/accounts/templates/accounts/email/otp.html b/accounts/templates/accounts/email/otp.html
new file mode 100644
index 0000000..c80ec14
--- /dev/null
+++ b/accounts/templates/accounts/email/otp.html
@@ -0,0 +1,9 @@
+{% load i18n %}
+{% load qr_code %}
+{% blocktrans %}
+Scan this QR code to get OTP for account '{{ user }}'
+{% endblocktrans %}
+
+
+
+
+
+
+ {%trans "Change Password" %}: {{ user }}
+
+
+
+
+ +{% qr_from_text totp_url %} +
{% trans 'Some e-mail clients does not render SVG, also generating PNG.' %}
+{% qr_from_text totp_url size="s" image_format="png" error_correction="M" %} diff --git a/accounts/templates/accounts/email_otp_form.html b/accounts/templates/accounts/email_otp_form.html new file mode 100644 index 0000000..83ba2d9 --- /dev/null +++ b/accounts/templates/accounts/email_otp_form.html @@ -0,0 +1,32 @@ +{% extends "base.html" %} +{% load django_bootstrap5 %} +{% load bootstrap_icons %} +{% load i18n %} + +{% block title %}{{ title }}{% endblock %} + +{% block page_heading %}{{ title }}{% endblock page_heading %} + +{% block content %} +
+ {% blocktrans %}
+ Enter email address OTP QR code will be sent to.
+ {% endblocktrans %}
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/accounts/templates/accounts/otp_login.html b/accounts/templates/accounts/otp_login.html
new file mode 100644
index 0000000..5f54f36
--- /dev/null
+++ b/accounts/templates/accounts/otp_login.html
@@ -0,0 +1,57 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load static %}
+{% load django_bootstrap5 %}
+
+{% block title %}{% trans "WebVirtCloud" %} - {% trans "Sign In with OTP" %}{% endblock title %}
+
+{% block style %}
+
+{% endblock style %}
+
+{% block content %}
+
+{% endblock content %}
+
+{% block script %}
+
+{% endblock script%}
diff --git a/accounts/templates/base_auth.html b/accounts/templates/base_auth.html
deleted file mode 100644
index a7680bb..0000000
--- a/accounts/templates/base_auth.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% load static %}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- {% block content %}{% endblock %}
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/accounts/templates/create_user_block.html b/accounts/templates/create_user_block.html
deleted file mode 100644
index 7752f56..0000000
--- a/accounts/templates/create_user_block.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% load i18n %}
-{% if request.user.is_superuser %}
-
-
-
-
-
-
-{% endif %}
\ No newline at end of file
diff --git a/accounts/templates/create_user_inst_block.html b/accounts/templates/create_user_inst_block.html
deleted file mode 100644
index df5937e..0000000
--- a/accounts/templates/create_user_inst_block.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load i18n %}
-{% if request.user.is_superuser %}
-
-
-
-
-
-
-{% endif %}
\ No newline at end of file
diff --git a/accounts/templates/login.html b/accounts/templates/login.html
index 362fdf7..28e6769 100644
--- a/accounts/templates/login.html
+++ b/accounts/templates/login.html
@@ -1,25 +1,55 @@
-{% extends "base_auth.html" %}
+{% extends "base.html" %}
{% load i18n %}
-{% block title %}{% trans "WebVirtCloud - Sign In" %}{% endblock %}
+{% load static %}
+
+
+{% block title %}{% trans "WebVirtCloud" %} - {% trans "Sign In" %}{% endblock title %}
+
+{% block style %}
+
+{% endblock style %}
+
{% block content %}
-
-
-
- WebVirtCloud
-
- {% if form.errors %}
-
+
-
- {% trans "Incorrect username or password." %}
-
- {% endif %}
-
-
+
-{% endblock %}
\ No newline at end of file
+
+
+{% endblock %}
+
+{% block script %}
+
+{% endblock script%}
diff --git a/accounts/templates/logout.html b/accounts/templates/logout.html
index 83161d3..eb3b917 100644
--- a/accounts/templates/logout.html
+++ b/accounts/templates/logout.html
@@ -1,15 +1,17 @@
-{% extends "base_auth.html" %}
+{% extends "base.html" %}
{% load i18n %}
-{% block title %}{% trans "WebVirtCloud - Sign Out" %}{% endblock %}
+{% block title %}
+ {% trans "WebVirtCloud" %} - {% trans "Sign Out"%}
+{% endblock %}
{% block content %}
- +
+ {% if form.errors %}
+
+
+
+ {% trans "Incorrect username or password." %}
+
+ {% endif %}
+
+
+
-
+
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/accounts/templates/profile.html b/accounts/templates/profile.html
index 3d15393..6e1cd5b 100644
--- a/accounts/templates/profile.html
+++ b/accounts/templates/profile.html
@@ -1,115 +1,84 @@
{% extends "base.html" %}
{% load i18n %}
+{% load django_bootstrap5 %}
+{% load bootstrap_icons %}
{% load tags_fingerprint %}
-{% block title %}{% trans "Profile" %}{% endblock %}
+
+{% block title %}{% trans "Profile" %}: {{ request.user.first_name }} {{ request.user.last_name}}{% endblock %}
+
+{% block page_heading %}{% trans "Profile" %}: {{ request.user.first_name }} {{ request.user.last_name}}{% endblock page_heading %}
+
{% block content %}
-
-
-
{% trans "Successful log out" %}
+{% trans "Successful log out" %}
-
-
-
- {% include 'errors_block.html' %}
-
-
-
- {% trans "Profile" %}
-
- [0-9]+)/$', views.account, name='account'),
+ path("logout/", LogoutView.as_view(template_name="logout.html"), name="logout"),
+ path("profile/", views.profile, name="profile"),
+ path("profile//", views.account, name="account"),
+ path("change_password/", views.change_password, name="change_password"),
+ path(
+ "user_instance/create//",
+ views.user_instance_create,
+ name="user_instance_create",
+ ),
+ path(
+ "user_instance//update/",
+ views.user_instance_update,
+ name="user_instance_update",
+ ),
+ path(
+ "user_instance//delete/",
+ views.user_instance_delete,
+ name="user_instance_delete",
+ ),
+ path("ssh_key/create/", views.ssh_key_create, name="ssh_key_create"),
+ path("ssh_key//delete/", views.ssh_key_delete, name="ssh_key_delete"),
]
+
+if settings.OTP_ENABLED:
+ urlpatterns += [
+ path(
+ "login/",
+ LoginView.as_view(
+ template_name="accounts/otp_login.html",
+ authentication_form=OTPAuthenticationForm,
+ ),
+ name="login",
+ ),
+ path("email_otp/", views.email_otp, name="email_otp"),
+ path(
+ "admin_email_otp//",
+ views.admin_email_otp,
+ name="admin_email_otp",
+ ),
+ ]
+else:
+ urlpatterns += (
+ path("login/", CustomLoginView.as_view(template_name="login.html"), name="login"),
+ )
diff --git a/accounts/utils.py b/accounts/utils.py
new file mode 100644
index 0000000..fbbdf81
--- /dev/null
+++ b/accounts/utils.py
@@ -0,0 +1,61 @@
+import base64
+import binascii
+import struct
+
+from django.core.mail import send_mail
+from django.template.loader import render_to_string
+from django.utils.translation import gettext as _
+from django_otp import devices_for_user
+from django_otp.plugins.otp_totp.models import TOTPDevice
+
+
+def get_user_totp_device(user):
+ devices = devices_for_user(user)
+ for device in devices:
+ if isinstance(device, TOTPDevice):
+ return device
+
+ device = user.totpdevice_set.create()
+ return device
+
+
+def validate_ssh_key(key):
+ array = key.encode().split()
+ # Each rsa-ssh key has 3 different strings in it, first one being
+ # typeofkey second one being keystring third one being username .
+ if len(array) != 3:
+ return False
+ typeofkey = array[0]
+ string = array[1]
+
+ # must have only valid rsa-ssh key characters ie binascii characters
+ try:
+ data = base64.decodebytes(string)
+ except binascii.Error:
+ return False
+ # unpack the contents of data, from data[:4] , property of ssh key .
+ try:
+ str_len = struct.unpack(">I", data[:4])[0]
+ except struct.error:
+ return False
+ # data[4:str_len] must have string which matches with the typeofkey, another ssh key property.
+ if data[4 : 4 + str_len] != typeofkey:
+ return False
+ return True
+
+
+def send_email_with_otp(user, device):
+ send_mail(
+ _("OTP QR Code"),
+ _("Please view HTML version of this message."),
+ None,
+ [user.email],
+ html_message=render_to_string(
+ "accounts/email/otp.html",
+ {
+ "totp_url": device.config_url,
+ "user": user,
+ },
+ ),
+ fail_silently=False,
+ )
diff --git a/accounts/views.py b/accounts/views.py
index d2893bb..a7da98a 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -1,172 +1,215 @@
-from django.shortcuts import render
+from admin.decorators import superuser_only
+from django.conf import settings
+from django.contrib import messages
+from django.contrib.auth import get_user_model, update_session_auth_hash, login as auth_login
+from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.forms import PasswordChangeForm
+from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.models import User
-from accounts.models import UserInstance, UserSSHKey
+from django.utils.translation import gettext_lazy as _
from instances.models import Instance
-from accounts.forms import UserAddForm
+from accounts.forms import EmailOTPForm, ProfileForm, UserSSHKeyForm
+from accounts.models import *
+
+from . import forms
+from .utils import get_user_totp_device, send_email_with_otp
+from django.contrib.auth.views import LoginView
+from logs.views import addlogmsg
+
+class CustomLoginView(LoginView):
+ def form_valid(self, form):
+ username = form.cleaned_data['username']
+ addlogmsg(username, "-", "-", "Logged In")
+ auth_login(self.request, form.get_user())
+ return HttpResponseRedirect(self.get_success_url())
+
+ def form_invalid(self, form):
+ username = form.cleaned_data['username']
+ addlogmsg(username, "-", "-", "Failed Login Attempt")
+ return self.render_to_response(self.get_context_data(form=form))
def profile(request):
- """
- :param request:
- :return:
- """
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('index'))
-
- error_messages = []
- user = User.objects.get(id=request.user.id)
publickeys = UserSSHKey.objects.filter(user_id=request.user.id)
+ profile_form = ProfileForm(request.POST or None, instance=request.user)
+ ssh_key_form = UserSSHKeyForm()
- if request.method == 'POST':
- if 'username' in request.POST:
- username = request.POST.get('username', '')
- email = request.POST.get('email', '')
- user.first_name = username
- user.email = email
- user.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'oldpasswd' in request.POST:
- oldpasswd = request.POST.get('oldpasswd', '')
- password1 = request.POST.get('passwd1', '')
- password2 = request.POST.get('passwd2', '')
- if not password1 or not password2:
- error_messages.append("Passwords didn't enter")
- if password1 and password2 and password1 != password2:
- error_messages.append("Passwords don't match")
- if not user.check_password(oldpasswd):
- error_messages.append("Old password is wrong!")
- if not error_messages:
- user.set_password(password1)
- user.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'keyname' in request.POST:
- keyname = request.POST.get('keyname', '')
- keypublic = request.POST.get('keypublic', '')
- for key in publickeys:
- if keyname == key.keyname:
- msg = _("Key name already exist")
- error_messages.append(msg)
- if keypublic == key.keypublic:
- msg = _("Public key already exist")
- error_messages.append(msg)
- if not error_messages:
- addkeypublic = UserSSHKey(user_id=request.user.id, keyname=keyname, keypublic=keypublic)
- addkeypublic.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'keydelete' in request.POST:
- keyid = request.POST.get('keyid', '')
- delkeypublic = UserSSHKey.objects.get(id=keyid)
- delkeypublic.delete()
- return HttpResponseRedirect(request.get_full_path())
- return render(request, 'profile.html', locals())
+ if profile_form.is_valid():
+ profile_form.save()
+ messages.success(request, _("Profile updated"))
+ return redirect("accounts:profile")
+
+ return render(
+ request,
+ "profile.html",
+ {
+ "publickeys": publickeys,
+ "profile_form": profile_form,
+ "ssh_key_form": ssh_key_form,
+ },
+ )
-def accounts(request):
- """
- :param request:
- :return:
- """
+def ssh_key_create(request):
+ key_form = UserSSHKeyForm(request.POST or None, user=request.user)
+ if key_form.is_valid():
+ key_form.save()
+ messages.success(request, _("SSH key added"))
+ return redirect("accounts:profile")
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('index'))
-
- if not request.user.is_superuser:
- return HttpResponseRedirect(reverse('index'))
-
- error_messages = []
- users = User.objects.filter(is_staff=False, is_superuser=False)
-
- if request.method == 'POST':
- if 'create' in request.POST:
- form = UserAddForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- else:
- for msg_err in form.errors.values():
- error_messages.append(msg_err.as_text())
- if not error_messages:
- new_user = User.objects.create_user(data['name'], None, data['password'])
- new_user.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'edit' in request.POST:
- user_id = request.POST.get('user_id', '')
- user_pass = request.POST.get('user_pass', '')
- user_edit = User.objects.get(id=user_id)
- user_edit.set_password(user_pass)
- user_edit.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'block' in request.POST:
- user_id = request.POST.get('user_id', '')
- user_block = User.objects.get(id=user_id)
- user_block.is_active = False
- user_block.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'unblock' in request.POST:
- user_id = request.POST.get('user_id', '')
- user_unblock = User.objects.get(id=user_id)
- user_unblock.is_active = True
- user_unblock.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'delete' in request.POST:
- user_id = request.POST.get('user_id', '')
- try:
- del_user_inst = UserInstance.objects.filter(user_id=user_id)
- del_user_inst.delete()
- finally:
- user_delete = User.objects.get(id=user_id)
- user_delete.delete()
- return HttpResponseRedirect(request.get_full_path())
-
- return render(request, 'accounts.html', locals())
+ return render(
+ request,
+ "common/form.html",
+ {
+ "form": key_form,
+ "title": _("Add SSH key"),
+ },
+ )
+def ssh_key_delete(request, pk):
+ ssh_key = get_object_or_404(UserSSHKey, pk=pk, user=request.user)
+ if request.method == "POST":
+ ssh_key.delete()
+ messages.success(request, _("SSH key deleted"))
+ return redirect("accounts:profile")
+
+ return render(
+ request,
+ "common/confirm_delete.html",
+ {
+ "object": ssh_key,
+ "title": _("Delete SSH key"),
+ },
+ )
+
+
+@superuser_only
def account(request, user_id):
- """
- :param request:
- :return:
- """
-
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('index'))
-
- if not request.user.is_superuser:
- return HttpResponseRedirect(reverse('index'))
-
- error_messages = []
user = User.objects.get(id=user_id)
user_insts = UserInstance.objects.filter(user_id=user_id)
- instances = Instance.objects.all()
+ instances = Instance.objects.all().order_by("name")
+ publickeys = UserSSHKey.objects.filter(user_id=user_id)
- if user.username == request.user.username:
- return HttpResponseRedirect(reverse('profile'))
+ return render(
+ request,
+ "account.html",
+ {
+ "user": user,
+ "user_insts": user_insts,
+ "instances": instances,
+ "publickeys": publickeys,
+ "otp_enabled": settings.OTP_ENABLED,
+ },
+ )
- if request.method == 'POST':
- if 'delete' in request.POST:
- user_inst = request.POST.get('user_inst', '')
- del_user_inst = UserInstance.objects.get(id=user_inst)
- del_user_inst.delete()
- return HttpResponseRedirect(request.get_full_path())
- if 'permission' in request.POST:
- user_inst = request.POST.get('user_inst', '')
- inst_change = request.POST.get('inst_change', '')
- inst_delete = request.POST.get('inst_delete', '')
- edit_user_inst = UserInstance.objects.get(id=user_inst)
- edit_user_inst.is_change = bool(inst_change)
- edit_user_inst.is_delete = bool(inst_delete)
- edit_user_inst.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'add' in request.POST:
- inst_id = request.POST.get('inst_id', '')
- try:
- check_inst = UserInstance.objects.get(instance_id=int(inst_id))
- msg = _("Instance already added")
- error_messages.append(msg)
- except UserInstance.DoesNotExist:
- add_user_inst = UserInstance(instance_id=int(inst_id), user_id=user_id)
- add_user_inst.save()
- return HttpResponseRedirect(request.get_full_path())
- return render(request, 'account.html', locals())
+@permission_required("accounts.change_password", raise_exception=True)
+def change_password(request):
+ form = PasswordChangeForm(request.user, request.POST or None)
+
+ if form.is_valid():
+ user = form.save()
+ update_session_auth_hash(request, user) # Important!
+ messages.success(request, _("Password Changed"))
+ return redirect("accounts:profile")
+
+ return render(request, "accounts/change_password_form.html", {"form": form})
+
+
+@superuser_only
+def user_instance_create(request, user_id):
+ user = get_object_or_404(User, pk=user_id)
+
+ form = forms.UserInstanceForm(request.POST or None, initial={"user": user})
+ if form.is_valid():
+ form.save()
+ return redirect(reverse("accounts:account", args=[user.id]))
+
+ return render(
+ request,
+ "common/form.html",
+ {
+ "form": form,
+ "title": _("Create User Instance"),
+ },
+ )
+
+
+@superuser_only
+def user_instance_update(request, pk):
+ user_instance = get_object_or_404(UserInstance, pk=pk)
+ form = forms.UserInstanceForm(request.POST or None, instance=user_instance)
+ if form.is_valid():
+ form.save()
+ return redirect(reverse("accounts:account", args=[user_instance.user.id]))
+
+ return render(
+ request,
+ "common/form.html",
+ {
+ "form": form,
+ "title": _("Update User Instance"),
+ },
+ )
+
+
+@superuser_only
+def user_instance_delete(request, pk):
+ user_instance = get_object_or_404(UserInstance, pk=pk)
+ if request.method == "POST":
+ user = user_instance.user
+ user_instance.delete()
+ next = request.GET.get("next", None)
+ if next:
+ return redirect(next)
+ else:
+ return redirect(reverse("accounts:account", args=[user.id]))
+
+ return render(
+ request,
+ "common/confirm_delete.html",
+ {"object": user_instance},
+ )
+
+
+def email_otp(request):
+ form = EmailOTPForm(request.POST or None)
+ if form.is_valid():
+ UserModel = get_user_model()
+ try:
+ user = UserModel.objects.get(email=form.cleaned_data["email"])
+ except UserModel.DoesNotExist:
+ pass
+ else:
+ device = get_user_totp_device(user)
+ send_email_with_otp(user, device)
+
+ messages.success(
+ request, _("OTP Sent to %(email)s") % {"email": form.cleaned_data["email"]}
+ )
+ return redirect("accounts:login")
+
+ return render(
+ request,
+ "accounts/email_otp_form.html",
+ {
+ "form": form,
+ "title": _("Email OTP"),
+ },
+ )
+
+
+@superuser_only
+def admin_email_otp(request, user_id):
+ user = get_object_or_404(get_user_model(), pk=user_id)
+ device = get_user_totp_device(user)
+ if user.email != "":
+ send_email_with_otp(user, device)
+ messages.success(
+ request, _("OTP QR code was emailed to user %(user)s") % {"user": user}
+ )
+ else:
+ messages.error(request, _("User email not set, failed to send QR code"))
+ return redirect("accounts:account", user.id)
diff --git a/admin/__init__.py b/admin/__init__.py
new file mode 100644
index 0000000..052dc42
--- /dev/null
+++ b/admin/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'admin.apps.AdminConfig'
diff --git a/admin/apps.py b/admin/apps.py
new file mode 100644
index 0000000..86bb5bc
--- /dev/null
+++ b/admin/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AdminConfig(AppConfig):
+ name = "admin"
diff --git a/admin/decorators.py b/admin/decorators.py
new file mode 100644
index 0000000..ebe901f
--- /dev/null
+++ b/admin/decorators.py
@@ -0,0 +1,10 @@
+from django.core.exceptions import PermissionDenied
+
+
+def superuser_only(function):
+ def _inner(request, *args, **kwargs):
+ if not request.user.is_superuser:
+ raise PermissionDenied
+ return function(request, *args, **kwargs)
+
+ return _inner
diff --git a/admin/forms.py b/admin/forms.py
new file mode 100644
index 0000000..140e6a8
--- /dev/null
+++ b/admin/forms.py
@@ -0,0 +1,117 @@
+from django import forms
+from django.contrib.auth.forms import ReadOnlyPasswordHashField
+from django.contrib.auth.models import Group, User
+from django.urls import reverse_lazy
+from django.utils.text import format_lazy
+from django.utils.translation import gettext_lazy as _
+
+from accounts.models import UserAttributes
+
+from .models import Permission
+
+
+class GroupForm(forms.ModelForm):
+ permissions = forms.ModelMultipleChoiceField(
+ widget=forms.CheckboxSelectMultiple,
+ queryset=Permission.objects.filter(content_type__model="permissionset"),
+ required=False,
+ )
+
+ users = forms.ModelMultipleChoiceField(
+ widget=forms.CheckboxSelectMultiple,
+ queryset=User.objects.all(),
+ required=False,
+ )
+
+ def __init__(self, *args, **kwargs):
+ super(GroupForm, self).__init__(*args, **kwargs)
+ instance = getattr(self, "instance", None)
+ if instance and instance.id:
+ self.fields["users"].initial = self.instance.user_set.all()
+
+ def save_m2m(self):
+ self.instance.user_set.set(self.cleaned_data["users"])
+
+ def save(self, *args, **kwargs):
+ instance = super(GroupForm, self).save()
+ self.save_m2m()
+ return instance
+
+ class Meta:
+ model = Group
+ fields = "__all__"
+
+
+class UserForm(forms.ModelForm):
+ user_permissions = forms.ModelMultipleChoiceField(
+ widget=forms.CheckboxSelectMultiple,
+ queryset=Permission.objects.filter(content_type__model="permissionset"),
+ label=_("Permissions"),
+ required=False,
+ )
+
+ groups = forms.ModelMultipleChoiceField(
+ widget=forms.CheckboxSelectMultiple,
+ queryset=Group.objects.all(),
+ label=_("Groups"),
+ required=False,
+ )
+
+ class Meta:
+ model = User
+ fields = [
+ "username",
+ "groups",
+ "first_name",
+ "last_name",
+ "email",
+ "user_permissions",
+ "is_staff",
+ "is_active",
+ "is_superuser",
+ ]
+
+ def __init__(self, *args, **kwargs):
+ super(UserForm, self).__init__(*args, **kwargs)
+ if self.instance.id:
+ password = ReadOnlyPasswordHashField(
+ label=_("Password"),
+ help_text=format_lazy(
+ _(
+ """Raw passwords are not stored, so there is no way to see this user's password,
+ but you can change the password using this form."""
+ ),
+ reverse_lazy(
+ "admin:user_update_password",
+ args=[
+ self.instance.id,
+ ],
+ ),
+ ),
+ )
+ self.fields["Password"] = password
+
+
+class UserCreateForm(UserForm):
+ password = forms.CharField(widget=forms.PasswordInput)
+
+ class Meta:
+ model = User
+ fields = [
+ "username",
+ "password",
+ "groups",
+ "first_name",
+ "last_name",
+ "email",
+ "user_permissions",
+ "is_staff",
+ "is_active",
+ "is_superuser",
+ ]
+
+
+class UserAttributesForm(forms.ModelForm):
+ class Meta:
+ model = UserAttributes
+ exclude = ["user", "can_clone_instances"]
diff --git a/admin/migrations/0001_initial.py b/admin/migrations/0001_initial.py
new file mode 100644
index 0000000..e558854
--- /dev/null
+++ b/admin/migrations/0001_initial.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.2.12 on 2020-05-27 07:01
+
+import django.contrib.auth.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Permission',
+ fields=[
+ ],
+ options={
+ 'proxy': True,
+ 'indexes': [],
+ 'constraints': [],
+ },
+ bases=('auth.permission',),
+ managers=[
+ ('objects', django.contrib.auth.models.PermissionManager()),
+ ],
+ ),
+ ]
diff --git a/admin/migrations/0002_auto_20200609_0830.py b/admin/migrations/0002_auto_20200609_0830.py
new file mode 100644
index 0000000..012a070
--- /dev/null
+++ b/admin/migrations/0002_auto_20200609_0830.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.12 on 2020-06-09 08:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('admin', '0001_initial'),
+ ('auth', '0011_update_proxy_permissions'),
+ ]
+
+ operations = [
+ ]
diff --git a/admin/migrations/0003_create_group_technicians.py b/admin/migrations/0003_create_group_technicians.py
new file mode 100644
index 0000000..d5b1cae
--- /dev/null
+++ b/admin/migrations/0003_create_group_technicians.py
@@ -0,0 +1,15 @@
+from django.db import models, migrations
+
+def apply_migration(apps, schema_editor):
+ Group = apps.get_model('auth', 'Group')
+ Group.objects.create(name='Technicians')
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('admin', '0002_auto_20200609_0830'),
+ ]
+
+ operations = [
+ migrations.RunPython(apply_migration)
+ ]
diff --git a/create/__init__.py b/admin/migrations/__init__.py
similarity index 100%
rename from create/__init__.py
rename to admin/migrations/__init__.py
diff --git a/admin/models.py b/admin/models.py
new file mode 100644
index 0000000..67fcdf9
--- /dev/null
+++ b/admin/models.py
@@ -0,0 +1,13 @@
+from django.contrib.auth.models import Permission as P
+
+
+class Permission(P):
+ """
+ Proxy model to Django Permissions model allows us to override __str__
+ """
+
+ def __str__(self):
+ return f"{self.content_type.app_label}: {self.name}"
+
+ class Meta:
+ proxy = True
diff --git a/admin/templates/admin/group_list.html b/admin/templates/admin/group_list.html
new file mode 100644
index 0000000..3b9c95c
--- /dev/null
+++ b/admin/templates/admin/group_list.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load static %}
+{% load bootstrap_icons %}
+{% block title %}{% trans "Users" %}{% endblock %}
+{% block content %}
+/update/", views.group_update, name="group_update"),
+ path("groups//delete/", views.group_delete, name="group_delete"),
+ path("users/", views.user_list, name="user_list"),
+ path("users/create/", views.user_create, name="user_create"),
+ path("users//update_password/", views.user_update_password, name="user_update_password"),
+ path("users//update/", views.user_update, name="user_update"),
+ path("users//delete/", views.user_delete, name="user_delete"),
+ path("users//block/", views.user_block, name="user_block"),
+ path("users//unblock/", views.user_unblock, name="user_unblock"),
+ path("logs/", views.logs, name="logs"),
+]
diff --git a/admin/views.py b/admin/views.py
new file mode 100644
index 0000000..8b71baf
--- /dev/null
+++ b/admin/views.py
@@ -0,0 +1,217 @@
+from accounts.models import Instance, UserAttributes, UserInstance
+from appsettings.settings import app_settings
+from django.conf import settings
+from django.contrib import messages
+from django.contrib.auth import update_session_auth_hash
+from django.contrib.auth.forms import AdminPasswordChangeForm
+from django.contrib.auth.models import Group, User
+from django.core.paginator import Paginator
+from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.translation import gettext_lazy as _
+from logs.models import Logs
+
+from . import forms
+from .decorators import superuser_only
+
+
+@superuser_only
+def group_list(request):
+ groups = Group.objects.all()
+ return render(
+ request,
+ "admin/group_list.html",
+ {
+ "groups": groups,
+ },
+ )
+
+
+@superuser_only
+def group_create(request):
+ form = forms.GroupForm(request.POST or None)
+ if form.is_valid():
+ form.save()
+ return redirect("admin:group_list")
+
+ return render(
+ request,
+ "common/form.html",
+ {
+ "form": form,
+ "title": _("Create Group"),
+ },
+ )
+
+
+@superuser_only
+def group_update(request, pk):
+ group = get_object_or_404(Group, pk=pk)
+ form = forms.GroupForm(request.POST or None, instance=group)
+ if form.is_valid():
+ form.save()
+ return redirect("admin:group_list")
+
+ return render(
+ request,
+ "common/form.html",
+ {
+ "form": form,
+ "title": _("Update Group"),
+ },
+ )
+
+
+@superuser_only
+def group_delete(request, pk):
+ group = get_object_or_404(Group, pk=pk)
+ if request.method == "POST":
+ group.delete()
+ return redirect("admin:group_list")
+
+ return render(
+ request,
+ "common/confirm_delete.html",
+ {"object": group},
+ )
+
+
+@superuser_only
+def user_list(request):
+ users = User.objects.all()
+ return render(
+ request,
+ "admin/user_list.html",
+ {
+ "users": users,
+ "title": _("Users"),
+ },
+ )
+
+
+@superuser_only
+def user_create(request):
+ user_form = forms.UserCreateForm(request.POST or None)
+ attributes_form = forms.UserAttributesForm(request.POST or None)
+ if user_form.is_valid() and attributes_form.is_valid():
+ user = user_form.save()
+ password = user_form.cleaned_data["password"]
+ user.set_password(password)
+ user.save()
+ attributes = attributes_form.save(commit=False)
+ attributes.user = user
+ attributes.save()
+ add_default_instances(user)
+ return redirect("admin:user_list")
+
+ return render(
+ request,
+ "admin/user_form.html",
+ {
+ "user_form": user_form,
+ "attributes_form": attributes_form,
+ "title": _("Create User"),
+ },
+ )
+
+
+@superuser_only
+def user_update(request, pk):
+ user = get_object_or_404(User, pk=pk)
+ attributes, attributes_created = UserAttributes.objects.get_or_create(user=user)
+ user_form = forms.UserForm(request.POST or None, instance=user)
+ attributes_form = forms.UserAttributesForm(
+ request.POST or None, instance=attributes
+ )
+ if user_form.is_valid() and attributes_form.is_valid():
+ user_form.save()
+ attributes_form.save()
+ next = request.GET.get("next")
+ return redirect(next or "admin:user_list")
+
+ return render(
+ request,
+ "admin/user_form.html",
+ {
+ "user_form": user_form,
+ "attributes_form": attributes_form,
+ "title": _("Update User"),
+ },
+ )
+
+
+@superuser_only
+def user_update_password(request, pk):
+ user = get_object_or_404(User, pk=pk)
+ if request.method == "POST":
+ form = AdminPasswordChangeForm(user, request.POST)
+ if form.is_valid():
+ user = form.save()
+ update_session_auth_hash(request, user) # Important!
+ messages.success(
+ request, _("Password changed for %(user)s") % {"user": user.username}
+ )
+ return redirect("admin:user_list")
+ else:
+ messages.error(request, _("Wrong Data Provided"))
+ else:
+ form = AdminPasswordChangeForm(user)
+
+ return render(
+ request,
+ "accounts/change_password_form.html",
+ {
+ "form": form,
+ "user": user.username,
+ },
+ )
+
+
+@superuser_only
+def user_delete(request, pk):
+ user = get_object_or_404(User, pk=pk)
+ if request.method == "POST":
+ user.delete()
+ return redirect("admin:user_list")
+
+ return render(
+ request,
+ "common/confirm_delete.html",
+ {"object": user},
+ )
+
+
+@superuser_only
+def user_block(request, pk):
+ user: User = get_object_or_404(User, pk=pk)
+ user.is_active = False
+ user.save()
+ return redirect("admin:user_list")
+
+
+@superuser_only
+def user_unblock(request, pk):
+ user: User = get_object_or_404(User, pk=pk)
+ user.is_active = True
+ user.save()
+ return redirect("admin:user_list")
+
+
+@superuser_only
+def logs(request):
+ l = Logs.objects.order_by("-date")
+ paginator = Paginator(l, int(app_settings.LOGS_PER_PAGE))
+ page = request.GET.get("page", 1)
+ logs = paginator.page(page)
+ return render(request, "admin/logs.html", {"logs": logs})
+
+
+def add_default_instances(user):
+ """
+ Adds instances listed in NEW_USER_DEFAULT_INSTANCES to user
+ """
+ existing_instances = UserInstance.objects.filter(user=user)
+ if not existing_instances:
+ for instance_name in settings.NEW_USER_DEFAULT_INSTANCES:
+ instance = Instance.objects.get(name=instance_name)
+ user_instance = UserInstance(user=user, instance=instance)
+ user_instance.save()
diff --git a/create/migrations/__init__.py b/appsettings/__init__.py
similarity index 100%
rename from create/migrations/__init__.py
rename to appsettings/__init__.py
diff --git a/appsettings/apps.py b/appsettings/apps.py
new file mode 100644
index 0000000..2a61fca
--- /dev/null
+++ b/appsettings/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AppsettingsConfig(AppConfig):
+ name = "appsettings"
diff --git a/appsettings/context_processors.py b/appsettings/context_processors.py
new file mode 100644
index 0000000..5991630
--- /dev/null
+++ b/appsettings/context_processors.py
@@ -0,0 +1,13 @@
+from .settings import app_settings as settings
+
+
+def app_settings(request):
+ """
+ Simple context processor that puts the config into every\
+ RequestContext. Just make sure you have a setting like this::
+ TEMPLATE_CONTEXT_PROCESSORS = (
+ # ...
+ 'appsettings.context_processors.app_settings',
+ )
+ """
+ return {"app_settings": settings}
diff --git a/appsettings/middleware.py b/appsettings/middleware.py
new file mode 100644
index 0000000..737477d
--- /dev/null
+++ b/appsettings/middleware.py
@@ -0,0 +1,10 @@
+from .settings import app_settings, get_settings
+
+
+class AppSettingsMiddleware(object):
+ def __init__(self, get_response):
+ self.get_response = get_response
+
+ def __call__(self, request):
+ get_settings()
+ return self.get_response(request)
diff --git a/appsettings/migrations/0001_initial.py b/appsettings/migrations/0001_initial.py
new file mode 100644
index 0000000..bcf4376
--- /dev/null
+++ b/appsettings/migrations/0001_initial.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2.12 on 2020-05-27 16:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='AppSettings',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=25)),
+ ('key', models.CharField(db_index=True, max_length=50, unique=True)),
+ ('value', models.CharField(max_length=25)),
+ ('choices', models.CharField(max_length=70)),
+ ('description', models.CharField(max_length=100, null=True)),
+ ],
+ ),
+ ]
diff --git a/appsettings/migrations/0002_auto_20200527_1603.py b/appsettings/migrations/0002_auto_20200527_1603.py
new file mode 100644
index 0000000..f064c47
--- /dev/null
+++ b/appsettings/migrations/0002_auto_20200527_1603.py
@@ -0,0 +1,79 @@
+# Generated by Django 2.2.12 on 2020-05-23 12:05
+
+from django.db import migrations
+from django.utils.translation import gettext_lazy as _
+
+
+def add_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).bulk_create([
+ setting(1, _("Theme"), "BOOTSTRAP_THEME", "flaty", "", _("Bootstrap CSS & Bootswatch Theme")),
+ setting(2, _("Theme SASS Path"), "SASS_DIR", "dev/scss/", "", _("Bootstrap SASS & Bootswatch SASS Directory")),
+ setting(3, _("All Instances View Style"), "VIEW_INSTANCES_LIST_STYLE", "grouped", "grouped,nongrouped", _("All instances list style")),
+ setting(4, _("Logs per Page"), "LOGS_PER_PAGE", "100", "", _("Pagination for logs")),
+ setting(5, _("Multiple Owner for VM"), "ALLOW_INSTANCE_MULTIPLE_OWNER", "True", "True,False", _("Allow to have multiple owner for instance")),
+ setting(6, _("Quota Debug"), "QUOTA_DEBUG", "True", "True,False", _("Debug for user quotas")),
+ setting(7, _("Disk Format"), "INSTANCE_VOLUME_DEFAULT_FORMAT", "qcow2", "raw,qcow,qcow2", _("Instance disk format")),
+ setting(8, _("Disk Bus"), "INSTANCE_VOLUME_DEFAULT_BUS", "virtio", "virtio,scsi,ide,usb,sata", _("Instance disk bus type")),
+ setting(9, _("Disk SCSI Controller"), "INSTANCE_VOLUME_DEFAULT_SCSI_CONTROLLER", "virtio-scsi", "virtio-scsi, lsilogic, virtio-blk", _("SCSI controller type")),
+ setting(10, _("Disk Cache"), "INSTANCE_VOLUME_DEFAULT_CACHE", "directsync", "default,directsync,none,unsafe,writeback,writethrough", _("Disk volume cache type")),
+ setting(11, _("Disk IO Type"), "INSTANCE_VOLUME_DEFAULT_IO", "default", "default,native,threads", _("Volume io modes")),
+ setting(12, _("Disk Detect Zeroes"), "INSTANCE_VOLUME_DEFAULT_DETECT_ZEROES", "default", "default,on,off,unmap", _("Volume detect zeroes mode")),
+ setting(13, _("Disk Discard"), "INSTANCE_VOLUME_DEFAULT_DISCARD", "default", "default,unmap,ignore", _("Volume discard mode")),
+ setting(14, _("Disk Owner UID"), "INSTANCE_VOLUME_DEFAULT_OWNER_UID", "0", "", _("Owner UID: up to os, 0=root, 107=qemu or libvirt-bin(for ubuntu)")),
+ setting(15, _("Disk Owner GID"), "INSTANCE_VOLUME_DEFAULT_OWNER_GID", "0", "", _("Owner GID: up to os, 0=root, 107=qemu or libvirt-bin(for ubuntu)")),
+ setting(16, _("VM CPU Mode"), "INSTANCE_CPU_DEFAULT_MODE", "host-model", "no-model,host-model,host-passthrough,custom", _("Cpu modes")),
+ setting(17, _("VM Machine Type"), "INSTANCE_MACHINE_DEFAULT_TYPE", "q35", "q35,x86_64", _("Chipset/Machine type")),
+ setting(18, _("VM Firmware Type"), "INSTANCE_FIRMWARE_DEFAULT_TYPE", "BIOS", "BIOS,UEFI", _("Firmware type for x86_64")),
+ setting(19, _("VM Architecture Type"), "INSTANCE_ARCH_DEFAULT_TYPE", "x86_64", "x86_64,i686", _("Architecture type: x86_64, i686, etc")),
+ setting(20, _("VM Console Type"), "QEMU_CONSOLE_DEFAULT_TYPE", "vnc", "vnc,spice", _("Default console type")),
+ setting(21, _("VM Clone Name Prefix"), "CLONE_INSTANCE_DEFAULT_PREFIX", "instance", "True,False", _("Prefix for cloned instance name")),
+ setting(22, _("VM Clone Auto Name"), "CLONE_INSTANCE_AUTO_NAME", "False", "True,False", _("Generated name for cloned instance")),
+ setting(23, _("VM Clone Auto Migrate"), "CLONE_INSTANCE_AUTO_MIGRATE", "False", "True,False", _("Auto migrate instance after clone")),
+ setting(24, _("VM Bottom Bar"), "VIEW_INSTANCE_DETAIL_BOTTOM_BAR", "True", "True,False", _("Bottom navbar for instance details")),
+ setting(25, _("Show Access Root Pass"), "SHOW_ACCESS_ROOT_PASSWORD", "False", "True,False", _("Show access root password")),
+ setting(26, _("Show Access SSH Keys"), "SHOW_ACCESS_SSH_KEYS", "False", "True,False", _("Show access ssh keys")),
+ ])
+
+
+def del_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).filter(key="QEMU_CONSOLE_DEFAULT_TYPE").delete()
+ setting.objects.using(db_alias).filter(key="ALLOW_INSTANCE_MULTIPLE_OWNER").delete()
+ setting.objects.using(db_alias).filter(key="CLONE_INSTANCE_DEFAULT_PREFIX").delete()
+ setting.objects.using(db_alias).filter(key="CLONE_INSTANCE_AUTO_NAME").delete()
+ setting.objects.using(db_alias).filter(key="CLONE_INSTANCE_AUTO_MIGRATE").delete()
+ setting.objects.using(db_alias).filter(key="LOGS_PER_PAGE").delete()
+ setting.objects.using(db_alias).filter(key="QUOTA_DEBUG").delete()
+ setting.objects.using(db_alias).filter(key="VIEW_INSTANCES_LIST_STYLE").delete()
+ setting.objects.using(db_alias).filter(key="VIEW_INSTANCE_DETAIL_BOTTOM_BAR").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_FORMAT").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_BUS").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_SCSI_CONTROLLER").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_CACHE").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_IO").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_DETECT_ZEROES").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_DISCARD").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_OWNER_UID").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VOLUME_DEFAULT_OWNER_GID").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_CPU_DEFAULT_MODE").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_MACHINE_DEFAULT_TYPE").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_FIRMWARE_DEFAULT_TYPE").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_ARCH_DEFAULT_TYPE").delete()
+ setting.objects.using(db_alias).filter(key="BOOTSTRAP_THEME").delete()
+ setting.objects.using(db_alias).filter(key="SASS_DIR").delete()
+ setting.objects.using(db_alias).filter(key="SHOW_ACCESS_ROOT_PASSWORD").delete()
+ setting.objects.using(db_alias).filter(key="SHOW_ACCESS_SSH_KEYS").delete()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RunPython(add_default_settings, del_default_settings),
+ ]
diff --git a/appsettings/migrations/0003_auto_20200615_0637.py b/appsettings/migrations/0003_auto_20200615_0637.py
new file mode 100644
index 0000000..914e031
--- /dev/null
+++ b/appsettings/migrations/0003_auto_20200615_0637.py
@@ -0,0 +1,38 @@
+# Generated by Django 2.2.13 on 2020-06-15 06:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0002_auto_20200527_1603'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='appsettings',
+ name='choices',
+ field=models.CharField(max_length=70, verbose_name='choices'),
+ ),
+ migrations.AlterField(
+ model_name='appsettings',
+ name='description',
+ field=models.CharField(max_length=100, null=True, verbose_name='description'),
+ ),
+ migrations.AlterField(
+ model_name='appsettings',
+ name='key',
+ field=models.CharField(db_index=True, max_length=50, unique=True, verbose_name='key'),
+ ),
+ migrations.AlterField(
+ model_name='appsettings',
+ name='name',
+ field=models.CharField(max_length=25, verbose_name='name'),
+ ),
+ migrations.AlterField(
+ model_name='appsettings',
+ name='value',
+ field=models.CharField(max_length=25, verbose_name='value'),
+ ),
+ ]
diff --git a/appsettings/migrations/0004_auto_20200716_0637.py b/appsettings/migrations/0004_auto_20200716_0637.py
new file mode 100644
index 0000000..5593e83
--- /dev/null
+++ b/appsettings/migrations/0004_auto_20200716_0637.py
@@ -0,0 +1,35 @@
+# Generated by Django 2.2.13 on 2020-07-16 06:37
+
+from django.db import migrations
+from django.utils.translation import gettext_lazy as _
+
+
+def add_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).bulk_create([
+ setting(27, _("Console Scale"), "CONSOLE_SCALE", "False", "True,False", _("Allow console to scaling view")),
+ setting(28, _("Console View-Only"), "CONSOLE_VIEW_ONLY", "False", "True,False", _("Allow only view not modify")),
+ setting(29, _("Console Resize Session"), "CONSOLE_RESIZE_SESSION", "False", "True,False", _("Allow to resize session for console")),
+ setting(30, _("Console Clip Viewport"), "CONSOLE_CLIP_VIEWPORT", "False", "True,False", _("Clip console viewport")),
+ ])
+
+
+def del_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).filter(key="CONSOLE_SCALE").delete()
+ setting.objects.using(db_alias).filter(key="CONSOLE_VIEW_ONLY").delete()
+ setting.objects.using(db_alias).filter(key="CONSOLE_RESIZE_SESSION").delete()
+ setting.objects.using(db_alias).filter(key="CONSOLE_CLIP_VIEWPORT").delete()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0003_auto_20200615_0637'),
+ ]
+
+ operations = [
+ migrations.RunPython(add_default_settings, del_default_settings),
+ ]
diff --git a/appsettings/migrations/0005_auto_20200911_1233.py b/appsettings/migrations/0005_auto_20200911_1233.py
new file mode 100644
index 0000000..ac57da7
--- /dev/null
+++ b/appsettings/migrations/0005_auto_20200911_1233.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.14 on 2020-09-11 12:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0004_auto_20200716_0637'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='appsettings',
+ name='choices',
+ field=models.CharField(max_length=70, verbose_name='choices'),
+ ),
+ ]
diff --git a/appsettings/migrations/0006_auto_20220630_0717.py b/appsettings/migrations/0006_auto_20220630_0717.py
new file mode 100644
index 0000000..9ffc860
--- /dev/null
+++ b/appsettings/migrations/0006_auto_20220630_0717.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.2.13 on 2022-06-30 07:17
+
+from django.db import migrations
+from django.utils.translation import gettext_lazy as _
+
+def add_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).bulk_create([
+ setting(31, _("VM DRBD Status"), "VM_DRBD_STATUS", "False", "True,False", _("Show VM DRBD Status")),
+ ])
+
+
+def del_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).filter(key="VM_DRBD_STATUS").delete()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0005_auto_20200911_1233'),
+ ]
+
+ operations = [
+ migrations.RunPython(add_default_settings, del_default_settings),
+ ]
diff --git a/appsettings/migrations/0007_auto_20220905_0918.py b/appsettings/migrations/0007_auto_20220905_0918.py
new file mode 100644
index 0000000..229e1cb
--- /dev/null
+++ b/appsettings/migrations/0007_auto_20220905_0918.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.2.13 on 2022-06-30 07:17
+
+from django.db import migrations
+from django.utils.translation import gettext_lazy as _
+
+def update_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).filter(key="INSTANCE_MACHINE_DEFAULT_TYPE").update(choices="q35,x86_64,virt"),
+ setting.objects.using(db_alias).filter(key="INSTANCE_ARCH_DEFAULT_TYPE").update(choices="x86_64,i686,aarch64"),
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0006_auto_20220630_0717'),
+ ]
+
+ operations = [
+ migrations.RunPython(update_default_settings, None)
+ ]
diff --git a/appsettings/migrations/0008_auto_20220905_1459.py b/appsettings/migrations/0008_auto_20220905_1459.py
new file mode 100644
index 0000000..2390d5d
--- /dev/null
+++ b/appsettings/migrations/0008_auto_20220905_1459.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.13 on 2022-06-30 07:17
+
+from django.db import migrations
+from django.utils.translation import gettext_lazy as _
+
+def add_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).bulk_create([
+ setting(32, _("VM CD-ROM Device"), "INSTANCE_CDROM_ADD", "sata", "None,ide,sata,scsi,virtio", _("Add or not cdrom device while instance creating")),
+ setting(33, _("VM Video Type"), "INSTANCE_VIDEO_DEFAULT_TYPE", "vga", "None,virtio,vga,cirrus,vmvga,bochs,ramfb", _("Change instance default video type")),
+ setting(34, _("VM Input Device"), "INSTANCE_INPUT_DEFAULT_DEVICE", "default", "None,default,virtio,usb", _("Add or not input device with specify its type")),
+ ])
+
+
+def del_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).filter(key="INSTANCE_CDROM_ADD").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_VIDEO_DEFAULT_TYPE").delete()
+ setting.objects.using(db_alias).filter(key="INSTANCE_INPUT_DEFAULT_DEVICE").delete()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0007_auto_20220905_0918'),
+ ]
+
+ operations = [
+ migrations.RunPython(add_default_settings, del_default_settings),
+ ]
diff --git a/appsettings/migrations/0009_alter_appsettings_id.py b/appsettings/migrations/0009_alter_appsettings_id.py
new file mode 100644
index 0000000..5e588dc
--- /dev/null
+++ b/appsettings/migrations/0009_alter_appsettings_id.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-30 17:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0008_auto_20220905_1459'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='appsettings',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ ]
diff --git a/appsettings/migrations/0010_auto_20231030_1305.py b/appsettings/migrations/0010_auto_20231030_1305.py
new file mode 100644
index 0000000..606909d
--- /dev/null
+++ b/appsettings/migrations/0010_auto_20231030_1305.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.5 on 2023-10-30 17:05
+
+from django.db import migrations
+from django.utils.translation import gettext_lazy as _
+
+def add_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).bulk_create([
+ setting(35, _("VM NIC Type"), "INSTANCE_NIC_DEFAULT_TYPE", "default", "default,e1000,e1000e,rt18139,virtio", _("Change instance default NIC type"))
+ ])
+
+
+def del_default_settings(apps, schema_editor):
+ setting = apps.get_model("appsettings", "AppSettings")
+ db_alias = schema_editor.connection.alias
+ setting.objects.using(db_alias).filter(key="INSTANCE_NIC_DEFAULT_TYPE").delete()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('appsettings', '0009_alter_appsettings_id')
+ ]
+
+ operations = [
+ migrations.RunPython(add_default_settings,del_default_settings)
+ ]
diff --git a/appsettings/migrations/0011_alter_appsettings_id.py b/appsettings/migrations/0011_alter_appsettings_id.py
new file mode 100644
index 0000000..dfbfe60
--- /dev/null
+++ b/appsettings/migrations/0011_alter_appsettings_id.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.10 on 2024-02-14 11:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("appsettings", "0010_auto_20231030_1305"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="appsettings",
+ name="id",
+ field=models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+ ),
+ ),
+ ]
diff --git a/instances/templatetags/__init__.py b/appsettings/migrations/__init__.py
similarity index 100%
rename from instances/templatetags/__init__.py
rename to appsettings/migrations/__init__.py
diff --git a/appsettings/models.py b/appsettings/models.py
new file mode 100644
index 0000000..0cfb4e7
--- /dev/null
+++ b/appsettings/models.py
@@ -0,0 +1,13 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+
+class AppSettings(models.Model):
+ def choices_as_list(self):
+ return self.choices.split(",")
+
+ name = models.CharField(_("name"), max_length=25, null=False)
+ key = models.CharField(_("key"), db_index=True, max_length=50, unique=True)
+ value = models.CharField(_("value"), max_length=25)
+ choices = models.CharField(_("choices"), max_length=70)
+ description = models.CharField(_("description"), max_length=100, null=True)
diff --git a/appsettings/settings.py b/appsettings/settings.py
new file mode 100644
index 0000000..d575f37
--- /dev/null
+++ b/appsettings/settings.py
@@ -0,0 +1,18 @@
+from .models import AppSettings
+
+
+class Settings:
+ pass
+
+
+app_settings = Settings()
+
+
+def get_settings():
+ try:
+ entries = AppSettings.objects.all()
+ except:
+ pass
+
+ for entry in entries:
+ setattr(app_settings, entry.key, entry.value)
diff --git a/appsettings/templates/appsettings.html b/appsettings/templates/appsettings.html
new file mode 100644
index 0000000..4a684b5
--- /dev/null
+++ b/appsettings/templates/appsettings.html
@@ -0,0 +1,74 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Edit Settings" %}{% endblock title %}
+
+{% block page_heading %}{% trans "Edit Settings" %}{% endblock page_heading %}
+
+{% block content %}
+
+{% endblock %}
+{% block script %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/computes/templates/computes/list.html b/computes/templates/computes/list.html
new file mode 100644
index 0000000..3a5f171
--- /dev/null
+++ b/computes/templates/computes/list.html
@@ -0,0 +1,68 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load static %}
+{% load common_tags %}
+{% load bootstrap_icons %}
+{% block title %}{% trans "Computes" %}{% endblock %}
+{% block content %}
+
-
{% endblock %}
\ No newline at end of file
diff --git a/accounts/templatetags/tags_fingerprint.py b/accounts/templatetags/tags_fingerprint.py
index d15c473..83cfe14 100644
--- a/accounts/templatetags/tags_fingerprint.py
+++ b/accounts/templatetags/tags_fingerprint.py
@@ -1,12 +1,16 @@
-from django import template
import base64
import hashlib
+from django import template
+
register = template.Library()
@register.simple_tag
def ssh_to_fingerprint(line):
- key = base64.b64decode(line.strip().split()[1].encode('ascii'))
- fp_plain = hashlib.md5(key).hexdigest()
- return ':'.join(a+b for a, b in zip(fp_plain[::2], fp_plain[1::2]))
+ try:
+ key = base64.b64decode(line.strip().split()[1].encode('ascii'))
+ fp_plain = hashlib.md5(key).hexdigest()
+ return ':'.join(a + b for a, b in zip(fp_plain[::2], fp_plain[1::2]))
+ except Exception:
+ return 'Invalid key'
diff --git a/accounts/tests.py b/accounts/tests.py
index 7ce503c..3b7ed6b 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -1,3 +1,308 @@
-from django.test import TestCase
+from appsettings.settings import app_settings
+from computes.models import Compute
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Permission
+from django.shortcuts import reverse
+from django.test import Client, TestCase
+from instances.models import Instance
+from instances.utils import refr
+from libvirt import VIR_DOMAIN_UNDEFINE_NVRAM
+from vrtManager.create import wvmCreate
-# Create your tests here.
+from accounts.forms import UserInstanceForm, UserSSHKeyForm
+from accounts.models import UserInstance, UserSSHKey
+from accounts.utils import validate_ssh_key
+
+
+class AccountsTestCase(TestCase):
+ @classmethod
+ def setUpClass(cls):
+ super().setUpClass()
+
+ # Add users for testing purposes
+ User = get_user_model()
+ cls.admin_user = User.objects.get(pk=1)
+ cls.test_user = User.objects.create_user(username="test", password="test")
+
+ # Add localhost compute
+ cls.compute = Compute(
+ name="test-compute",
+ hostname="localhost",
+ login="",
+ password="",
+ details="local",
+ type=4,
+ )
+ cls.compute.save()
+
+ cls.connection = wvmCreate(
+ cls.compute.hostname,
+ cls.compute.login,
+ cls.compute.password,
+ cls.compute.type,
+ )
+
+ # Add disks for testing
+ cls.connection.create_volume(
+ "default",
+ "test-volume",
+ 1,
+ "qcow2",
+ False,
+ 0,
+ 0,
+ )
+
+ # XML for testing vm
+ with open("conf/test-vm.xml", "r") as f:
+ cls.xml = f.read()
+
+ # Create testing vm from XML
+ cls.connection._defineXML(cls.xml)
+ refr(cls.compute)
+ cls.instance = Instance.objects.get(pk=1)
+
+ @classmethod
+ def tearDownClass(cls):
+ # Destroy testing vm
+ cls.instance.proxy.delete_all_disks()
+ cls.instance.proxy.delete(VIR_DOMAIN_UNDEFINE_NVRAM)
+ super().tearDownClass()
+
+ def setUp(self):
+ self.client.login(username="admin", password="admin")
+ permission = Permission.objects.get(codename="change_password")
+ self.test_user.user_permissions.add(permission)
+ self.rsa_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC6OOdbfv27QVnSC6sKxGaHb6YFc+3gxCkyVR3cTSXE/n5BEGf8aOgBpepULWa1RZfxYHY14PlKULDygdXSdrrR2kNSwoKz/Oo4d+3EE92L7ocl1+djZbptzgWgtw1OseLwbFik+iKlIdqPsH+IUQvX7yV545ZQtAP8Qj1R+uCqkw== test@test"
+ self.ecdsa_key = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJc5xpT3R0iFJYNZbmWgAiDlHquX/BcV1kVTsnBfiMsZgU3lGaqz2eb7IBcir/dxGnsVENTTmPQ6sNcxLxT9kkQ= realgecko@archlinux"
+
+ def test_profile(self):
+ response = self.client.get(reverse("accounts:profile"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.get(
+ reverse("accounts:account", args=[self.test_user.id])
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_account_with_otp(self):
+ settings.OTP_ENABLED = True
+ response = self.client.get(
+ reverse("accounts:account", args=[self.test_user.id])
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_login_logout(self):
+ client = Client()
+
+ response = client.post(
+ reverse("accounts:login"), {"username": "test", "password": "test"}
+ )
+ self.assertRedirects(response, reverse("accounts:profile"))
+
+ response = client.get(reverse("accounts:logout"))
+ self.assertRedirects(response, reverse("accounts:login"))
+
+ def test_change_password(self):
+ self.client.force_login(self.test_user)
+
+ response = self.client.get(reverse("accounts:change_password"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("accounts:change_password"),
+ {
+ "old_password": "wrongpass",
+ "new_password1": "newpw",
+ "new_password2": "newpw",
+ },
+ )
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("accounts:change_password"),
+ {
+ "old_password": "test",
+ "new_password1": "newpw",
+ "new_password2": "newpw",
+ },
+ )
+ self.assertRedirects(response, reverse("accounts:profile"))
+
+ self.client.logout()
+
+ logged_in = self.client.login(username="test", password="newpw")
+ self.assertTrue(logged_in)
+
+ def test_user_instance_create_update_delete(self):
+ # create
+ response = self.client.get(
+ reverse("accounts:user_instance_create", args=[self.test_user.id])
+ )
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("accounts:user_instance_create", args=[self.test_user.id]),
+ {
+ "user": self.test_user.id,
+ "instance": self.instance.id,
+ "is_change": False,
+ "is_delete": False,
+ "is_vnc": False,
+ },
+ )
+ self.assertRedirects(
+ response, reverse("accounts:account", args=[self.test_user.id])
+ )
+
+ user_instance: UserInstance = UserInstance.objects.get(pk=1)
+ self.assertEqual(user_instance.user, self.test_user)
+ self.assertEqual(user_instance.instance, self.instance)
+ self.assertEqual(user_instance.is_change, False)
+ self.assertEqual(user_instance.is_delete, False)
+ self.assertEqual(user_instance.is_vnc, False)
+
+ # update
+ response = self.client.get(
+ reverse("accounts:user_instance_update", args=[user_instance.id])
+ )
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("accounts:user_instance_update", args=[user_instance.id]),
+ {
+ "user": self.test_user.id,
+ "instance": self.instance.id,
+ "is_change": True,
+ "is_delete": True,
+ "is_vnc": True,
+ },
+ )
+ self.assertRedirects(
+ response, reverse("accounts:account", args=[self.test_user.id])
+ )
+
+ user_instance: UserInstance = UserInstance.objects.get(pk=1)
+ self.assertEqual(user_instance.user, self.test_user)
+ self.assertEqual(user_instance.instance, self.instance)
+ self.assertEqual(user_instance.is_change, True)
+ self.assertEqual(user_instance.is_delete, True)
+ self.assertEqual(user_instance.is_vnc, True)
+
+ # delete
+ response = self.client.get(
+ reverse("accounts:user_instance_delete", args=[user_instance.id])
+ )
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("accounts:user_instance_delete", args=[user_instance.id])
+ )
+ self.assertRedirects(
+ response, reverse("accounts:account", args=[self.test_user.id])
+ )
+
+ # test 'next' redirect during deletion
+ user_instance = UserInstance.objects.create(
+ user=self.test_user, instance=self.instance
+ )
+ response = self.client.post(
+ reverse("accounts:user_instance_delete", args=[user_instance.id])
+ + "?next="
+ + reverse("index")
+ )
+ self.assertRedirects(response, reverse("index"))
+
+ def test_update_user_profile(self):
+ self.client.force_login(self.test_user)
+
+ user = get_user_model().objects.get(username="test")
+ self.assertEqual(user.first_name, "")
+ self.assertEqual(user.last_name, "")
+ self.assertEqual(user.email, "")
+
+ response = self.client.post(
+ reverse("accounts:profile"),
+ {
+ "first_name": "first name",
+ "last_name": "last name",
+ "email": "email@mail.mail",
+ },
+ )
+ self.assertRedirects(response, reverse("accounts:profile"))
+
+ user = get_user_model().objects.get(username="test")
+ self.assertEqual(user.first_name, "first name")
+ self.assertEqual(user.last_name, "last name")
+ self.assertEqual(user.email, "email@mail.mail")
+
+ def test_create_delete_ssh_key(self):
+ response = self.client.get(reverse("accounts:ssh_key_create"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("accounts:ssh_key_create"),
+ {
+ "keyname": "keyname",
+ "keypublic": self.rsa_key,
+ },
+ )
+ self.assertRedirects(response, reverse("accounts:profile"))
+
+ key = UserSSHKey.objects.get(pk=1)
+ self.assertEqual(key.keyname, "keyname")
+ self.assertEqual(key.keypublic, self.rsa_key)
+
+ response = self.client.get(reverse("accounts:ssh_key_delete", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("accounts:ssh_key_delete", args=[1]))
+ self.assertRedirects(response, reverse("accounts:profile"))
+
+ def test_validate_ssh_key(self):
+ self.assertFalse(validate_ssh_key(""))
+ self.assertFalse(validate_ssh_key("ssh-rsa ABBA test@test"))
+ self.assertFalse(validate_ssh_key("ssh-rsa AAAABwdzZGY= test@test"))
+ self.assertFalse(validate_ssh_key("ssh-rsa AAA test@test"))
+ # validate ecdsa key
+ self.assertTrue(validate_ssh_key(self.ecdsa_key))
+
+ def test_forms(self):
+ # raise available validation errors for maximum coverage
+ form = UserSSHKeyForm(
+ {"keyname": "keyname", "keypublic": self.rsa_key}, user=self.test_user
+ )
+ form.save()
+
+ form = UserSSHKeyForm(
+ {"keyname": "keyname", "keypublic": self.rsa_key}, user=self.test_user
+ )
+ self.assertFalse(form.is_valid())
+
+ form = UserSSHKeyForm(
+ {"keyname": "keyname", "keypublic": "invalid key"}, user=self.test_user
+ )
+ self.assertFalse(form.is_valid())
+
+ app_settings.ALLOW_INSTANCE_MULTIPLE_OWNER = "False"
+ form = UserInstanceForm(
+ {
+ "user": self.admin_user.id,
+ "instance": self.instance.id,
+ "is_change": False,
+ "is_delete": False,
+ "is_vnc": False,
+ }
+ )
+ form.save()
+ form = UserInstanceForm(
+ {
+ "user": self.test_user.id,
+ "instance": self.instance.id,
+ "is_change": False,
+ "is_delete": False,
+ "is_vnc": False,
+ }
+ )
+ self.assertFalse(form.is_valid())
diff --git a/accounts/urls.py b/accounts/urls.py
index f8c4a41..211b057 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -1,12 +1,55 @@
-from django.conf.urls import url
+from django.conf import settings
+from django.contrib.auth.views import LoginView, LogoutView
+from django.urls import path
+from django_otp.forms import OTPAuthenticationForm
+
from . import views
+from .views import CustomLoginView
+
+app_name = "accounts"
urlpatterns = [
- url(r'^login/$', 'django.contrib.auth.views.login',
- {'template_name': 'login.html'}, name='login'),
- url(r'^logout/$', 'django.contrib.auth.views.logout',
- {'template_name': 'logout.html'}, name='logout'),
- url(r'^profile/$', views.profile, name='profile'),
- url(r'^$', views.accounts, name='accounts'),
- url(r'^profile/(?P{% trans "Edit Profile" %}
- -{% trans "Edit Password" %}
- -{% trans "SSH Keys" %}
- {% if publickeys %} -
-
+
+
-
-
- {% for key in publickeys %}
-
-
- | {{ key.keyname }} ({% ssh_to_fingerprint key.keypublic %}) | -- - | -
+
+
+
+
+
+
+
-
+
+
+
+
+ {% if publickeys %}
+
+
+
+ {% endif %}
+
+
+
+ {% for key in publickeys %}
+
+
+ | {{ key.keyname }} ({% ssh_to_fingerprint key.keypublic %}) | ++ + {% bs_icon 'trash' %} + + | +
+
+
+ {%trans "Add SSH Key" %}
+
+
+
+
+
+
+
+
+ {% bs_icon 'plus-circle-fill' %}
+
+ {% include 'search_block.html' %}
+
+{% trans "Groups" %}
+
+ {% if not groups %}
+
+{% endblock content %}
+
+{% block script %}
+
+{% endblock script %}
diff --git a/admin/templates/admin/logs.html b/admin/templates/admin/logs.html
new file mode 100644
index 0000000..74fc05b
--- /dev/null
+++ b/admin/templates/admin/logs.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load django_bootstrap5 %}
+{% load bootstrap_icons %}
+
+{% block title %}{% trans "Logs" %}{% endblock %}
+
+{% block page_heading %}{% trans "Logs" %}{% endblock page_heading %}
+
+{% block page_heading_extra %}
+ {% include 'search_block.html' %}
+{% endblock page_heading_extra %}
+
+
+
+{% block content %}
+
+
+ {% else %}
+
+ {% bs_icon 'exclamation-triangle '%} {% trans "Warning" %}: {% trans "You don't have any groups" %}
+
+
+
+
+
+
+ {% endif %}
+| {% trans "Group Name" %} | +{% trans "Actions" %} | +
|---|---|
| + {{ group.name }} + | ++ + | +
+
+{% endblock %}
+{% block script %}
+
+{% endblock script %}
diff --git a/admin/templates/admin/user_form.html b/admin/templates/admin/user_form.html
new file mode 100644
index 0000000..47d6b2c
--- /dev/null
+++ b/admin/templates/admin/user_form.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% load django_bootstrap5 %}
+{% load bootstrap_icons %}
+{% load i18n %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block page_heading %}{{ title }}{% endblock page_heading %}
+
+{% block content %}
+
+ {% if not logs %}
+
+
+
+ {% else %}
+
+ {% bs_icon 'exclamation-triangle'%} {% trans "Warning" %}: {% trans "You don't have any Logs" %}
+
+
+
+
+
+
+ {% bootstrap_pagination logs %}
+ {% endif %}
+ | # | +{% trans "Date" %} | +{% trans "User" %} | +{% trans "Host" %} | +{% trans "Instance" %} | +{% trans "Message" %} | +
|---|---|---|---|---|---|
| {{ log.id }} | +{{ log.date|date:"M d H:i:s" }} | +{{ log.user }} | +{{ log.host }} | +{{ log.instance }} | +{{ log.message }} | +
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/admin/templates/admin/user_list.html b/admin/templates/admin/user_list.html
new file mode 100644
index 0000000..f0e0b27
--- /dev/null
+++ b/admin/templates/admin/user_list.html
@@ -0,0 +1,81 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load static %}
+{% load common_tags %}
+{% load bootstrap_icons %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block page_heading %}{{ title }}{% endblock page_heading %}
+
+{% block page_heading_extra %}
+
+ {% bs_icon 'plus-circle-fill' %}
+
+{% include 'search_block.html' %}
+{% endblock page_heading_extra %}
+
+{% block content %}
+
+ {% if not users %}
+
+{% endblock content %}
+
+{% block script %}
+
+{% endblock script %}
diff --git a/admin/tests.py b/admin/tests.py
new file mode 100644
index 0000000..92d261c
--- /dev/null
+++ b/admin/tests.py
@@ -0,0 +1,124 @@
+from django.contrib.auth.models import Group, User
+from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import reverse
+from django.test import TestCase
+
+from accounts.models import UserAttributes
+
+
+class AdminTestCase(TestCase):
+ def setUp(self):
+ self.client.login(username="admin", password="admin")
+
+ def test_group_list(self):
+ response = self.client.get(reverse("admin:group_list"))
+ self.assertEqual(response.status_code, 200)
+
+ def test_groups(self):
+ response = self.client.get(reverse("admin:group_create"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("admin:group_create"), {"name": "Test Group"}
+ )
+ self.assertRedirects(response, reverse("admin:group_list"))
+
+ group = Group.objects.get(name="Test Group")
+ self.assertEqual(group.id, 1)
+
+ response = self.client.get(reverse("admin:group_update", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("admin:group_update", args=[1]), {"name": "Updated Group Test"}
+ )
+ self.assertRedirects(response, reverse("admin:group_list"))
+
+ group = Group.objects.get(id=1)
+ self.assertEqual(group.name, "Updated Group Test")
+
+ response = self.client.get(reverse("admin:group_delete", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("admin:group_delete", args=[1]))
+ self.assertRedirects(response, reverse("admin:group_list"))
+
+ with self.assertRaises(ObjectDoesNotExist):
+ Group.objects.get(id=1)
+
+ def test_user_list(self):
+ response = self.client.get(reverse("admin:user_list"))
+ self.assertEqual(response.status_code, 200)
+
+ def test_users(self):
+ response = self.client.get(reverse("admin:user_create"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("admin:user_create"),
+ {
+ "username": "test",
+ "password": "test",
+ "max_instances": 1,
+ "max_cpus": 1,
+ "max_memory": 1024,
+ "max_disk_size": 4,
+ },
+ )
+ self.assertRedirects(response, reverse("admin:user_list"))
+
+ user = User.objects.get(username="test")
+ self.assertEqual(user.id, 2)
+
+ ua: UserAttributes = UserAttributes.objects.get(id=2)
+ self.assertEqual(ua.user_id, 2)
+ self.assertEqual(ua.max_instances, 1)
+ self.assertEqual(ua.max_cpus, 1)
+ self.assertEqual(ua.max_memory, 1024)
+ self.assertEqual(ua.max_disk_size, 4)
+
+ response = self.client.get(reverse("admin:user_update", args=[2]))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("admin:user_update", args=[2]),
+ {
+ "username": "utest",
+ "max_instances": 2,
+ "max_cpus": 2,
+ "max_memory": 2048,
+ "max_disk_size": 8,
+ },
+ )
+ self.assertRedirects(response, reverse("admin:user_list"))
+
+ user = User.objects.get(id=2)
+ self.assertEqual(user.username, "utest")
+
+ ua: UserAttributes = UserAttributes.objects.get(id=2)
+ self.assertEqual(ua.user_id, 2)
+ self.assertEqual(ua.max_instances, 2)
+ self.assertEqual(ua.max_cpus, 2)
+ self.assertEqual(ua.max_memory, 2048)
+ self.assertEqual(ua.max_disk_size, 8)
+
+ response = self.client.get(reverse("admin:user_block", args=[2]))
+ user = User.objects.get(id=2)
+ self.assertFalse(user.is_active)
+
+ response = self.client.get(reverse("admin:user_unblock", args=[2]))
+ user = User.objects.get(id=2)
+ self.assertTrue(user.is_active)
+
+ response = self.client.get(reverse("admin:user_delete", args=[2]))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("admin:user_delete", args=[2]))
+ self.assertRedirects(response, reverse("admin:user_list"))
+
+ with self.assertRaises(ObjectDoesNotExist):
+ User.objects.get(id=2)
+
+ def test_logs(self):
+ response = self.client.get(reverse("admin:logs"))
+ self.assertEqual(response.status_code, 200)
diff --git a/admin/urls.py b/admin/urls.py
new file mode 100644
index 0000000..0b5ab41
--- /dev/null
+++ b/admin/urls.py
@@ -0,0 +1,18 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+ path("groups/", views.group_list, name="group_list"),
+ path("groups/create/", views.group_create, name="group_create"),
+ path("groups/
+
+ {% else %}
+
+ {% bs_icon 'exclamation-triangle '%} {% trans "Warning" %}: {% trans "You don't have any user" %}
+
+
+
+
+
+
+ {% endif %}
+| {% trans "Username" %} | +{% trans "Status" %} | +{% trans "Last Login" %} | +{% trans "Staff" %} | +{% trans "Superuser" %} | +{% trans "Can Clone" %} | +{% trans "Actions" %} | +
|---|---|---|---|---|---|---|
| + {{ user.username }} + | ++ {% if user.is_active %} + {% trans "Active" %} + {% else %} + {% trans "Blocked" %} + {% endif %} + | +{{ user.last_login }} | +{% if user.is_staff %}{% bs_icon 'check' %}{% endif %} | +{% if user.is_superuser %}{% bs_icon 'check' %}{% endif %} | +{% if can_clone %}{% bs_icon 'check' %}{% endif %} | +
+
+ {% bs_icon 'eye-fill' %}
+ {% bs_icon 'pencil-fill' %}
+ {% if user.is_active %}
+ {% bs_icon 'stop-fill' %}
+ {% else %}
+ {% bs_icon 'play-fill' %}
+ {% endif %}
+ {% bs_icon 'x-circle-fill' %}
+
+ |
+
+
+{% endblock %}
diff --git a/create/tests.py b/appsettings/tests.py
similarity index 100%
rename from create/tests.py
rename to appsettings/tests.py
diff --git a/appsettings/views.py b/appsettings/views.py
new file mode 100644
index 0000000..a7b60f3
--- /dev/null
+++ b/appsettings/views.py
@@ -0,0 +1,103 @@
+import os
+
+import sass
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+from django.utils.translation import gettext_noop as _
+from logs.views import addlogmsg
+
+from appsettings.models import AppSettings
+
+
+@login_required
+def appsettings(request):
+ """
+ :param request:
+ :return:
+ """
+ main_css = "wvc-main.min.css"
+ sass_dir = AppSettings.objects.get(key="SASS_DIR")
+ bootstrap_theme = AppSettings.objects.get(key="BOOTSTRAP_THEME")
+ try:
+ themes_list = os.listdir(sass_dir.value + "/wvc-themes")
+ except FileNotFoundError as err:
+ messages.error(request, err)
+ addlogmsg(request.user.username, "-", "", err)
+
+ # Bootstrap settings related with filesystems, because of that they are excluded from other settings
+ appsettings = AppSettings.objects.exclude(
+ description__startswith="Bootstrap"
+ ).order_by("name")
+
+ if request.method == "POST":
+ if "SASS_DIR" in request.POST:
+ try:
+ sass_dir.value = request.POST.get("SASS_DIR", "")
+ sass_dir.save()
+
+ msg = _("SASS directory path is changed. Now: %(dir)s") % {
+ "dir": sass_dir.value
+ }
+ messages.success(request, msg)
+ except Exception as err:
+ msg = err
+ messages.error(request, msg)
+
+ addlogmsg(request.user.username, "-", "", msg)
+ return HttpResponseRedirect(request.get_full_path())
+
+ if "BOOTSTRAP_THEME" in request.POST:
+ theme = request.POST.get("BOOTSTRAP_THEME", "")
+ scss_var = f"@import '{sass_dir.value}/wvc-themes/{theme}/variables';"
+ # scss_boot = f"@import '{sass_dir.value}/bootstrap/bootstrap.scss';"
+ scss_boot = f"@import '{sass_dir.value}/bootstrap-overrides.scss';"
+ scss_bootswatch = (
+ f"@import '{sass_dir.value}/wvc-themes/{theme}/bootswatch';"
+ )
+
+ try:
+ with open(sass_dir.value + "/wvc-main.scss", "w") as main:
+ main.write(
+ scss_var + "\n" + scss_boot + "\n" + scss_bootswatch + "\n"
+ )
+
+ css_compressed = sass.compile(
+ string=scss_var + "\n" + scss_boot + "\n" + scss_bootswatch,
+ output_style="compressed",
+ )
+ with open("static/css/" + main_css, "w") as css:
+ css.write(css_compressed)
+
+ bootstrap_theme.value = theme
+ bootstrap_theme.save()
+
+ msg = _("Theme is changed. Now: %(theme)s") % {"theme": theme}
+ messages.success(request, msg)
+ except Exception as err:
+ msg = err
+ messages.error(request, msg)
+
+ addlogmsg(request.user.username, "-", "", msg)
+ return HttpResponseRedirect(request.get_full_path())
+
+ for setting in appsettings:
+ if setting.key in request.POST:
+ try:
+ setting.value = request.POST.get(setting.key, "")
+ setting.save()
+
+ msg = _("%(setting)s is changed. Now: %(value)s") % {
+ "setting": setting.name,
+ "value": setting.value,
+ }
+ messages.success(request, msg)
+ except Exception as err:
+ msg = err
+ messages.error(request, msg)
+
+ addlogmsg(request.user.username, "-", "", msg)
+ return HttpResponseRedirect(request.get_full_path())
+
+ return render(request, "appsettings.html", locals())
diff --git a/computes/admin.py b/computes/admin.py
deleted file mode 100644
index 8c38f3f..0000000
--- a/computes/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/computes/api/serializers.py b/computes/api/serializers.py
new file mode 100644
index 0000000..d816934
--- /dev/null
+++ b/computes/api/serializers.py
@@ -0,0 +1,20 @@
+from computes.models import Compute
+from rest_framework import serializers
+from vrtManager.connection import CONN_SOCKET, CONN_SSH, CONN_TCP, CONN_TLS
+
+
+class ComputeSerializer(serializers.ModelSerializer):
+ # Use for the input.
+ password = serializers.CharField(style={"input_type": "password"})
+ # Use a radio input instead of a select input.
+ conn_types = (
+ (CONN_SSH, "SSH"),
+ (CONN_TCP, "TCP"),
+ (CONN_TLS, "TLS"),
+ (CONN_SOCKET, "SOCK"),
+ )
+ type = serializers.ChoiceField(choices=conn_types)
+
+ class Meta:
+ model = Compute
+ fields = ["id", "name", "hostname", "login", "password", "type", "details"]
diff --git a/computes/api/viewsets.py b/computes/api/viewsets.py
new file mode 100644
index 0000000..4d0b1f9
--- /dev/null
+++ b/computes/api/viewsets.py
@@ -0,0 +1,56 @@
+from computes.models import Compute
+from rest_framework import permissions, viewsets
+from rest_framework.response import Response
+from vrtManager.create import wvmCreate
+
+from .serializers import ComputeSerializer
+
+
+class ComputeViewSet(viewsets.ModelViewSet):
+ """
+ API endpoint that allows computes to be viewed or edited.
+ """
+
+ queryset = Compute.objects.all().order_by("name")
+ serializer_class = ComputeSerializer
+ permission_classes = [permissions.IsAuthenticated]
+
+
+class ComputeArchitecturesView(viewsets.ViewSet):
+ def list(self, request, compute_pk=None):
+ """
+ Return a list of supported host architectures.
+ """
+ compute = Compute.objects.get(pk=compute_pk)
+ conn = wvmCreate(
+ compute.hostname,
+ compute.login,
+ compute.password,
+ compute.type,
+ )
+ return Response(conn.get_hypervisors_machines())
+
+ def retrieve(self, request, compute_pk=None, pk=None):
+ compute = Compute.objects.get(pk=compute_pk)
+ conn = wvmCreate(
+ compute.hostname,
+ compute.login,
+ compute.password,
+ compute.type,
+ )
+ return Response(conn.get_machine_types(pk))
+
+
+class ComputeMachinesView(viewsets.ViewSet):
+ def list(self, request, compute_pk=None, archs_pk=None):
+ """
+ Return a list of supported host architectures.
+ """
+ compute = Compute.objects.get(pk=compute_pk)
+ conn = wvmCreate(
+ compute.hostname,
+ compute.login,
+ compute.password,
+ compute.type,
+ )
+ return Response(conn.get_machine_types(archs_pk))
diff --git a/computes/forms.py b/computes/forms.py
index a626106..1128695 100644
--- a/computes/forms.py
+++ b/computes/forms.py
@@ -1,164 +1,45 @@
-import re
from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
+from vrtManager.connection import CONN_SOCKET, CONN_SSH, CONN_TCP, CONN_TLS
+
from computes.models import Compute
-
-class ComputeAddTcpForm(forms.Form):
- name = forms.CharField(error_messages={'required': _('No hostname has been entered')},
- max_length=20)
- hostname = forms.CharField(error_messages={'required': _('No IP / Domain name has been entered')},
- max_length=100)
- login = forms.CharField(error_messages={'required': _('No login has been entered')},
- max_length=100)
- password = forms.CharField(error_messages={'required': _('No password has been entered')},
- max_length=100)
-
- def clean_name(self):
- name = self.cleaned_data['name']
- have_symbol = re.match('[^a-zA-Z0-9._-]+', name)
- if have_symbol:
- raise forms.ValidationError(_('The host name must not contain any special characters'))
- elif len(name) > 20:
- raise forms.ValidationError(_('The host name must not exceed 20 characters'))
- try:
- Compute.objects.get(name=name)
- except Compute.DoesNotExist:
- return name
- raise forms.ValidationError(_('This host is already connected'))
-
- def clean_hostname(self):
- hostname = self.cleaned_data['hostname']
- have_symbol = re.match('[^a-z0-9.-]+', hostname)
- wrong_ip = re.match('^0.|^255.', hostname)
- if have_symbol:
- raise forms.ValidationError(_('Hostname must contain only numbers, or the domain name separated by "."'))
- elif wrong_ip:
- raise forms.ValidationError(_('Wrong IP address'))
- try:
- Compute.objects.get(hostname=hostname)
- except Compute.DoesNotExist:
- return hostname
- raise forms.ValidationError(_('This host is already connected'))
+from .validators import validate_hostname
-class ComputeAddSshForm(forms.Form):
- name = forms.CharField(error_messages={'required': _('No hostname has been entered')},
- max_length=20)
- hostname = forms.CharField(error_messages={'required': _('No IP / Domain name has been entered')},
- max_length=100)
- login = forms.CharField(error_messages={'required': _('No login has been entered')},
- max_length=20)
+class TcpComputeForm(forms.ModelForm):
+ hostname = forms.CharField(validators=[validate_hostname])
+ type = forms.IntegerField(widget=forms.HiddenInput, initial=CONN_TCP)
- def clean_name(self):
- name = self.cleaned_data['name']
- have_symbol = re.match('[^a-zA-Z0-9._-]+', name)
- if have_symbol:
- raise forms.ValidationError(_('The name of the host must not contain any special characters'))
- elif len(name) > 20:
- raise forms.ValidationError(_('The name of the host must not exceed 20 characters'))
- try:
- Compute.objects.get(name=name)
- except Compute.DoesNotExist:
- return name
- raise forms.ValidationError(_('This host is already connected'))
-
- def clean_hostname(self):
- hostname = self.cleaned_data['hostname']
- have_symbol = re.match('[^a-zA-Z0-9._-]+', hostname)
- wrong_ip = re.match('^0.|^255.', hostname)
- if have_symbol:
- raise forms.ValidationError(_('Hostname must contain only numbers, or the domain name separated by "."'))
- elif wrong_ip:
- raise forms.ValidationError(_('Wrong IP address'))
- try:
- Compute.objects.get(hostname=hostname)
- except Compute.DoesNotExist:
- return hostname
- raise forms.ValidationError(_('This host is already connected'))
+ class Meta:
+ model = Compute
+ widgets = {"password": forms.PasswordInput()}
+ fields = "__all__"
-class ComputeAddTlsForm(forms.Form):
- name = forms.CharField(error_messages={'required': _('No hostname has been entered')},
- max_length=20)
- hostname = forms.CharField(error_messages={'required': _('No IP / Domain name has been entered')},
- max_length=100)
- login = forms.CharField(error_messages={'required': _('No login has been entered')},
- max_length=100)
- password = forms.CharField(error_messages={'required': _('No password has been entered')},
- max_length=100)
+class SshComputeForm(forms.ModelForm):
+ hostname = forms.CharField(validators=[validate_hostname], label=_("FQDN/IP"))
+ type = forms.IntegerField(widget=forms.HiddenInput, initial=CONN_SSH)
- def clean_name(self):
- name = self.cleaned_data['name']
- have_symbol = re.match('[^a-zA-Z0-9._-]+', name)
- if have_symbol:
- raise forms.ValidationError(_('The host name must not contain any special characters'))
- elif len(name) > 20:
- raise forms.ValidationError(_('The host name must not exceed 20 characters'))
- try:
- Compute.objects.get(name=name)
- except Compute.DoesNotExist:
- return name
- raise forms.ValidationError(_('This host is already connected'))
-
- def clean_hostname(self):
- hostname = self.cleaned_data['hostname']
- have_symbol = re.match('[^a-z0-9.-]+', hostname)
- wrong_ip = re.match('^0.|^255.', hostname)
- if have_symbol:
- raise forms.ValidationError(_('Hostname must contain only numbers, or the domain name separated by "."'))
- elif wrong_ip:
- raise forms.ValidationError(_('Wrong IP address'))
- try:
- Compute.objects.get(hostname=hostname)
- except Compute.DoesNotExist:
- return hostname
- raise forms.ValidationError(_('This host is already connected'))
+ class Meta:
+ model = Compute
+ exclude = ["password"]
-class ComputeEditHostForm(forms.Form):
- host_id = forms.CharField()
- name = forms.CharField(error_messages={'required': _('No hostname has been entered')},
- max_length=20)
- hostname = forms.CharField(error_messages={'required': _('No IP / Domain name has been entered')},
- max_length=100)
- login = forms.CharField(error_messages={'required': _('No login has been entered')},
- max_length=100)
- password = forms.CharField(max_length=100)
+class TlsComputeForm(forms.ModelForm):
+ hostname = forms.CharField(validators=[validate_hostname])
+ type = forms.IntegerField(widget=forms.HiddenInput, initial=CONN_TLS)
- def clean_name(self):
- name = self.cleaned_data['name']
- have_symbol = re.match('[^a-zA-Z0-9._-]+', name)
- if have_symbol:
- raise forms.ValidationError(_('The name of the host must not contain any special characters'))
- elif len(name) > 20:
- raise forms.ValidationError(_('The name of the host must not exceed 20 characters'))
- return name
-
- def clean_hostname(self):
- hostname = self.cleaned_data['hostname']
- have_symbol = re.match('[^a-zA-Z0-9._-]+', hostname)
- wrong_ip = re.match('^0.|^255.', hostname)
- if have_symbol:
- raise forms.ValidationError(_('Hostname must contain only numbers, or the domain name separated by "."'))
- elif wrong_ip:
- raise forms.ValidationError(_('Wrong IP address'))
- return hostname
+ class Meta:
+ model = Compute
+ widgets = {"password": forms.PasswordInput()}
+ fields = "__all__"
-class ComputeAddSocketForm(forms.Form):
- name = forms.CharField(error_messages={'required': _('No hostname has been entered')},
- max_length=20)
+class SocketComputeForm(forms.ModelForm):
+ hostname = forms.CharField(widget=forms.HiddenInput, initial="localhost")
+ type = forms.IntegerField(widget=forms.HiddenInput, initial=CONN_SOCKET)
- def clean_name(self):
- name = self.cleaned_data['name']
- have_symbol = re.match('[^a-zA-Z0-9._-]+', name)
- if have_symbol:
- raise forms.ValidationError(_('The host name must not contain any special characters'))
- elif len(name) > 20:
- raise forms.ValidationError(_('The host name must not exceed 20 characters'))
- try:
- Compute.objects.get(name=name)
- except Compute.DoesNotExist:
- return name
- raise forms.ValidationError(_('This host is already connected'))
+ class Meta:
+ model = Compute
+ fields = ["name", "details", "hostname", "type"]
diff --git a/computes/migrations/0001_initial.py b/computes/migrations/0001_initial.py
index e8d6139..c8f9183 100644
--- a/computes/migrations/0001_initial.py
+++ b/computes/migrations/0001_initial.py
@@ -1,11 +1,12 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+# Generated by Django 2.2.10 on 2020-01-28 07:01
-from django.db import models, migrations
+from django.db import migrations, models
class Migration(migrations.Migration):
+ initial = True
+
dependencies = [
]
@@ -13,15 +14,13 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Compute',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('name', models.CharField(max_length=20)),
- ('hostname', models.CharField(max_length=20)),
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=64)),
+ ('hostname', models.CharField(max_length=64)),
('login', models.CharField(max_length=20)),
- ('password', models.CharField(max_length=14, null=True, blank=True)),
+ ('password', models.CharField(blank=True, max_length=14, null=True)),
+ ('details', models.CharField(blank=True, max_length=64, null=True)),
('type', models.IntegerField()),
],
- options={
- },
- bases=(models.Model,),
),
]
diff --git a/computes/migrations/0002_auto_20200529_1320.py b/computes/migrations/0002_auto_20200529_1320.py
new file mode 100644
index 0000000..194d885
--- /dev/null
+++ b/computes/migrations/0002_auto_20200529_1320.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.12 on 2020-05-29 13:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('computes', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='compute',
+ name='name',
+ field=models.CharField(max_length=64, unique=True),
+ ),
+ ]
diff --git a/computes/migrations/0003_auto_20200615_0637.py b/computes/migrations/0003_auto_20200615_0637.py
new file mode 100644
index 0000000..34cd59a
--- /dev/null
+++ b/computes/migrations/0003_auto_20200615_0637.py
@@ -0,0 +1,38 @@
+# Generated by Django 2.2.13 on 2020-06-15 06:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('computes', '0002_auto_20200529_1320'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='compute',
+ name='details',
+ field=models.CharField(blank=True, max_length=64, null=True, verbose_name='details'),
+ ),
+ migrations.AlterField(
+ model_name='compute',
+ name='hostname',
+ field=models.CharField(max_length=64, verbose_name='hostname'),
+ ),
+ migrations.AlterField(
+ model_name='compute',
+ name='login',
+ field=models.CharField(max_length=20, verbose_name='login'),
+ ),
+ migrations.AlterField(
+ model_name='compute',
+ name='name',
+ field=models.CharField(max_length=64, unique=True, verbose_name='name'),
+ ),
+ migrations.AlterField(
+ model_name='compute',
+ name='password',
+ field=models.CharField(blank=True, max_length=14, null=True, verbose_name='password'),
+ ),
+ ]
diff --git a/computes/models.py b/computes/models.py
index 6ee7de8..3f17254 100644
--- a/computes/models.py
+++ b/computes/models.py
@@ -1,12 +1,65 @@
-from django.db import models
+from django.db.models import CharField, IntegerField, Model
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+from libvirt import virConnect
+
+from vrtManager.connection import connection_manager
+from vrtManager.hostdetails import wvmHostDetails
-class Compute(models.Model):
- name = models.CharField(max_length=20)
- hostname = models.CharField(max_length=20)
- login = models.CharField(max_length=20)
- password = models.CharField(max_length=14, blank=True, null=True)
- type = models.IntegerField()
+class Compute(Model):
+ name = CharField(_("name"), max_length=64, unique=True)
+ hostname = CharField(_("hostname"), max_length=64)
+ login = CharField(_("login"), max_length=20)
+ password = CharField(_("password"), max_length=14, blank=True, null=True)
+ details = CharField(_("details"), max_length=64, null=True, blank=True)
+ type = IntegerField()
- def __unicode__(self):
- return self.hostname
+ @cached_property
+ def status(self):
+ # return connection_manager.host_is_up(self.type, self.hostname)
+ # TODO: looks like socket has problems connecting via VPN
+ if isinstance(self.connection, virConnect):
+ return True
+ else:
+ return self.connection
+
+ @cached_property
+ def connection(self):
+ try:
+ return connection_manager.get_connection(
+ self.hostname,
+ self.login,
+ self.password,
+ self.type,
+ )
+ except Exception as e:
+ return e
+
+ @cached_property
+ def proxy(self):
+ return wvmHostDetails(
+ self.hostname,
+ self.login,
+ self.password,
+ self.type,
+ )
+
+ @cached_property
+ def cpu_count(self):
+ return self.proxy.get_node_info()[3]
+
+ @cached_property
+ def cpu_usage(self):
+ return round(self.proxy.get_cpu_usage(diff=False).get('usage'))
+
+ @cached_property
+ def ram_size(self):
+ return self.proxy.get_node_info()[2]
+
+ @cached_property
+ def ram_usage(self):
+ return self.proxy.get_memory_usage()["percent"]
+
+ def __str__(self):
+ return self.name
diff --git a/computes/templates/computes.html b/computes/templates/computes.html
deleted file mode 100644
index 7c1c28f..0000000
--- a/computes/templates/computes.html
+++ /dev/null
@@ -1,221 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block title %}{% trans "Computes" %}{% endblock %}
-{% block content %}
-
-
+
+{% trans "App Settings" %}
+ + {% if request.user.is_superuser %} + + + {% endif %} +{% trans "Other Settings" %}
+ {% for setting in appsettings %} + + {% endfor %} +
-
-
-
- {% include 'errors_block.html' %}
-
-
- {% include 'create_comp_block.html' %}
-
- {% trans "Computes" %}
-
- {% if computes_info %}
- {% for compute in computes_info %}
-
-{% endblock %}
diff --git a/computes/templates/computes/form.html b/computes/templates/computes/form.html
new file mode 100644
index 0000000..d867ab4
--- /dev/null
+++ b/computes/templates/computes/form.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+{% load django_bootstrap5 %}
+{% load bootstrap_icons %}
+{% load i18n %}
+
+{% block title %}{% trans "Add Compute" %}{% endblock %}
+
+{% block content %}
+
-
- {% endfor %}
- {% else %}
-
-
-
- {% ifequal compute.status 1 %}
-
- - {{ compute.name }} - - - -
- {% else %} -{{ compute.name }} - - - -
- {% endifequal %} -
-
-
-
-
-
-
-
-
-
- {% trans "Status:" %}
-
- {% if compute.status %}
-
- {% trans "Connected" %}
- {% else %} -{% trans "Not Connected" %}
- {% endif %} -
-
- {% endif %}
-
-
- {% trans "Warning:" %} {% trans "Hypervisor doesn't have any Computes" %}
-
-
+
+
+
+{% trans "Create Compute" %}
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html
new file mode 100644
index 0000000..8a41bc9
--- /dev/null
+++ b/computes/templates/computes/instances.html
@@ -0,0 +1,116 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load static %}
+{% load bootstrap_icons %}
+{% block title %}{% trans "Instances" %} - {{ compute.name }}{% endblock %}
+{% block style %}
+
+{% endblock %}
+{% block page_heading %}{{ compute.name }} - {% trans "Instances" %}{% endblock page_heading %}
+
+{% block page_heading_extra %}
+
+ {% bs_icon 'plus-circle-fill' %}
+
+{% if instances %}
+ {% include 'search_block.html' %}
+{% endif %}
+{% endblock page_heading_extra %}
+
+{% block content %}
+
+
+
+
+
+
+
+
+
+ {% endif %}
+
+
+ {% if not instances %}
+
+ {% else %}
+
+ {% bs_icon 'exclamation-triangle' %} {% trans "Warning" %}:
+ {% trans "Hypervisor doesn't have any Instances" %}
+
+ | {% trans 'Name' %} {% trans 'Description' %} |
+ {% trans 'User' %} | +{% trans 'Status' %} | +{% trans 'VCPU' %} | +{% trans 'Memory' %} | +{% trans 'Actions' %} | +
|---|---|---|---|---|---|
|
+ {{ instance.name }}
+ + {{ instance.title }} + |
+ + + {% if instance.userinstance_set.all.count > 0 %} + {{ instance.userinstance_set.all.0.user }} + {% if instance.userinstance_set.all.count > 1 %} + (+{{ instance.userinstance_set.all.count|add:"-1" }}) + {% endif %} + {% endif %} + + | ++ {% if instance.proxy.instance.info.0 == 1 %} + {% trans "Active" %} + {% endif %} + {% if instance.proxy.instance.info.0 == 5 %} + {% trans "Off" %} + {% endif %} + {% if instance.proxy.instance.info.0 == 3 %} + {% trans "Suspended" %} + {% endif %} + | +{{ instance.proxy.instance.info.3 }} | +{% widthratio instance.proxy.instance.info.1 1024 1 %} MiB |
+ + {% include 'instance_actions.html' %} + | +
+
+
+ {% include 'create_comp_block.html' %}
+ {% include 'search_block.html' %}
+
+{% trans "Computes" %}
+
+ {% if not computes %}
+
+{% endblock content %}
+
+{% block script %}
+
+
+{% endblock script %}
diff --git a/computes/templates/create_comp_block.html b/computes/templates/create_comp_block.html
index 57e327a..3d1b6b0 100644
--- a/computes/templates/create_comp_block.html
+++ b/computes/templates/create_comp_block.html
@@ -1,159 +1,11 @@
{% load i18n %}
-{% if request.user.is_superuser %}
-
-
-
+{% load django_bootstrap5 %}
+{% load bootstrap_icons %}
-
-
-{% endif %}
\ No newline at end of file
+
+
+ {% else %}
+
+ {% bs_icon 'exclamation-triangle'%} {% trans "Warning" %}: {% trans "You don't have any computes" %}
+
+
+
+
+
+
+ {% endif %}
+| {% trans "Name" %} | +{% trans "Status" %} | +{% trans "Details" %} | +{% trans "Actions" %} | +
|---|---|---|---|
| + {{ compute.name }} + | ++ {% if compute.status is True %}{% trans "Connected" %}{% else %}{% trans "Not Connected" %}{% endif %} + | ++ {{ compute.details|default:"" }} + | +
+
+ {% if compute.status is True %}
+ {% bs_icon 'eye-fill' %}
+ {% else %}
+ {% bs_icon 'eye' %}
+ {% endif %}
+ {% bs_icon 'pencil-fill' %}
+ {% bs_icon 'x-circle-fill' %}
+
+ |
+
+ {% trans "TCP" %}
+ {% trans "SSH" %}
+ {% trans "TLS" %}
+ {% trans "Local" %}
+ {% bs_icon "plus-circle-fill" %}
+
diff --git a/computes/templates/overview.html b/computes/templates/overview.html
index 09d5d83..0837983 100644
--- a/computes/templates/overview.html
+++ b/computes/templates/overview.html
@@ -1,150 +1,247 @@
{% extends "base.html" %}
{% load i18n %}
-{% load staticfiles %}
+{% load static %}
+{% load bootstrap_icons %}
+
{% block title %}{% trans "Overview" %} - {{ compute.name }}{% endblock %}
+
+{% block page_heading %}{{ compute.name }}{% endblock page_heading %}
+
{% block content %}
-
-
-
-
+
-
- {{ compute.name }}
- -
+
+
- {% include 'errors_block.html' %}
-
-
-
- {% trans "Basic details" %}
-
-
- {% trans "Hostname" %}
-{% trans "Hypervisor" %}
-{% trans "Memory" %}
-{% trans "Architecture" %}
-{% trans "Logical CPUs" %}
-{% trans "Processor" %}
-{% trans "Connection" %}
-
-
- {{ hostname }}
-{{ hypervisor }}
-{{ host_memory|filesizeformat }}
-{{ host_arch }}
-{{ logical_cpu }}
-{{ model_cpu }}
-{{ uri_conn }}
-
-
-
{% trans "Performance" %}
-
- [0-9]+)/$', views.overview, name='overview'),
- url(r'^statistics/(?P[0-9]+)/$',
- views.compute_graph, name='compute_graph'),
+ path("", views.computes, name="computes"),
+ path(
+ "add_tcp_host/",
+ views.compute_create,
+ {"FormClass": forms.TcpComputeForm},
+ name="add_tcp_host",
+ ),
+ path(
+ "add_ssh_host/",
+ views.compute_create,
+ {"FormClass": forms.SshComputeForm},
+ name="add_ssh_host",
+ ),
+ path(
+ "add_tls_host/",
+ views.compute_create,
+ {"FormClass": forms.TlsComputeForm},
+ name="add_tls_host",
+ ),
+ path(
+ "add_socket_host/",
+ views.compute_create,
+ {"FormClass": forms.SocketComputeForm},
+ name="add_socket_host",
+ ),
+ path(
+ "/",
+ include(
+ [
+ path("", views.overview, name="overview"),
+ path("update/", views.compute_update, name="compute_update"),
+ path("delete/", views.compute_delete, name="compute_delete"),
+ path("statistics", views.compute_graph, name="compute_graph"),
+ path("instances/", views.instances, name="instances"),
+ path("storages/", storages, name="storages"),
+ path("storage//volumes/", get_volumes, name="volumes"),
+ path("storage//", storage, name="storage"),
+ path(
+ "storage//create_volume/",
+ create_volume,
+ name="create_volume",
+ ),
+ path("networks/", networks, name="networks"),
+ path("network//", network, name="network"),
+ path("interfaces/", interfaces, name="interfaces"),
+ path("interface//", interface, name="interface"),
+ path("nwfilters/", nwfilters, name="nwfilters"),
+ path("nwfilter//", nwfilter, name="nwfilter"),
+ path("virtsecrets/", secrets, name="virtsecrets"),
+ path(
+ "archs//machines",
+ views.get_compute_machine_types,
+ name="machines",
+ ),
+ path(
+ "archs//machines//disks//buses",
+ views.get_compute_disk_buses,
+ name="buses",
+ ),
+ path(
+ "archs//machines//capabilities",
+ views.get_dom_capabilities,
+ name="domcaps",
+ ),
+ ]
+ ),
+ ),
]
diff --git a/computes/utils.py b/computes/utils.py
new file mode 100644
index 0000000..80fec5a
--- /dev/null
+++ b/computes/utils.py
@@ -0,0 +1,17 @@
+from instances.models import Instance
+
+
+def refresh_instance_database(compute):
+ domains = compute.proxy.wvm.listAllDomains()
+ domain_names = [d.name() for d in domains]
+ domain_uuids = [d.UUIDString() for d in domains]
+ # Delete instances that're not on host from DB
+ Instance.objects.filter(compute=compute).exclude(name__in=domain_names).delete()
+ Instance.objects.filter(compute=compute).exclude(uuid__in=domain_uuids).delete()
+ # Create instances that're on host but not in DB
+ names = Instance.objects.filter(compute=compute).values_list("name", flat=True)
+ for domain in domains:
+ if domain.name() not in names:
+ Instance(
+ compute=compute, name=domain.name(), uuid=domain.UUIDString()
+ ).save()
diff --git a/computes/validators.py b/computes/validators.py
new file mode 100644
index 0000000..dbb79ee
--- /dev/null
+++ b/computes/validators.py
@@ -0,0 +1,26 @@
+import re
+
+from django.core.exceptions import ValidationError
+from django.utils.translation import gettext_lazy as _
+
+have_symbol = re.compile("[^a-zA-Z0-9._-]+")
+wrong_ip = re.compile("^0.|^255.")
+wrong_name = re.compile("[^a-zA-Z0-9._-]+")
+
+
+def validate_hostname(value):
+ sym = have_symbol.match(value)
+ wip = wrong_ip.match(value)
+
+ if sym:
+ raise ValidationError(
+ _('Hostname must contain only numbers, or the domain name separated by "."')
+ )
+ elif wip:
+ raise ValidationError(_("Wrong IP address"))
+
+
+def validate_name(value):
+ have_symbol = wrong_name.match("[^a-zA-Z0-9._-]+")
+ if have_symbol:
+ raise ValidationError(_("The hostname must not contain any special characters"))
diff --git a/computes/views.py b/computes/views.py
index 39af4d0..22b7c3e 100644
--- a/computes/views.py
+++ b/computes/views.py
@@ -1,225 +1,278 @@
-import time
import json
-from django.http import HttpResponse, HttpResponseRedirect
-from django.core.urlresolvers import reverse
-from django.shortcuts import render, get_object_or_404
-from computes.models import Compute
+
+from admin.decorators import superuser_only
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
+from django.utils import timezone
from instances.models import Instance
-from accounts.models import UserInstance
-from computes.forms import ComputeAddTcpForm, ComputeAddSshForm, ComputeEditHostForm, ComputeAddTlsForm, ComputeAddSocketForm
-from vrtManager.hostdetails import wvmHostDetails
-from vrtManager.connection import CONN_SSH, CONN_TCP, CONN_TLS, CONN_SOCKET, connection_manager
from libvirt import libvirtError
+from vrtManager.connection import (
+ CONN_SOCKET,
+ CONN_SSH,
+ CONN_TCP,
+ CONN_TLS,
+ connection_manager,
+ wvmConnect,
+)
+from vrtManager.hostdetails import wvmHostDetails
+
+from computes.forms import (
+ SocketComputeForm,
+ SshComputeForm,
+ TcpComputeForm,
+ TlsComputeForm,
+)
+from computes.models import Compute
+
+from . import utils
+@superuser_only
def computes(request):
"""
:param request:
:return:
"""
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('index'))
+ computes = Compute.objects.filter().order_by("name")
- if not request.user.is_superuser:
- return HttpResponseRedirect(reverse('index'))
-
- def get_hosts_status(computes):
- """
- Function return all hosts all vds on host
- """
- compute_data = []
- for compute in computes:
- compute_data.append({'id': compute.id,
- 'name': compute.name,
- 'hostname': compute.hostname,
- 'status': connection_manager.host_is_up(compute.type, compute.hostname),
- 'type': compute.type,
- 'login': compute.login,
- 'password': compute.password
- })
- return compute_data
-
- error_messages = []
- computes = Compute.objects.filter()
- computes_info = get_hosts_status(computes)
-
- if request.method == 'POST':
- if 'host_del' in request.POST:
- compute_id = request.POST.get('host_id', '')
- try:
- del_user_inst_on_host = UserInstance.objects.filter(instance__compute_id=compute_id)
- del_user_inst_on_host.delete()
- finally:
- try:
- del_inst_on_host = Instance.objects.filter(compute_id=compute_id)
- del_inst_on_host.delete()
- finally:
- del_host = Compute.objects.get(id=compute_id)
- del_host.delete()
- return HttpResponseRedirect(request.get_full_path())
- if 'host_tcp_add' in request.POST:
- form = ComputeAddTcpForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- new_tcp_host = Compute(name=data['name'],
- hostname=data['hostname'],
- type=CONN_TCP,
- login=data['login'],
- password=data['password'])
- new_tcp_host.save()
- return HttpResponseRedirect(request.get_full_path())
- else:
- for msg_err in form.errors.values():
- error_messages.append(msg_err.as_text())
- if 'host_ssh_add' in request.POST:
- form = ComputeAddSshForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- new_ssh_host = Compute(name=data['name'],
- hostname=data['hostname'],
- type=CONN_SSH,
- login=data['login'])
- new_ssh_host.save()
- return HttpResponseRedirect(request.get_full_path())
- else:
- for msg_err in form.errors.values():
- error_messages.append(msg_err.as_text())
- if 'host_tls_add' in request.POST:
- form = ComputeAddTlsForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- new_tls_host = Compute(name=data['name'],
- hostname=data['hostname'],
- type=CONN_TLS,
- login=data['login'],
- password=data['password'])
- new_tls_host.save()
- return HttpResponseRedirect(request.get_full_path())
- else:
- for msg_err in form.errors.values():
- error_messages.append(msg_err.as_text())
- if 'host_socket_add' in request.POST:
- form = ComputeAddSocketForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- new_socket_host = Compute(name=data['name'],
- hostname='localhost',
- type=CONN_SOCKET,
- login='',
- password='')
- new_socket_host.save()
- return HttpResponseRedirect(request.get_full_path())
- else:
- for msg_err in form.errors.values():
- error_messages.append(msg_err.as_text())
- if 'host_edit' in request.POST:
- form = ComputeEditHostForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- compute_edit = Compute.objects.get(id=data['host_id'])
- compute_edit.name = data['name']
- compute_edit.hostname = data['hostname']
- compute_edit.login = data['login']
- compute_edit.password = data['password']
- compute_edit.save()
- return HttpResponseRedirect(request.get_full_path())
- else:
- for msg_err in form.errors.values():
- error_messages.append(msg_err.as_text())
- return render(request, 'computes.html', locals())
+ return render(request, "computes/list.html", {"computes": computes})
+@superuser_only
def overview(request, compute_id):
- """
- :param request:
- :return:
- """
+ compute = get_object_or_404(Compute, pk=compute_id)
+ status = (
+ "true"
+ if connection_manager.host_is_up(compute.type, compute.hostname) is True
+ else "false"
+ )
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('index'))
+ conn = wvmHostDetails(
+ compute.hostname,
+ compute.login,
+ compute.password,
+ compute.type,
+ )
+ (
+ hostname,
+ host_arch,
+ host_memory,
+ logical_cpu,
+ model_cpu,
+ uri_conn,
+ ) = conn.get_node_info()
+ hypervisor = conn.get_hypervisors_domain_types()
+ mem_usage = conn.get_memory_usage()
+ emulator = conn.get_emulator(host_arch)
+ version = conn.get_version()
+ lib_version = conn.get_lib_version()
+ conn.close()
- if not request.user.is_superuser:
- return HttpResponseRedirect(reverse('index'))
+ return render(request, "overview.html", locals())
- error_messages = []
+
+@superuser_only
+def instances(request, compute_id):
compute = get_object_or_404(Compute, pk=compute_id)
- try:
- conn = wvmHostDetails(compute.hostname,
- compute.login,
- compute.password,
- compute.type)
- hostname, host_arch, host_memory, logical_cpu, model_cpu, uri_conn = conn.get_node_info()
- hypervisor = conn.hypervisor_type()
- mem_usage = conn.get_memory_usage()
- conn.close()
- except libvirtError as lib_err:
- error_messages.append(lib_err)
+ utils.refresh_instance_database(compute)
+ instances = Instance.objects.filter(compute=compute).prefetch_related(
+ "userinstance_set"
+ )
- return render(request, 'overview.html', locals())
+ return render(
+ request, "computes/instances.html", {"compute": compute, "instances": instances}
+ )
+
+
+@superuser_only
+def compute_create(request, FormClass):
+ form = FormClass(request.POST or None)
+ if form.is_valid():
+ form.save()
+ return redirect(reverse("computes"))
+
+ return render(request, "computes/form.html", {"form": form})
+
+
+@superuser_only
+def compute_update(request, compute_id):
+ compute = get_object_or_404(Compute, pk=compute_id)
+
+ if compute.type == 1:
+ FormClass = TcpComputeForm
+ elif compute.type == 2:
+ FormClass = SshComputeForm
+ elif compute.type == 3:
+ FormClass = TlsComputeForm
+ elif compute.type == 4:
+ FormClass = SocketComputeForm
+
+ form = FormClass(request.POST or None, instance=compute)
+ if form.is_valid():
+ form.save()
+ return redirect(reverse("computes"))
+
+ return render(request, "computes/form.html", {"form": form})
+
+
+@superuser_only
+def compute_delete(request, compute_id):
+ compute = get_object_or_404(Compute, pk=compute_id)
+ if request.method == "POST":
+ compute.delete()
+ return redirect("computes")
+
+ return render(
+ request,
+ "common/confirm_delete.html",
+ {"object": compute},
+ )
def compute_graph(request, compute_id):
"""
:param request:
+ :param compute_id:
:return:
"""
+ comp_mgr = ComputeManager(compute_id)
+ data = comp_mgr.compute_graph()
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('login'))
-
- points = 5
- datasets = {}
- cookies = {}
- compute = get_object_or_404(Compute, pk=compute_id)
- curent_time = time.strftime("%H:%M:%S")
-
- try:
- conn = wvmHostDetails(compute.hostname,
- compute.login,
- compute.password,
- compute.type)
- cpu_usage = conn.get_cpu_usage()
- mem_usage = conn.get_memory_usage()
- conn.close()
- except libvirtError:
- cpu_usage = 0
- mem_usage = 0
-
- try:
- cookies['cpu'] = request.COOKIES['cpu']
- cookies['mem'] = request.COOKIES['mem']
- cookies['timer'] = request.COOKIES['timer']
- except KeyError:
- cookies['cpu'] = None
- cookies['mem'] = None
-
- if not cookies['cpu'] or not cookies['mem']:
- datasets['cpu'] = [0] * points
- datasets['mem'] = [0] * points
- datasets['timer'] = [0] * points
- else:
- datasets['cpu'] = eval(cookies['cpu'])
- datasets['mem'] = eval(cookies['mem'])
- datasets['timer'] = eval(cookies['timer'])
-
- datasets['timer'].append(curent_time)
- datasets['cpu'].append(int(cpu_usage['usage']))
- datasets['mem'].append(int(mem_usage['usage']) / 1048576)
-
- if len(datasets['timer']) > points:
- datasets['timer'].pop(0)
- if len(datasets['cpu']) > points:
- datasets['cpu'].pop(0)
- if len(datasets['mem']) > points:
- datasets['mem'].pop(0)
-
- data = json.dumps({'cpudata': datasets['cpu'], 'memdata': datasets['mem'], 'timeline': datasets['timer']})
response = HttpResponse()
- response['Content-Type'] = "text/javascript"
- response.cookies['cpu'] = datasets['cpu']
- response.cookies['timer'] = datasets['timer']
- response.cookies['mem'] = datasets['mem']
+ response["Content-Type"] = "text/javascript"
response.write(data)
return response
+
+
+def get_compute_disk_buses(request, compute_id, arch, machine, disk):
+ """
+ :param request:
+ :param compute_id:
+ :param arch:
+ :param machine:
+ :param disk:
+ :return:
+ """
+ comp_mgr = ComputeManager(compute_id)
+ return HttpResponse(comp_mgr.get_disk_buses(arch, machine, disk))
+
+
+def get_compute_machine_types(request, compute_id, arch):
+ """
+ :param request:
+ :param compute_id:
+ :param arch:
+ :return:
+ """
+ comp_mgr = ComputeManager(compute_id)
+ return HttpResponse(comp_mgr.get_machine_types(arch))
+
+
+def get_compute_video_models(request, compute_id, arch, machine):
+ """
+ :param request:
+ :param compute_id:
+ :param arch:
+ :param machine:
+ :return:
+ """
+ comp_mgr = ComputeManager(compute_id)
+ return HttpResponse(comp_mgr.get_video_models(arch, machine))
+
+
+def get_dom_capabilities(request, compute_id, arch, machine):
+ """
+ :param request:
+ :param compute_id:
+ :param arch:
+ :param machine:
+ :return:
+ """
+ comp_mgr = ComputeManager(compute_id)
+ return HttpResponse(comp_mgr.get_dom_capabilities(arch, machine))
+
+
+class ComputeManager:
+ def __init__(self, compute_id):
+ self.compute = get_object_or_404(Compute, pk=compute_id)
+ self.conn = wvmConnect(
+ self.compute.hostname,
+ self.compute.login,
+ self.compute.password,
+ self.compute.type,
+ )
+
+ def get_video_models(self, arch, machine):
+ data = dict()
+ try:
+ data["videos"] = self.conn.get_video_models(arch, machine)
+ except libvirtError:
+ pass
+
+ return json.dumps(data)
+
+ def get_dom_capabilities(self, arch, machine):
+ data = dict()
+ try:
+ data["videos"] = self.conn.get_disk_device_types(arch, machine)
+ data["bus"] = self.conn.get_disk_device_types(arch, machine)
+ except libvirtError:
+ pass
+
+ return json.dumps(data)
+
+ def get_machine_types(self, arch):
+ data = dict()
+ try:
+ data["machines"] = self.conn.get_machine_types(arch)
+ except libvirtError:
+ pass
+
+ return json.dumps(data)
+
+ def get_disk_buses(self, arch, machine, disk):
+ data = dict()
+ try:
+ disk_device_types = self.conn.get_disk_device_types(arch, machine)
+
+ if disk in disk_device_types:
+ if disk == "disk":
+ data["bus"] = sorted(disk_device_types)
+ elif disk == "cdrom":
+ data["bus"] = ["ide", "sata", "scsi"]
+ elif disk == "floppy":
+ data["bus"] = ["fdc"]
+ elif disk == "lun":
+ data["bus"] = ["scsi"]
+ except libvirtError:
+ pass
+
+ return json.dumps(data)
+
+ def compute_graph(self):
+ try:
+ conn = wvmHostDetails(
+ self.compute.hostname,
+ self.compute.login,
+ self.compute.password,
+ self.compute.type,
+ )
+ current_time = timezone.now().strftime("%H:%M:%S")
+ cpu_usage = conn.get_cpu_usage()
+ mem_usage = conn.get_memory_usage()
+ conn.close()
+ except libvirtError:
+ cpu_usage = {"usage": 0}
+ mem_usage = {"usage": 0}
+ current_time = 0
+
+ return json.dumps(
+ {
+ "cpudata": cpu_usage["usage"],
+ "memdata": mem_usage,
+ "timeline": current_time,
+ }
+ )
diff --git a/conf/daemon/consolecallback b/conf/daemon/consolecallback
new file mode 100755
index 0000000..a510fdf
--- /dev/null
+++ b/conf/daemon/consolecallback
@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+# consolecallback - provide a persistent console that survives guest reboots
+
+import os
+import logging
+import libvirt
+import tty
+import termios
+import atexit
+from argparse import ArgumentParser
+from typing import Optional # noqa F401
+
+
+def reset_term() -> None:
+ termios.tcsetattr(0, termios.TCSADRAIN, attrs)
+
+
+def error_handler(unused, error) -> None:
+ # The console stream errors on VM shutdown; we don't care
+ if error[0] == libvirt.VIR_ERR_RPC and error[1] == libvirt.VIR_FROM_STREAMS:
+ return
+ logging.warning(error)
+
+
+class Console(object):
+ def __init__(self, uri: str, uuid: str) -> None:
+ self.uri = uri
+ self.uuid = uuid
+ self.connection = libvirt.open(uri)
+ self.domain = self.connection.lookupByUUIDString(uuid)
+ self.state = self.domain.state(0)
+ self.connection.domainEventRegister(lifecycle_callback, self)
+ self.stream = None # type: Optional[libvirt.virStream]
+ self.run_console = True
+ self.stdin_watch = -1
+ logging.info("%s initial state %d, reason %d",
+ self.uuid, self.state[0], self.state[1])
+
+
+def check_console(console: Console) -> bool:
+ if (console.state[0] == libvirt.VIR_DOMAIN_RUNNING or console.state[0] == libvirt.VIR_DOMAIN_PAUSED):
+ if console.stream is None:
+ console.stream = console.connection.newStream(libvirt.VIR_STREAM_NONBLOCK)
+ console.domain.openConsole(None, console.stream, 0)
+ console.stream.eventAddCallback(libvirt.VIR_STREAM_EVENT_READABLE, stream_callback, console)
+ else:
+ if console.stream:
+ console.stream.eventRemoveCallback()
+ console.stream = None
+
+ return console.run_console
+
+
+def stdin_callback(watch: int, fd: int, events: int, console: Console) -> None:
+ readbuf = os.read(fd, 1024)
+ if readbuf.startswith(b" "):
+ console.run_console = False
+ return
+ if console.stream:
+ console.stream.send(readbuf)
+
+
+def stream_callback(stream: libvirt.virStream, events: int, console: Console) -> None:
+ try:
+ assert console.stream
+ received_data = console.stream.recv(1024)
+ except Exception:
+ return
+ os.write(0, received_data)
+
+
+def lifecycle_callback(connection: libvirt.virConnect, domain: libvirt.virDomain, event: int, detail: int, console: Console) -> None:
+ console.state = console.domain.state(0)
+ logging.info("%s transitioned to state %d, reason %d",
+ console.uuid, console.state[0], console.state[1])
+
+
+# main
+parser = ArgumentParser(epilog="Example: %(prog)s 'qemu:///system' '32ad945f-7e78-c33a-e96d-39f25e025d81'")
+parser.add_argument("uri")
+parser.add_argument("uuid")
+args = parser.parse_args()
+
+print("Escape character is ^]")
+logging.basicConfig(filename='msg.log', level=logging.DEBUG)
+logging.info("URI: %s", args.uri)
+logging.info("UUID: %s", args.uuid)
+
+libvirt.virEventRegisterDefaultImpl()
+libvirt.registerErrorHandler(error_handler, None)
+
+atexit.register(reset_term)
+attrs = termios.tcgetattr(0)
+tty.setraw(0)
+
+console = Console(args.uri, args.uuid)
+console.stdin_watch = libvirt.virEventAddHandle(0, libvirt.VIR_EVENT_HANDLE_READABLE, stdin_callback, console)
+
+while check_console(console):
+ libvirt.virEventRunDefaultImpl()
diff --git a/conf/daemon/gstfsd b/conf/daemon/gstfsd
index 2e68312..2129a99 100644
--- a/conf/daemon/gstfsd
+++ b/conf/daemon/gstfsd
@@ -3,24 +3,24 @@
# gstfsd - WebVirtCloud daemon for managing VM's filesystem
#
-import SocketServer
+import socketserver
import json
import guestfs
import re
-
PORT = 16510
ADDRESS = "0.0.0.0"
-class MyTCPServer(SocketServer.ThreadingTCPServer):
+class MyTCPServer(socketserver.ThreadingTCPServer):
allow_reuse_address = True
-class MyTCPServerHandler(SocketServer.BaseRequestHandler):
+class MyTCPServerHandler(socketserver.BaseRequestHandler):
def handle(self):
# recive data
- data = json.loads(self.request.recv(1024).strip())
+ d = self.request.recv(1024).strip()
+ data = json.loads(d)
# GuestFS
gfs = guestfs.GuestFS(python_return_dict=True)
@@ -42,17 +42,18 @@ class MyTCPServerHandler(SocketServer.BaseRequestHandler):
if data['action'] == 'publickey':
if not gfs.is_dir('/root/.ssh'):
gfs.mkdir('/root/.ssh')
- gfs.chmod(0700, "/root/.ssh")
+ gfs.chmod(700, "/root/.ssh")
gfs.write('/root/.ssh/authorized_keys', data['key'])
- gfs.chmod(0600, '/root/.ssh/authorized_keys')
+ gfs.chmod(600, '/root/.ssh/authorized_keys')
self.request.sendall(json.dumps({'return': 'success'}))
gfs.umount(part)
except RuntimeError:
pass
gfs.shutdown()
gfs.close()
- except RuntimeError, err:
- self.request.sendall(json.dumps({'return': 'error', 'message': err.message}))
+ except Exception as err:
+ self.request.sendall(bytes(json.dumps({'return': 'error', 'message': str(err)}).encode()))
+
server = MyTCPServer((ADDRESS, PORT), MyTCPServerHandler)
server.serve_forever()
diff --git a/conf/nginx/centos_nginx.conf b/conf/nginx/centos_nginx.conf
new file mode 100644
index 0000000..2327039
--- /dev/null
+++ b/conf/nginx/centos_nginx.conf
@@ -0,0 +1,37 @@
+# For more information on configuration, see:
+# * Official English Documentation: http://nginx.org/en/docs/
+# * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+ worker_connections 1024;
+}
+
+http {
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+
+ access_log /var/log/nginx/access.log main;
+
+ sendfile on;
+ tcp_nopush on;
+ tcp_nodelay on;
+ keepalive_timeout 65;
+ types_hash_max_size 2048;
+
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ # Load modular configuration files from the /etc/nginx/conf.d directory.
+ # See http://nginx.org/en/docs/ngx_core_module.html#include
+ # for more information.
+ include /etc/nginx/conf.d/*.conf;
+}
diff --git a/conf/nginx/debian_nginx.conf b/conf/nginx/debian_nginx.conf
new file mode 100644
index 0000000..5b107cb
--- /dev/null
+++ b/conf/nginx/debian_nginx.conf
@@ -0,0 +1,85 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+ worker_connections 768;
+ # multi_accept on;
+}
+
+http {
+
+ ##
+ # Basic Settings
+ ##
+
+ sendfile on;
+ tcp_nopush on;
+ tcp_nodelay on;
+ keepalive_timeout 65;
+ types_hash_max_size 2048;
+ # server_tokens off;
+
+ # server_names_hash_bucket_size 64;
+ # server_name_in_redirect off;
+
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ ##
+ # SSL Settings
+ ##
+
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+ ssl_prefer_server_ciphers on;
+
+ ##
+ # Logging Settings
+ ##
+
+ access_log /var/log/nginx/access.log;
+ error_log /var/log/nginx/error.log;
+
+ ##
+ # Gzip Settings
+ ##
+
+ gzip on;
+
+ # gzip_vary on;
+ # gzip_proxied any;
+ # gzip_comp_level 6;
+ # gzip_buffers 16 8k;
+ # gzip_http_version 1.1;
+ # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+ ##
+ # Virtual Host Configs
+ ##
+
+ include /etc/nginx/conf.d/*.conf;
+ include /etc/nginx/sites-enabled/*;
+}
+
+
+#mail {
+# # See sample authentication script at:
+# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
+#
+# # auth_http localhost/auth.php;
+# # pop3_capabilities "TOP" "USER";
+# # imap_capabilities "IMAP5rev1" "UIDPLUS";
+#
+# server {
+# listen localhost:110;
+# protocol pop3;
+# proxy on;
+# }
+#
+# server {
+# listen localhost:143;
+# protocol imap;
+# proxy on;
+# }
+#}
diff --git a/conf/nginx/openEuler_nginx.conf b/conf/nginx/openEuler_nginx.conf
new file mode 100644
index 0000000..dfa72fc
--- /dev/null
+++ b/conf/nginx/openEuler_nginx.conf
@@ -0,0 +1,38 @@
+# For more information on configuration, see:
+# * Official English Documentation: http://nginx.org/en/docs/
+# * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+ worker_connections 1024;
+}
+
+http {
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+
+ access_log /var/log/nginx/access.log main;
+
+ sendfile on;
+ tcp_nopush on;
+ tcp_nodelay on;
+ keepalive_timeout 65;
+ types_hash_max_size 2048;
+
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ # Load modular configuration files from the /etc/nginx/conf.d directory.
+ # See http://nginx.org/en/docs/ngx_core_module.html#include
+ # for more information.
+ include /etc/nginx/conf.d/*.conf;
+
+}
diff --git a/conf/nginx/ubuntu_nginx.conf b/conf/nginx/ubuntu_nginx.conf
new file mode 100644
index 0000000..5b107cb
--- /dev/null
+++ b/conf/nginx/ubuntu_nginx.conf
@@ -0,0 +1,85 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+ worker_connections 768;
+ # multi_accept on;
+}
+
+http {
+
+ ##
+ # Basic Settings
+ ##
+
+ sendfile on;
+ tcp_nopush on;
+ tcp_nodelay on;
+ keepalive_timeout 65;
+ types_hash_max_size 2048;
+ # server_tokens off;
+
+ # server_names_hash_bucket_size 64;
+ # server_name_in_redirect off;
+
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ ##
+ # SSL Settings
+ ##
+
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+ ssl_prefer_server_ciphers on;
+
+ ##
+ # Logging Settings
+ ##
+
+ access_log /var/log/nginx/access.log;
+ error_log /var/log/nginx/error.log;
+
+ ##
+ # Gzip Settings
+ ##
+
+ gzip on;
+
+ # gzip_vary on;
+ # gzip_proxied any;
+ # gzip_comp_level 6;
+ # gzip_buffers 16 8k;
+ # gzip_http_version 1.1;
+ # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+ ##
+ # Virtual Host Configs
+ ##
+
+ include /etc/nginx/conf.d/*.conf;
+ include /etc/nginx/sites-enabled/*;
+}
+
+
+#mail {
+# # See sample authentication script at:
+# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
+#
+# # auth_http localhost/auth.php;
+# # pop3_capabilities "TOP" "USER";
+# # imap_capabilities "IMAP5rev1" "UIDPLUS";
+#
+# server {
+# listen localhost:110;
+# protocol pop3;
+# proxy on;
+# }
+#
+# server {
+# listen localhost:143;
+# protocol imap;
+# proxy on;
+# }
+#}
diff --git a/conf/nginx/uos_eagle_nginx.conf b/conf/nginx/uos_eagle_nginx.conf
new file mode 100644
index 0000000..7914c8e
--- /dev/null
+++ b/conf/nginx/uos_eagle_nginx.conf
@@ -0,0 +1,85 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+ worker_connections 768;
+ # multi_accept on;
+}
+
+http {
+
+ ##
+ # Basic Settings
+ ##
+
+ sendfile on;
+ tcp_nopush on;
+ tcp_nodelay on;
+ keepalive_timeout 65;
+ types_hash_max_size 2048;
+ # server_tokens off;
+
+ # server_names_hash_bucket_size 64;
+ # server_name_in_redirect off;
+
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ ##
+ # SSL Settings
+ ##
+
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+ ssl_prefer_server_ciphers on;
+
+ ##
+ # Logging Settings
+ ##
+
+ access_log /var/log/nginx/access.log;
+ error_log /var/log/nginx/error.log;
+
+ ##
+ # Gzip Settings
+ ##
+
+ gzip on;
+
+ # gzip_vary on;
+ # gzip_proxied any;
+ # gzip_comp_level 6;
+ # gzip_buffers 16 8k;
+ # gzip_http_version 1.1;
+ # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+ ##
+ # Virtual Host Configs
+ ##
+
+ include /etc/nginx/conf.d/*.conf;
+ include /etc/nginx/sites-enabled/*;
+}
+
+
+#mail {
+# # See sample authentication script at:
+# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
+#
+# # auth_http localhost/auth.php;
+# # pop3_capabilities "TOP" "USER";
+# # imap_capabilities "IMAP4rev1" "UIDPLUS";
+#
+# server {
+# listen localhost:110;
+# protocol pop3;
+# proxy on;
+# }
+#
+# server {
+# listen localhost:143;
+# protocol imap;
+# proxy on;
+# }
+#}
\ No newline at end of file
diff --git a/conf/nginx/uos_nginx.conf b/conf/nginx/uos_nginx.conf
new file mode 100644
index 0000000..5c956d6
--- /dev/null
+++ b/conf/nginx/uos_nginx.conf
@@ -0,0 +1,89 @@
+# For more information on configuration, see:
+# * Official English Documentation: http://nginx.org/en/docs/
+# * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+ worker_connections 1024;
+}
+
+http {
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+
+ access_log /var/log/nginx/access.log main;
+
+ sendfile on;
+ tcp_nopush on;
+ tcp_nodelay on;
+ keepalive_timeout 65;
+ types_hash_max_size 2048;
+
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ # Load modular configuration files from the /etc/nginx/conf.d directory.
+ # See http://nginx.org/en/docs/ngx_core_module.html#include
+ # for more information.
+ include /etc/nginx/conf.d/*.conf;
+
+# server {
+# listen 80 default_server;
+# listen [::]:80 default_server;
+# server_name _;
+# root /usr/share/nginx/html;
+#
+# # Load configuration files for the default server block.
+# include /etc/nginx/default.d/*.conf;
+#
+# location / {
+# }
+#
+# error_page 404 /404.html;
+# location = /40x.html {
+# }
+#
+# error_page 500 502 503 504 /50x.html;
+# location = /50x.html {
+# }
+# }
+#
+# Settings for a TLS enabled server.
+#
+# server {
+# listen 443 ssl http2 default_server;
+# listen [::]:443 ssl http2 default_server;
+# server_name _;
+# root /usr/share/nginx/html;
+#
+# ssl_certificate "/etc/pki/nginx/server.crt";
+# ssl_certificate_key "/etc/pki/nginx/private/server.key";
+# ssl_session_cache shared:SSL:1m;
+# ssl_session_timeout 10m;
+# ssl_ciphers PROFILE=SYSTEM;
+# ssl_prefer_server_ciphers on;
+#
+# # Load configuration files for the default server block.
+# include /etc/nginx/default.d/*.conf;
+#
+# location / {
+# }
+#
+# error_page 404 /404.html;
+# location = /40x.html {
+# }
+#
+# error_page 500 502 503 504 /50x.html;
+# location = /50x.html {
+# }
+# }
+
+}
\ No newline at end of file
diff --git a/conf/nginx/webvirtcloud.conf b/conf/nginx/webvirtcloud.conf
index 70b8e0e..ae2edf8 100644
--- a/conf/nginx/webvirtcloud.conf
+++ b/conf/nginx/webvirtcloud.conf
@@ -14,10 +14,37 @@ server {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for;
proxy_set_header Host $host:$server_port;
- proxy_set_header X-Forwarded-Proto $remote_addr;
- proxy_connect_timeout 600;
- proxy_read_timeout 600;
- proxy_send_timeout 600;
+ proxy_set_header X-Forwarded-Proto http;
+ proxy_set_header X-Forwarded-Ssl off;
+ proxy_connect_timeout 1800;
+ proxy_read_timeout 1800;
+ proxy_send_timeout 1800;
client_max_body_size 1024M;
}
+
+ location /novncd/ {
+ proxy_pass http://wsnovncd;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ }
+ location /socket.io/ {
+ proxy_pass http://wssocketiod;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ }
+ location /websockify {
+ proxy_pass http://wsnovncd;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ }
+}
+
+upstream wsnovncd {
+ server 127.0.0.1:6080;
+}
+upstream wssocketiod {
+ server 127.0.0.1:6081;
}
diff --git a/conf/requirements.txt b/conf/requirements.txt
index 676876f..a745a5c 100644
--- a/conf/requirements.txt
+++ b/conf/requirements.txt
@@ -1,5 +1,28 @@
-Django==1.8.2
-websockify==0.6.0
-gunicorn==19.3.0
-libvirt-python==1.2.16
-http://github.com/retspen/retspen.github.io/raw/master/libxml2-python-2.9.1.tar.gz
+Django==4.2.23
+django_bootstrap5==25.1
+django-bootstrap-icons==0.9.0
+django-login-required-middleware==0.9.0
+django-otp==1.6.0
+django-qr-code==4.2.0
+django-auth-ldap==5.2.0
+djangorestframework==3.16.0
+drf-nested-routers==0.94.2
+drf-yasg==1.21.10
+eventlet==0.40.1
+gunicorn==23.0.0
+libsass==0.23.0
+libvirt-python==11.4.0
+lxml==6.0.0
+ldap3==2.9.1
+markdown==3.8.2
+paramiko==3.4.0
+#psycopg2-binary
+python-engineio==4.12.0
+python-socketio==5.13.0
+qrcode==8.2
+rwlock==0.0.7
+tzdata
+websockify==0.13.0
+whitenoise==6.9.0
+zipp==3.23.0
+crypt-r==3.13.1
diff --git a/conf/runit/nginx b/conf/runit/nginx
new file mode 100755
index 0000000..a7cd558
--- /dev/null
+++ b/conf/runit/nginx
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+if [[ ! -e /var/log/nginx/error.log ]]; then
+ # The Nginx log forwarder might be sleeping and waiting
+ # until the error log becomes available. We restart it in
+ # 1 second so that it picks up the new log file quickly.
+ (sleep 1 && sv restart /etc/service/nginx-log-forwarder)
+fi
+exec /usr/sbin/nginx
diff --git a/conf/runit/nginx-log-forwarder b/conf/runit/nginx-log-forwarder
new file mode 100755
index 0000000..07d63c6
--- /dev/null
+++ b/conf/runit/nginx-log-forwarder
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Forwards the Nginx error.log to the Docker logs.
+set -e
+if [[ -e /var/log/nginx/error.log ]]; then
+ exec tail -F /var/log/nginx/error.log
+else
+ exec sleep 10
+fi
diff --git a/conf/runit/novncd.sh b/conf/runit/novncd.sh
new file mode 100755
index 0000000..b071864
--- /dev/null
+++ b/conf/runit/novncd.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# `/sbin/setuser www-data` runs the given command as the user `www-data`.
+RUNAS=$(which setuser)
+[ -z "$RUNAS" ] && RUNAS="$(which sudo) -u"
+USER=www-data
+
+DJANGO_PROJECT=/srv/webvirtcloud
+PYTHON=$DJANGO_PROJECT/venv/bin/python3
+NOVNCD=$DJANGO_PROJECT/console/novncd
+
+# make novncd debug, verbose
+#PARAMS="-d -v"
+
+LOG=/var/log/novncd.log
+
+cd $DJANGO_PROJECT || exit
+exec "$RUNAS" "$USER" "$PYTHON" "$NOVNCD" "$PARAMS" >> $LOG 2>&1
diff --git a/conf/runit/secret_generator.py b/conf/runit/secret_generator.py
new file mode 100644
index 0000000..70ee032
--- /dev/null
+++ b/conf/runit/secret_generator.py
@@ -0,0 +1,13 @@
+import secrets
+
+generated_key = secrets.token_urlsafe(50)
+
+print(''.join(generated_key))
+
+
+### Use for old python versions < 3.6
+##import random
+##import string
+#
+##haystack = string.ascii_letters + string.digits + string.punctuation
+##print(''.join([random.SystemRandom().choice(haystack.replace('/', '').replace('\'', '').replace('\"', '')) for _ in range(50)]))
diff --git a/conf/runit/webvirtcloud.sh b/conf/runit/webvirtcloud.sh
new file mode 100755
index 0000000..4cb81b0
--- /dev/null
+++ b/conf/runit/webvirtcloud.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# `/sbin/setuser www-data` runs the given command as the user `www-data`.
+cd /srv/webvirtcloud || exit
+exec /sbin/setuser www-data /srv/webvirtcloud/venv/bin/gunicorn webvirtcloud.wsgi:application -c /srv/webvirtcloud/gunicorn.conf.py >> /var/log/webvirtcloud.log 2>&1
diff --git a/conf/supervisor/gstfsd.conf b/conf/supervisor/gstfsd.conf
index 2834b30..71592aa 100644
--- a/conf/supervisor/gstfsd.conf
+++ b/conf/supervisor/gstfsd.conf
@@ -1,5 +1,5 @@
[program:gstfsd]
-command=/usr/bin/python /usr/local/bin/gstfsd
+command=/usr/bin/python3 /usr/local/bin/gstfsd
directory=/usr/local/bin
user=root
autostart=true
diff --git a/conf/supervisor/webvirtcloud.conf b/conf/supervisor/webvirtcloud.conf
index 2994bc9..a554f0d 100644
--- a/conf/supervisor/webvirtcloud.conf
+++ b/conf/supervisor/webvirtcloud.conf
@@ -7,9 +7,17 @@ autorestart=true
redirect_stderr=true
[program:novncd]
-command=/srv/webvirtcloud/venv/bin/python /srv/webvirtcloud/console/novncd
+command=/srv/webvirtcloud/venv/bin/python3 /srv/webvirtcloud/console/novncd
directory=/srv/webvirtcloud
user=www-data
autostart=true
autorestart=true
-redirect_stderr=true
\ No newline at end of file
+redirect_stderr=true
+
+[program:socketiod]
+command=/srv/webvirtcloud/venv/bin/python3 /srv/webvirtcloud/console/socketiod -d
+directory=/srv/webvirtcloud
+user=www-data
+autostart=true
+autorestart=true
+redirect_stderr=true
diff --git a/conf/systemd/README.md b/conf/systemd/README.md
new file mode 100644
index 0000000..4333f36
--- /dev/null
+++ b/conf/systemd/README.md
@@ -0,0 +1,15 @@
+# Ubuntu Service Files
+
+I choose to install this service on Ubuntu 22.04
+
+The process is not fully documented but I wanted to contribute the service files
+
+The file webvirt is beeing installed into /etc/default/webvirt and allows you to easily change the location of the webvirtcloud installation path
+
+The PATH variable being set for these services includes /usr/bin which contains the ssh executable. That is being used by webvirt-cloud and webvirt-novncd
+
+Should the executable be located in another location please adjust the path
+
+The error you should be seeing is "ssh executable not found"
+
+
diff --git a/conf/systemd/install.sh b/conf/systemd/install.sh
new file mode 100755
index 0000000..5fc9d07
--- /dev/null
+++ b/conf/systemd/install.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+FILEPATH=$(readlink -f "$0");
+SCRIPTPATH=$(dirname "$FILEPATH");
+cd "$SCRIPTPATH"
+cp webvirt-* /lib/systemd/system/
+cp webvirt /etc/default/
+echo Run to start services \"systemctl daemon-reload\; systemctl enable --now $(ls webvirt-* | tr "\n" " ")\"
diff --git a/conf/systemd/webvirt b/conf/systemd/webvirt
new file mode 100644
index 0000000..c206062
--- /dev/null
+++ b/conf/systemd/webvirt
@@ -0,0 +1,2 @@
+WEBVIRT_PATH="/srv/webvirtcloud"
+PATH="$WEBVIRT_PATH/venv/bin:/usr/bin"
diff --git a/conf/systemd/webvirt-cloud.service b/conf/systemd/webvirt-cloud.service
new file mode 100644
index 0000000..9fe3307
--- /dev/null
+++ b/conf/systemd/webvirt-cloud.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Webvirt Cloud Webinterface
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+Restart=on-failure
+RestartSec=10
+User=www-data
+Group=www-data
+LimitNOFILE=64000
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+EnvironmentFile=/etc/default/webvirt
+
+ExecStart=/bin/bash -c "cd ${WEBVIRT_PATH};${WEBVIRT_PATH}/venv/bin/gunicorn webvirtcloud.wsgi:application -c ${WEBVIRT_PATH}/gunicorn.conf.py"
+
+# Make sure stderr/stdout is captured in the systemd journal.
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/conf/systemd/webvirt-gstfsd.service b/conf/systemd/webvirt-gstfsd.service
new file mode 100644
index 0000000..6e89e1c
--- /dev/null
+++ b/conf/systemd/webvirt-gstfsd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Webvirt Cloud GSTFSD
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+Restart=on-failure
+RestartSec=10
+LimitNOFILE=64000
+
+ExecStart=/usr/bin/python3 /usr/local/bin/gstfsd
+
+# Make sure stderr/stdout is captured in the systemd journal.
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/conf/systemd/webvirt-novncd.service b/conf/systemd/webvirt-novncd.service
new file mode 100644
index 0000000..0cac27d
--- /dev/null
+++ b/conf/systemd/webvirt-novncd.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Webvirt Cloud NOVNCD
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+Restart=on-failure
+RestartSec=10
+User=www-data
+Group=www-data
+LimitNOFILE=64000
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+EnvironmentFile=/etc/default/webvirt
+
+ExecStart=/bin/bash -c "cd ${WEBVIRT_PATH};${WEBVIRT_PATH}/venv/bin/python3 ${WEBVIRT_PATH}/console/novncd"
+
+# Make sure stderr/stdout is captured in the systemd journal.
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/conf/systemd/webvirt-socketiod.service b/conf/systemd/webvirt-socketiod.service
new file mode 100644
index 0000000..741f0dc
--- /dev/null
+++ b/conf/systemd/webvirt-socketiod.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Webvirt Cloud NOVNCD
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+Restart=on-failure
+RestartSec=10
+User=www-data
+Group=www-data
+LimitNOFILE=64000
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+EnvironmentFile=/etc/default/webvirt
+
+ExecStart=/bin/bash -c "cd ${WEBVIRT_PATH};${WEBVIRT_PATH}/venv/bin/python3 ${WEBVIRT_PATH}/console/socketiod -d"
+
+# Make sure stderr/stdout is captured in the systemd journal.
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/conf/test-vm.xml b/conf/test-vm.xml
new file mode 100644
index 0000000..d14f25f
--- /dev/null
+++ b/conf/test-vm.xml
@@ -0,0 +1,119 @@
+
+ test-vm
+ 1bd3c1f2-dd12-4b8d-a298-dff387cb9f93
+ 131072
+ 131072
+ 1
+
+ hvm
+
+
+
+ destroy
+ restart
+ restart
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/console/admin.py b/console/admin.py
deleted file mode 100644
index 8c38f3f..0000000
--- a/console/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/console/novncd b/console/novncd
index cff4376..18de93b 100755
--- a/console/novncd
+++ b/console/novncd
@@ -1,72 +1,72 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
import logging
import django
+import signal
+signal.signal(signal.SIGCHLD, signal.SIG_IGN)
+
DIR_PATH = os.path.dirname(os.path.abspath(__file__))
-ROOT_PATH = os.path.abspath(os.path.join(DIR_PATH, '..', ''))
+ROOT_PATH = os.path.abspath(os.path.join(DIR_PATH, "..", ""))
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "webvirtcloud.settings")
-CERT = DIR_PATH + '/cert.pem'
+CERT = DIR_PATH + "/cert.pem"
if ROOT_PATH not in sys.path:
sys.path.append(ROOT_PATH)
django.setup()
-# VENV_PATH = ROOT_PATH + '/venv/lib/python2.7/site-packages'
-# if VENV_PATH not in sys.path:
-# sys.path.append(VENV_PATH)
-
import re
-import Cookie
import socket
+
+# from six.moves import http_cookies as Cookie
+from http import cookies as Cookie
from webvirtcloud.settings import WS_PORT, WS_HOST, WS_CERT
from vrtManager.connection import CONN_SSH, CONN_SOCKET
-from tunnel import Tunnel
-
+from console.sshtunnels import SSHTunnels
from optparse import OptionParser
+
parser = OptionParser()
-parser.add_option("-v",
- "--verbose",
- dest="verbose",
- action="store_true",
- help="Verbose mode",
- default=False)
+parser.add_option(
+ "-v",
+ "--verbose",
+ dest="verbose",
+ action="store_true",
+ help="Verbose mode",
+ default=False,
+)
-parser.add_option("-d",
- "--debug",
- dest="debug",
- action="store_true",
- help="Debug mode",
- default=False)
+parser.add_option(
+ "-d", "--debug", dest="debug", action="store_true", help="Debug mode", default=False
+)
-parser.add_option("-H",
- "--host",
- dest="host",
- action="store",
- help="Listen host",
- default=WS_HOST)
+parser.add_option(
+ "-H", "--host", dest="host", action="store", help="Listen host", default=WS_HOST
+)
-parser.add_option("-p",
- "--port",
- dest="port",
- action="store",
- help="Listen port",
- default=WS_PORT or 6080)
+parser.add_option(
+ "-p",
+ "--port",
+ dest="port",
+ action="store",
+ help="Listen port",
+ default=WS_PORT or 6080,
+)
-parser.add_option("-c",
- "--cert",
- dest="cert",
- action="store",
- help="Certificate file path",
- default=WS_CERT or CERT)
+parser.add_option(
+ "-c",
+ "--cert",
+ dest="cert",
+ action="store",
+ help="Certificate file path",
+ default=WS_CERT or CERT,
+)
(options, args) = parser.parse_args()
-
FORMAT = "%(asctime)s - %(name)s - %(levelname)s : %(message)s"
if options.debug:
logging.basicConfig(level=logging.DEBUG, format=FORMAT)
@@ -78,6 +78,7 @@ else:
try:
from websockify import WebSocketProxy
+
try:
from websockify import ProxyRequestHandler
except ImportError:
@@ -88,8 +89,7 @@ except ImportError:
try:
from novnc.wsproxy import WebSocketProxy
except ImportError:
- print('Unable to import a websockify implementation, ' +
- 'please install one')
+ print("Unable to import a websockify implementation,\n please install one")
sys.exit(1)
else:
USE_HANDLER = False
@@ -100,46 +100,76 @@ def get_connection_infos(token):
from vrtManager.instance import wvmInstance
try:
- temptoken = token.split('-', 1)
+ temptoken = token.split("-", 1)
host = int(temptoken[0])
uuid = temptoken[1]
instance = Instance.objects.get(compute_id=host, uuid=uuid)
- conn = wvmInstance(instance.compute.hostname,
- instance.compute.login,
- instance.compute.password,
- instance.compute.type,
- instance.name)
- if instance.compute.hostname.count(':'):
- connhost = instance.compute.hostname.split(':')[0]
- connport = instance.compute.hostname.split(':')[1]
+ conn = wvmInstance(
+ instance.compute.hostname,
+ instance.compute.login,
+ instance.compute.password,
+ instance.compute.type,
+ instance.name,
+ )
+ if instance.compute.hostname.count(":"):
+ connhost = instance.compute.hostname.split(":")[0]
+ connport = instance.compute.hostname.split(":")[1]
else:
connhost = instance.compute.hostname
connport = 22
connuser = instance.compute.login
conntype = instance.compute.type
- console_host = conn.get_console_listen_addr()
+ console_host = conn.get_console_listener_addr()
console_port = conn.get_console_port()
console_socket = conn.get_console_socket()
- except Exception, e:
- logging.error('Fail to retrieve console connexion infos for token %s : %s' % (token, e))
+ except Exception as e:
+ logging.error(
+ "Fail to retrieve console connection infos for token %s : %s" % (token, e)
+ )
raise
- return (connhost, connport, connuser, conntype, console_host,
- console_port, console_socket)
+ return (
+ connhost,
+ connport,
+ connuser,
+ conntype,
+ console_host,
+ console_port,
+ console_socket,
+ )
class CompatibilityMixIn(object):
def _new_client(self, daemon, socket_factory):
- cookie = Cookie.SimpleCookie()
- cookie.load(self.headers.getheader('cookie'))
- if 'token' not in cookie:
- self.msg('No token cookie found !')
- return False
- token = cookie['token'].value
+ # NoVNC uses it's own convention that forward token
+ # from the request to a cookie header, we should check
+ # also for this behavior
+ hcookie = self.headers.get("cookie")
- (connhost, connport, connuser, conntype, console_host, console_port,
- console_socket) = get_connection_infos(token)
+ if hcookie:
+ cookie = Cookie.SimpleCookie()
+ for hcookie_part in hcookie.split(";"):
+ hcookie_part = hcookie_part.lstrip()
+ try:
+ cookie.load(hcookie_part)
+ except Cookie.CookieError:
+ # NOTE(stgleb): Do not print out cookie content
+ # for security reasons.
+ self.msg("Found malformed cookie")
+ else:
+ if "token" in cookie:
+ token = cookie["token"].value
- cnx_debug_msg = "Connexion infos :\n"
+ (
+ connhost,
+ connport,
+ connuser,
+ conntype,
+ console_host,
+ console_port,
+ console_socket,
+ ) = get_connection_infos(token)
+
+ cnx_debug_msg = "Connection infos :\n"
cnx_debug_msg += "- connhost : '%s'\n" % connhost
cnx_debug_msg += "- connport : '%s'\n" % connport
cnx_debug_msg += "- connuser : '%s'\n" % connuser
@@ -151,31 +181,49 @@ class CompatibilityMixIn(object):
if console_socket and conntype == CONN_SOCKET:
# Local socket on local host
- self.msg('Try to open local socket %s' % console_socket)
+ self.msg("Try to open local socket %s" % console_socket)
tsock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
tsock.connect(console_socket)
- elif console_socket or re.match('^127\.', console_host):
+ elif console_socket or re.match("^127\.", console_host):
# Need tunnel to physical host
if conntype != CONN_SSH:
- self.msg("Need a tunnel to access console but can't mount " +
- "one because it's not a SSH host")
- raise
+ self.msg(
+ "Need a tunnel to access console but can't mount "
+ + "one because it's not a SSH host"
+ )
+ raise Exception(self.msg)
try:
# generate a string with all placeholders to avoid TypeErrors
# in sprintf
# https://github.com/retspen/webvirtmgr/pull/497
error_msg = "Try to open tunnel on %s@%s:%s on console %s:%s "
error_msg += "(or socket %s)"
- self.msg(error_msg % (connuser, connhost, connport,
- console_host, console_port, console_socket))
- tunnel = Tunnel()
- fd = tunnel.open(connhost, connuser, connport,
- console_host, console_port, console_socket)
+ self.msg(
+ error_msg
+ % (
+ connuser,
+ connhost,
+ connport,
+ console_host,
+ console_port,
+ console_socket,
+ )
+ )
+ tunnel = SSHTunnels(
+ connhost,
+ connuser,
+ connport,
+ console_host,
+ console_port,
+ console_socket,
+ )
+ fd = tunnel.open_new()
+ tunnel.unlock()
tsock = socket.fromfd(fd, socket.AF_INET, socket.SOCK_STREAM)
except Exception as e:
self.msg("Fail to open tunnel : %s" % e)
raise
- self.msg("Tunnel openned")
+ self.msg("Tunnel opened")
else:
# Direct access
self.msg("connecting to: %s:%s" % (connhost, console_port))
@@ -189,20 +237,21 @@ class CompatibilityMixIn(object):
try:
self.msg("Start proxying")
self.do_proxy(tsock)
- except:
+ except Exception:
if tunnel:
self.vmsg(
- "%s:%s (via %s@%s:%s) : Target closed" %
- (console_host, console_port, connuser, connhost, connport))
+ "%s:%s (via %s@%s:%s) : Websocket client or Target closed"
+ % (console_host, console_port, connuser, connhost, connport)
+ )
if tsock:
tsock.shutdown(socket.SHUT_RDWR)
tsock.close()
- if tunnel:
- tunnel.close()
+ tunnel.close_all()
raise
if USE_HANDLER:
+
class NovaProxyRequestHandler(ProxyRequestHandler, CompatibilityMixIn):
def msg(self, *args, **kwargs):
self.log_message(*args, **kwargs)
@@ -222,8 +271,8 @@ if USE_HANDLER:
self._new_client(daemon, socket_factory)
else:
- class NovaWebSocketProxy(WebSocketProxy, CompatibilityMixIn):
+ class NovaWebSocketProxy(WebSocketProxy, CompatibilityMixIn):
def new_client(self):
"""
Called after a new WebSocket connection has been established.
@@ -234,39 +283,44 @@ else:
self._new_client(daemon, socket_factory)
-if __name__ == '__main__':
+
+if __name__ == "__main__":
if USE_HANDLER:
# Create the WebSocketProxy with NovaProxyRequestHandler handler
- server = WebSocketProxy(RequestHandlerClass=NovaProxyRequestHandler,
- listen_host=options.host,
- listen_port=options.port,
- source_is_ipv6=False,
- verbose=options.verbose,
- cert=options.cert,
- key=None,
- ssl_only=False,
- daemon=False,
- record=False,
- web=False,
- traffic=False,
- target_host='ignore',
- target_port='ignore',
- wrap_mode='exit',
- wrap_cmd=None)
+ server = WebSocketProxy(
+ RequestHandlerClass=NovaProxyRequestHandler,
+ listen_host=options.host,
+ listen_port=options.port,
+ source_is_ipv6=False,
+ verbose=options.verbose,
+ cert=options.cert,
+ key=None,
+ ssl_only=False,
+ daemon=False,
+ record=False,
+ web=False,
+ traffic=False,
+ target_host="ignore",
+ target_port="ignore",
+ wrap_mode="exit",
+ wrap_cmd=None,
+ )
else:
# Create the NovaWebSockets proxy
- server = NovaWebSocketProxy(listen_host=options.host,
- listen_port=options.port,
- source_is_ipv6=False,
- verbose=options.verbose,
- cert=options.cert,
- key=None,
- ssl_only=False,
- daemon=False,
- record=False,
- web=False,
- target_host='ignore',
- target_port='ignore',
- wrap_mode='exit',
- wrap_cmd=None)
+ server = NovaWebSocketProxy(
+ listen_host=options.host,
+ listen_port=options.port,
+ source_is_ipv6=False,
+ verbose=options.verbose,
+ cert=options.cert,
+ key=None,
+ ssl_only=False,
+ daemon=False,
+ record=False,
+ web=False,
+ target_host="ignore",
+ target_port="ignore",
+ wrap_mode="exit",
+ wrap_cmd=None,
+ )
server.start_server()
diff --git a/console/socketiod b/console/socketiod
new file mode 100755
index 0000000..55342d1
--- /dev/null
+++ b/console/socketiod
@@ -0,0 +1,219 @@
+#!/usr/bin/env python3
+import os
+import sys
+import logging
+import django
+
+import signal
+signal.signal(signal.SIGCHLD, signal.SIG_IGN)
+
+DIR_PATH = os.path.dirname(os.path.abspath(__file__))
+ROOT_PATH = os.path.abspath(os.path.join(DIR_PATH, "..", ""))
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "webvirtcloud.settings")
+CERT = DIR_PATH + "/cert.pem"
+
+if ROOT_PATH not in sys.path:
+ sys.path.append(ROOT_PATH)
+
+django.setup()
+
+import re
+import tempfile
+import io
+import socket
+import socketio
+import pty
+import select
+import subprocess
+import struct
+import fcntl
+import termios
+import signal
+import eventlet
+import atexit
+import tty
+import termios
+import libvirt
+
+# from six.moves import http_cookies as Cookie
+from http import cookies as Cookie
+from webvirtcloud.settings import SOCKETIO_PORT, SOCKETIO_HOST
+from vrtManager.connection import CONN_SSH, CONN_SOCKET
+from optparse import OptionParser
+
+parser = OptionParser()
+
+parser.add_option(
+ "-v",
+ "--verbose",
+ dest="verbose",
+ action="store_true",
+ help="Verbose mode",
+ default=False,
+)
+
+parser.add_option(
+ "-d", "--debug", dest="debug", action="store_true", help="Debug mode", default=False
+)
+
+parser.add_option(
+ "-H",
+ "--host",
+ dest="host",
+ action="store",
+ help="Listen host",
+ default=SOCKETIO_HOST,
+)
+
+parser.add_option(
+ "-p",
+ "--port",
+ dest="port",
+ action="store",
+ help="Listen port",
+ default=SOCKETIO_PORT or 6081,
+)
+
+(options, args) = parser.parse_args()
+
+FORMAT = "%(asctime)s - %(name)s - %(levelname)s : %(message)s"
+if options.debug:
+ logging.basicConfig(level=logging.DEBUG, format=FORMAT)
+ options.verbose = True
+elif options.verbose:
+ logging.basicConfig(level=logging.INFO, format=FORMAT)
+else:
+ logging.basicConfig(level=logging.WARNING, format=FORMAT)
+
+async_mode = "eventlet"
+sio = socketio.Server(async_mode=async_mode, cors_allowed_origins=[])
+
+fd = None
+child_pid = None
+
+
+def get_connection_infos(token):
+ from instances.models import Instance
+ from vrtManager.instance import wvmInstance
+
+ try:
+ temptoken = token.split("-", 1)
+ host = int(temptoken[0])
+ uuid = temptoken[1]
+ instance = Instance.objects.get(compute_id=host, uuid=uuid)
+ conn = wvmInstance(
+ instance.compute.hostname,
+ instance.compute.login,
+ instance.compute.password,
+ instance.compute.type,
+ instance.name,
+ )
+ except Exception as e:
+ logging.error(
+ "Fail to retrieve console connection infos for token %s : %s" % (token, e)
+ )
+ raise
+ return (instance, conn)
+
+
+def set_winsize(fd, row, col, xpix=0, ypix=0):
+ winsize = struct.pack("HHHH", row, col, xpix, ypix)
+ fcntl.ioctl(fd, termios.TIOCSWINSZ, winsize)
+
+
+def read_and_forward_pty_output():
+ global fd
+ max_read_bytes = 1024 * 20
+ while True:
+ sio.sleep(0.01)
+ if fd:
+ timeout_sec = 0
+ (data_ready, _, _) = select.select([fd], [], [], timeout_sec)
+ if data_ready:
+ output = os.read(fd, max_read_bytes).decode()
+ sio.emit("pty_output", {"output": output})
+ else:
+ return
+
+
+@sio.event
+def resize(sid, message):
+ global fd
+ if fd:
+ set_winsize(fd, message["rows"], message["cols"])
+
+
+@sio.event
+def pty_input(sid, message):
+ global fd
+ if fd:
+ os.write(fd, message["input"].encode())
+
+
+@sio.event
+def disconnect_request(sid):
+ sio.disconnect(sid)
+
+
+@sio.event
+def connect(sid, environ):
+ global fd
+ global child_pid
+
+ hcookie = environ.get("HTTP_COOKIE")
+ if hcookie:
+ cookie = Cookie.SimpleCookie()
+ for hcookie_part in hcookie.split(";"):
+ hcookie_part = hcookie_part.lstrip()
+ try:
+ cookie.load(hcookie_part)
+ except Cookie.CookieError:
+ logging.warn("Found malformed cookie")
+ else:
+ if "token" in cookie:
+ token = cookie["token"].value
+
+ if child_pid:
+ # already started child process, don't start another
+ # write a new line so that when a client refresh the shell prompt is printed
+ os.write(fd, str.encode("\n"))
+ return
+
+ # create child process attached to a pty we can read from and write to
+ (child_pid, fd) = pty.fork()
+
+ if child_pid == 0:
+ (instance, conn) = get_connection_infos(token)
+ uuid = conn.get_uuid()
+ uri = conn.wvm.getURI()
+
+ subprocess.run(["conf/daemon/consolecallback", uri, uuid])
+ else:
+ # this is the parent process fork.
+ sio.start_background_task(target=read_and_forward_pty_output)
+
+
+@sio.event
+def disconnect(sid):
+
+ global fd
+ global child_pid
+
+ # kill pty process
+ try:
+ os.kill(child_pid, signal.SIGKILL)
+ os.wait()
+ except ProcessLookupError:
+ pass
+ except ChildProcessError:
+ pass
+
+ # reset the variables
+ fd = None
+ child_pid = None
+
+
+app = socketio.WSGIApp(sio)
+import eventlet
+
+eventlet.wsgi.server(eventlet.listen((options.host, int(options.port))), app)
diff --git a/console/sshtunnels.py b/console/sshtunnels.py
new file mode 100644
index 0000000..7f0376e
--- /dev/null
+++ b/console/sshtunnels.py
@@ -0,0 +1,217 @@
+# Copyright (C) 2014, 2015 Red Hat, Inc.
+#
+# This work is licensed under the GNU GPLv2 or later.
+# See the COPYING file in the top-level directory.
+
+import functools
+import logging as log
+import os
+import queue
+import signal
+import socket
+import threading
+
+
+class _TunnelScheduler(object):
+ """
+ If the user is using Spice + SSH URI + no SSH keys, we need to
+ serialize connection opening otherwise ssh-askpass gets all angry.
+ This handles the locking and scheduling.
+ It's only instantiated once for the whole app, because we serialize
+ independent of connection, vm, etc.
+ """
+
+ def __init__(self):
+ self._thread = None
+ self._queue = queue.Queue()
+ self._lock = threading.Lock()
+
+ def _handle_queue(self):
+ while True:
+ (
+ lock_cb,
+ cb,
+ args,
+ ) = self._queue.get()
+ lock_cb()
+ cb(*args)
+
+ def schedule(self, lock_cb, cb, *args):
+ if not self._thread:
+ self._thread = threading.Thread(
+ name="Tunnel thread", target=self._handle_queue, args=()
+ )
+ self._thread.daemon = True
+ if not self._thread.is_alive():
+ self._thread.start()
+ self._queue.put((lock_cb, cb, args))
+
+ def lock(self):
+ self._lock.acquire()
+
+ def unlock(self):
+ self._lock.release()
+
+
+_tunnel_scheduler = _TunnelScheduler()
+
+
+class _Tunnel(object):
+ def __init__(self):
+ self._pid = None
+ self._closed = False
+ self._errfd = None
+
+ def close(self):
+ if self._closed:
+ return
+ self._closed = True
+
+ log.debug(
+ "Close tunnel PID=%s ERRFD=%s",
+ self._pid,
+ self._errfd and self._errfd.fileno() or None,
+ )
+
+ # Since this is a socket object, the file descriptor is closed
+ # when it's garbage collected.
+ self._errfd = None
+
+ if self._pid:
+ os.kill(self._pid, signal.SIGKILL)
+ os.waitpid(self._pid, 0)
+ self._pid = None
+
+ def get_err_output(self):
+ errout = ""
+ while True:
+ try:
+ new = self._errfd.recv(1024)
+ except Exception:
+ break
+
+ if not new:
+ break
+
+ errout += new.decode()
+
+ return errout
+
+ def open(self, argv, sshfd):
+ if self._closed:
+ return
+
+ errfds = socket.socketpair()
+ pid = os.fork()
+ if pid == 0:
+ errfds[0].close()
+
+ os.dup2(sshfd.fileno(), 0)
+ os.dup2(sshfd.fileno(), 1)
+ os.dup2(errfds[1].fileno(), 2)
+ os.execlp(*argv)
+ os._exit(1) # pylint: disable=protected-access
+
+ sshfd.close()
+ errfds[1].close()
+
+ self._errfd = errfds[0]
+ self._errfd.setblocking(0)
+ log.debug("Opened tunnel PID=%d ERRFD=%d", pid, self._errfd.fileno())
+
+ self._pid = pid
+
+
+def _make_ssh_command(connhost, connuser, connport, gaddr, gport, gsocket):
+
+ # Build SSH cmd
+ argv = ["ssh", "ssh"]
+ if connport:
+ argv += ["-p", str(connport)]
+
+ if connuser:
+ argv += ["-l", connuser]
+
+ argv += [connhost]
+
+ # Build 'nc' command run on the remote host
+ #
+ # This ugly thing is a shell script to detect availability of
+ # the -q option for 'nc': debian and suse based distros need this
+ # flag to ensure the remote nc will exit on EOF, so it will go away
+ # when we close the VNC tunnel. If it doesn't go away, subsequent
+ # VNC connection attempts will hang.
+ #
+ # Fedora's 'nc' doesn't have this option, and apparently defaults
+ # to the desired behavior.
+ #
+ if gsocket:
+ nc_params = "-U %s" % gsocket
+ else:
+ nc_params = "%s %s" % (gaddr, gport)
+
+ nc_cmd = (
+ """nc -q 2>&1 | grep "requires an argument" >/dev/null;"""
+ """if [ $? -eq 0 ] ; then"""
+ """ CMD="nc -q 0 %(nc_params)s";"""
+ """else"""
+ """ CMD="nc %(nc_params)s";"""
+ """fi;"""
+ """eval "$CMD";""" % {"nc_params": nc_params}
+ )
+
+ argv.append("sh -c")
+ argv.append("'%s'" % nc_cmd)
+
+ argv_str = functools.reduce(lambda x, y: x + " " + y, argv[1:])
+ log.debug("Pre-generated ssh command for info: %s", argv_str)
+ return argv
+
+
+class SSHTunnels(object):
+ def __init__(self, connhost, connuser, connport, gaddr, gport, gsocket):
+ self._tunnels = []
+ self._sshcommand = _make_ssh_command(
+ connhost, connuser, connport, gaddr, gport, gsocket
+ )
+ self._locked = False
+
+ def open_new(self):
+ t = _Tunnel()
+ self._tunnels.append(t)
+
+ # socket FDs are closed when the object is garbage collected. This
+ # can close an FD behind spice/vnc's back which causes crashes.
+ #
+ # Dup a bare FD for the viewer side of things, but keep the high
+ # level socket object for the SSH side, since it simplifies things
+ # in that area.
+ viewerfd, sshfd = socket.socketpair()
+ _tunnel_scheduler.schedule(self._lock, t.open, self._sshcommand, sshfd)
+
+ retfd = os.dup(viewerfd.fileno())
+ log.debug("Generated tunnel fd=%s for viewer", retfd)
+ return retfd
+
+ def close_all(self):
+ for l in self._tunnels:
+ l.close()
+ self._tunnels = []
+ self.unlock()
+
+ def get_err_output(self):
+ errstrings = []
+ for l in self._tunnels:
+ e = l.get_err_output().strip()
+ if e and e not in errstrings:
+ errstrings.append(e)
+ return "\n".join(errstrings)
+
+ def _lock(self):
+ _tunnel_scheduler.lock()
+ self._locked = True
+
+ def unlock(self, *args, **kwargs):
+ if self._locked:
+ _tunnel_scheduler.unlock(*args, **kwargs)
+ self._locked = False
diff --git a/console/templates/console-base.html b/console/templates/console-base.html
new file mode 100644
index 0000000..11e38fd
--- /dev/null
+++ b/console/templates/console-base.html
@@ -0,0 +1,116 @@
+{% load static %}
+{% load i18n %}
+
+
+
+
+
+
+
+
+
+
+
+ {% block head %}{% endblock %}
+
+
+
+
+ WebVirtCloud - Spice Client - Full
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block content %}
+WebVirtCloud - Spice - Lite
+
+
+
+
+
+
+{% endblock %}
+{% block content %}
+WebVirtCloud - noVNC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block content %}
+WebVirtCloud - noVNC - Lite
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block content %}
+WebVirtCloud - XTerm
+
+
+
+
+
+
+
+{% endblock %}
+{% block content %}
+
-# Copyright (C) 2010 Marc-AndrÊ Lureau
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA.
-#
-
-import os
-import socket
-import signal
-import logging
-
-
-class Tunnel(object):
- def __init__(self):
- self.outfd = None
- self.errfd = None
- self.pid = None
-
- def open(self, connhost, connuser, connport, gaddr, gport, gsocket):
- if self.outfd is not None:
- return -1
-
- # Build SSH cmd
- argv = ["ssh", "ssh"]
- if connport:
- argv += ["-p", str(connport)]
-
- if connuser:
- argv += ['-l', connuser]
-
- argv += [connhost]
-
- # Build 'nc' command run on the remote host
- #
- # This ugly thing is a shell script to detect availability of
- # the -q option for 'nc': debian and suse based distros need this
- # flag to ensure the remote nc will exit on EOF, so it will go away
- # when we close the VNC tunnel. If it doesn't go away, subsequent
- # VNC connection attempts will hang.
- #
- # Fedora's 'nc' doesn't have this option, and apparently defaults
- # to the desired behavior.
- #
- if gsocket:
- nc_params = "-U %s" % gsocket
- else:
- nc_params = "%s %s" % (gaddr, gport)
-
- nc_cmd = (
- """nc -q 2>&1 | grep "requires an argument" >/dev/null;"""
- """if [ $? -eq 0 ] ; then"""
- """ CMD="nc -q 0 %(nc_params)s";"""
- """else"""
- """ CMD="nc %(nc_params)s";"""
- """fi;"""
- """eval "$CMD";""" %
- {'nc_params': nc_params})
-
- argv.append("sh -c")
- argv.append("'%s'" % nc_cmd)
-
- argv_str = reduce(lambda x, y: x + " " + y, argv[1:])
- logging.debug("Creating SSH tunnel: %s", argv_str)
-
- fds = socket.socketpair()
- errorfds = socket.socketpair()
-
- pid = os.fork()
- if pid == 0:
- fds[0].close()
- errorfds[0].close()
-
- os.close(0)
- os.close(1)
- os.close(2)
- os.dup(fds[1].fileno())
- os.dup(fds[1].fileno())
- os.dup(errorfds[1].fileno())
- os.execlp(*argv)
- os._exit(1)
- else:
- fds[1].close()
- errorfds[1].close()
-
- logging.debug("Tunnel PID=%d OUTFD=%d ERRFD=%d",
- pid, fds[0].fileno(), errorfds[0].fileno())
- errorfds[0].setblocking(0)
-
- self.outfd = fds[0]
- self.errfd = errorfds[0]
- self.pid = pid
-
- fd = fds[0].fileno()
- if fd < 0:
- raise SystemError("can't open a new tunnel: fd=%d" % fd)
- return fd
-
- def close(self):
- if self.outfd is None:
- return
-
- logging.debug("Shutting down tunnel PID=%d OUTFD=%d ERRFD=%d",
- self.pid, self.outfd.fileno(),
- self.errfd.fileno())
- self.outfd.close()
- self.outfd = None
- self.errfd.close()
- self.errfd = None
-
- os.kill(self.pid, signal.SIGKILL)
- self.pid = None
-
- def get_err_output(self):
- errout = ""
- while True:
- try:
- new = self.errfd.recv(1024)
- except:
- break
-
- if not new:
- break
-
- errout += new
-
- return errout
diff --git a/console/views.py b/console/views.py
index a123064..f530df1 100644
--- a/console/views.py
+++ b/console/views.py
@@ -1,12 +1,24 @@
import re
+
+from vrtManager.util import randomUUID
+
+from django.http.response import HttpResponseServerError
from django.shortcuts import render
-from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.utils.translation import gettext_lazy as _
+from libvirt import libvirtError
+
+from accounts.models import UserInstance
+from appsettings.settings import app_settings
from instances.models import Instance
from vrtManager.instance import wvmInstance
-from webvirtcloud.settings import WS_PORT
-from webvirtcloud.settings import WS_PUBLIC_HOST
-from libvirt import libvirtError
+from webvirtcloud.settings import (
+ WS_PUBLIC_HOST,
+ WS_PUBLIC_PATH,
+ WS_PUBLIC_PORT,
+ SOCKETIO_PUBLIC_HOST,
+ SOCKETIO_PUBLIC_PORT,
+ SOCKETIO_PUBLIC_PATH,
+)
def console(request):
@@ -14,43 +26,90 @@ def console(request):
:param request:
:return:
"""
+ console_error = None
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('login'))
-
- if request.method == 'GET':
- token = request.GET.get('token', '')
+ if request.method == "GET":
+ token = request.GET.get("token", "")
+ view_type = request.GET.get("view", "lite")
+ view_only = request.GET.get("view_only", app_settings.CONSOLE_VIEW_ONLY.lower())
+ scale = request.GET.get("scale", app_settings.CONSOLE_SCALE.lower())
+ resize_session = request.GET.get(
+ "resize_session", app_settings.CONSOLE_RESIZE_SESSION.lower()
+ )
+ clip_viewport = request.GET.get(
+ "clip_viewport", app_settings.CONSOLE_CLIP_VIEWPORT.lower()
+ )
try:
- temptoken = token.split('-', 1)
+ temptoken = token.split("-", 1)
host = int(temptoken[0])
uuid = temptoken[1]
- instance = Instance.objects.get(compute_id=host, uuid=uuid)
- conn = wvmInstance(instance.compute.hostname,
- instance.compute.login,
- instance.compute.password,
- instance.compute.type,
- instance.name)
+
+ if not request.user.is_superuser and not request.user.has_perm(
+ "instances.view_instances"
+ ):
+ try:
+ userInstance = UserInstance.objects.get(
+ instance__compute_id=host,
+ instance__uuid=uuid,
+ user__id=request.user.id,
+ )
+ instance = Instance.objects.get(compute_id=host, uuid=uuid)
+ except UserInstance.DoesNotExist:
+ instance = None
+ console_error = _(
+ "User does not have permission to access console or host/instance not exist"
+ )
+ return HttpResponseServerError(console_error)
+ else:
+ instance = Instance.objects.get(compute_id=host, uuid=uuid)
+
+ conn = wvmInstance(
+ instance.compute.hostname,
+ instance.compute.login,
+ instance.compute.password,
+ instance.compute.type,
+ instance.name,
+ )
console_type = conn.get_console_type()
console_websocket_port = conn.get_console_websocket_port()
console_passwd = conn.get_console_passwd()
- except libvirtError as lib_err:
+ except libvirtError:
console_type = None
console_websocket_port = None
console_passwd = None
- ws_port = console_websocket_port if console_websocket_port else WS_PORT
+ ws_port = console_websocket_port if console_websocket_port else WS_PUBLIC_PORT
ws_host = WS_PUBLIC_HOST if WS_PUBLIC_HOST else request.get_host()
+ ws_path = WS_PUBLIC_PATH if WS_PUBLIC_PATH else "/"
- if ':' in ws_host:
- ws_host = re.sub(':[0-9]+', '', ws_host)
+ if ":" in ws_host:
+ ws_host = re.sub(":[0-9]+", "", ws_host)
- if console_type == 'vnc':
- response = render(request, 'console-vnc.html', locals())
- elif console_type == 'spice':
- response = render(request, 'console-spice.html', locals())
+ if console_type == "vnc" or console_type == "spice":
+ console_page = "console-" + console_type + "-" + view_type + ".html"
+ response = render(request, console_page, locals())
+ elif console_type == "pty":
+ socketio_host = (
+ SOCKETIO_PUBLIC_HOST if SOCKETIO_PUBLIC_HOST else request.get_host()
+ )
+ socketio_port = SOCKETIO_PUBLIC_PORT if SOCKETIO_PUBLIC_PORT else 6081
+ socketio_path = SOCKETIO_PUBLIC_PATH if SOCKETIO_PUBLIC_PATH else "/"
+
+ if ":" in socketio_host:
+ socketio_host = re.sub(":[0-9]+", "", socketio_host)
+
+ response = render(request, "console-xterm.html", locals())
else:
- response = "Console type %s no support" % console_type
+ if console_type is None:
+ console_error = _(
+ "Fail to get console. Please check the console configuration of your VM."
+ )
+ else:
+ console_error = _("Console type '%(type)s' has not support") % {
+ "type": console_type
+ }
+ response = render(request, "console-vnc-lite.html", locals())
- response.set_cookie('token', token)
+ response.set_cookie("token", token)
return response
diff --git a/create/admin.py b/create/admin.py
deleted file mode 100644
index 8c38f3f..0000000
--- a/create/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/create/forms.py b/create/forms.py
deleted file mode 100644
index 5b9fab5..0000000
--- a/create/forms.py
+++ /dev/null
@@ -1,55 +0,0 @@
-import re
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-from create.models import Flavor
-
-
-class FlavorAddForm(forms.Form):
- label = forms.CharField(label="Name",
- error_messages={'required': _('No flavor name has been entered')},
- max_length=20)
- vcpu = forms.IntegerField(label="VCPU",
- error_messages={'required': _('No VCPU has been entered')}, )
- disk = forms.IntegerField(label="HDD",
- error_messages={'required': _('No HDD image has been entered')}, )
- memory = forms.IntegerField(label="RAM",
- error_messages={'required': _('No RAM size has been entered')}, )
-
- def clean_name(self):
- label = self.cleaned_data['label']
- have_symbol = re.match('^[a-zA-Z0-9._-]+$', label)
- if not have_symbol:
- raise forms.ValidationError(_('The flavor name must not contain any special characters'))
- elif len(label) > 20:
- raise forms.ValidationError(_('The flavor name must not exceed 20 characters'))
- try:
- Flavor.objects.get(label=label)
- except Flavor.DoesNotExist:
- return label
- raise forms.ValidationError(_('Flavor name is already use'))
-
-
-class NewVMForm(forms.Form):
- name = forms.CharField(error_messages={'required': _('No Virtual Machine name has been entered')},
- max_length=20)
- vcpu = forms.IntegerField(error_messages={'required': _('No VCPU has been entered')})
- host_model = forms.BooleanField(required=False)
- disk = forms.IntegerField(required=False)
- memory = forms.IntegerField(error_messages={'required': _('No RAM size has been entered')})
- networks = forms.CharField(error_messages={'required': _('No Network pool has been choice')})
- storage = forms.CharField(max_length=20, required=False)
- template = forms.CharField(required=False)
- images = forms.CharField(required=False)
- hdd_size = forms.IntegerField(required=False)
- meta_prealloc = forms.BooleanField(required=False)
- virtio = forms.BooleanField(required=False)
- mac = forms.CharField(required=False)
-
- def clean_name(self):
- name = self.cleaned_data['name']
- have_symbol = re.match('^[a-zA-Z0-9._-]+$', name)
- if not have_symbol:
- raise forms.ValidationError(_('The name of the virtual machine must not contain any special characters'))
- elif len(name) > 20:
- raise forms.ValidationError(_('The name of the virtual machine must not exceed 20 characters'))
- return name
diff --git a/create/migrations/0001_initial.py b/create/migrations/0001_initial.py
deleted file mode 100644
index 030ee30..0000000
--- a/create/migrations/0001_initial.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ]
-
- operations = [
- migrations.CreateModel(
- name='Flavor',
- fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('label', models.CharField(max_length=12)),
- ('memory', models.IntegerField()),
- ('vcpu', models.IntegerField()),
- ('disk', models.IntegerField()),
- ],
- options={
- },
- bases=(models.Model,),
- ),
- ]
diff --git a/create/models.py b/create/models.py
deleted file mode 100644
index 0572fdd..0000000
--- a/create/models.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django.db import models
-
-
-class Flavor(models.Model):
- label = models.CharField(max_length=12)
- memory = models.IntegerField()
- vcpu = models.IntegerField()
- disk = models.IntegerField()
-
- def __unicode__(self):
- return self.name
diff --git a/create/templates/create_flav_block.html b/create/templates/create_flav_block.html
deleted file mode 100644
index 979599f..0000000
--- a/create/templates/create_flav_block.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% load i18n %}
-{% if request.user.is_superuser %}
-
-
-
-
-
-
-{% endif %}
\ No newline at end of file
diff --git a/create/templates/create_instance.html b/create/templates/create_instance.html
deleted file mode 100644
index 37189b7..0000000
--- a/create/templates/create_instance.html
+++ /dev/null
@@ -1,418 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
-{% block title %}{% trans "Create new instance" %}{% endblock %}
-{% block style %}
-
-{% endblock %}
-{% block content %}
-
- /meta_data.json",
+ views.os_metadata_json,
+ name="ds_openstack_metadata",
+ ),
+ path(
+ "openstack//user_data", views.os_userdata, name="ds_openstack_userdata"
+ ),
+ path("vdi///", views.get_vdi_url, name="vdi_url"),
+]
diff --git a/datasource/views.py b/datasource/views.py
new file mode 100644
index 0000000..bbdd27a
--- /dev/null
+++ b/datasource/views.py
@@ -0,0 +1,110 @@
+import json
+import socket
+
+from accounts.models import UserInstance, UserSSHKey
+from computes.models import Compute
+from django.http import Http404, HttpResponse
+from django.shortcuts import get_object_or_404, render
+from libvirt import libvirtError
+from vrtManager.instance import wvmInstance
+
+OS_VERSIONS = ["latest", ""]
+OS_UUID = "iid-dswebvirtcloud"
+
+
+def os_index(request):
+ """
+ :param request:
+ :return:
+ """
+ response = "\n".join(OS_VERSIONS)
+ return HttpResponse(response)
+
+
+def os_metadata_json(request, version):
+ """
+ :param request:
+ :param version:
+ :return:
+ """
+
+ if version == "latest":
+ ip = get_client_ip(request)
+ hostname = get_hostname_by_ip(ip)
+ response = {"uuid": OS_UUID, "hostname": hostname}
+ return HttpResponse(json.dumps(response))
+ else:
+ err = "Invalid version: %(version)s" % {"version": version}
+ raise Http404(err)
+
+
+def os_userdata(request, version):
+ """
+ :param request:
+ :param version:
+ :return:
+ """
+ if version == "latest":
+ ip = get_client_ip(request)
+ hostname = get_hostname_by_ip(ip)
+ vname = hostname.split(".")[0]
+
+ instance_keys = []
+ userinstances = UserInstance.objects.filter(instance__name=vname)
+
+ for ui in userinstances:
+ keys = UserSSHKey.objects.filter(user=ui.user)
+ for k in keys:
+ instance_keys.append(k.keypublic)
+
+ return render(request, "user_data", locals())
+ else:
+ err = "Invalid version: %(version)s" % {"version": version}
+ raise Http404(err)
+
+
+def get_client_ip(request):
+ """
+ :param request:
+ :return:
+ """
+ x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
+ if x_forwarded_for:
+ ip = x_forwarded_for.split(",")[-1].strip()
+ else:
+ ip = request.META.get("REMOTE_ADDR")
+ return ip
+
+
+def get_hostname_by_ip(ip):
+ """
+ :param ip:
+ :return:
+ """
+ try:
+ addrs = socket.gethostbyaddr(ip)
+ except:
+ addrs = [ip]
+ return addrs[0]
+
+
+def get_vdi_url(request, compute_id, vname):
+ """
+ :param request:
+ :param vname:
+ :return:
+ """
+ compute = get_object_or_404(Compute, pk=compute_id)
+
+ try:
+ conn = wvmInstance(
+ compute.hostname, compute.login, compute.password, compute.type, vname
+ )
+
+ fqdn = get_hostname_by_ip(compute.hostname)
+ url = f"{conn.get_console_type()}://{fqdn}:{conn.get_console_port()}"
+ response = url
+ return HttpResponse(response)
+ except libvirtError:
+ err = "Error getting VDI URL for %(name)s" % {"name": vname}
+ raise Http404(err)
diff --git a/dev/libvirt-bootstrap.sh b/dev/libvirt-bootstrap.sh
index 913299e..11a7a9b 100644
--- a/dev/libvirt-bootstrap.sh
+++ b/dev/libvirt-bootstrap.sh
@@ -5,14 +5,14 @@
#
# FILE: libvirt-bootstrap.sh
#
-# DESCRIPTION: Bootstrap webvirtmgr installation for various distributions
+# DESCRIPTION: Bootstrap webvirtcloud installation for various distributions
#
-# BUGS: https://github.com/retspen/webvirtmgr/issues
+# BUGS: https://github.com/retspen/webvirtcloud/issues
#
-# COPYRIGHT: (c) 2015 by the WebVirtMgr Team
+# COPYRIGHT: (c) 2015 by the WebVirtCloud Team
#
# LICENSE: Apache 2.0
-# ORGANIZATION: WebVirtMgr (webvirtmgr.net)
+# ORGANIZATION: WebVirtCloud (webvirtcloud.net)
# CREATED: 11/11/2013 11:00:00 EET
#===============================================================================
@@ -21,7 +21,7 @@
# DESCRIPTION: Echo errors to stderr.
#-------------------------------------------------------------------------------
echoerror() {
- printf "${RC} * ERROR${EC}: $@\n" 1>&2;
+ printf "${RC} * ERROR${EC}: %s\n" "$@" 1>&2;
}
#--- FUNCTION ----------------------------------------------------------------
@@ -45,7 +45,7 @@ echowarn() {
# DESCRIPTION: Echo debug information to stdout.
#-------------------------------------------------------------------------------
echodebug() {
- if [ $_ECHO_DEBUG -eq $BS_TRUE ]; then
+ if [ "${_ECHO_DEBUG}" -eq "${BS_TRUE}" ]; then
printf "${BC} * DEBUG${EC}: %s\n" "$@";
fi
}
@@ -68,7 +68,7 @@ __test_distro_arch
# DESCRIPTION: Strip duplicate strings
#-------------------------------------------------------------------------------
__strip_duplicates() {
- echo $@ | tr -s '[:space:]' '\n' | awk '!x[$0]++'
+ echo "$@" | tr -s '[:space:]' '\n' | awk '!x[$0]++'
}
#--- FUNCTION ----------------------------------------------------------------
@@ -79,7 +79,7 @@ __strip_duplicates() {
#-------------------------------------------------------------------------------
__function_defined() {
FUNC_NAME=$1
- if [ "$(command -v $FUNC_NAME)x" != "x" ]; then
+ if [ "$(command -v "$FUNC_NAME")x" != "x" ]; then
echoinfo "Found function $FUNC_NAME"
return 0
fi
@@ -95,14 +95,14 @@ __function_defined() {
__parse_version_string() {
VERSION_STRING="$1"
PARSED_VERSION=$(
- echo $VERSION_STRING |
+ echo "$VERSION_STRING" |
sed -e 's/^/#/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\).*$/\1/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
-e 's/^#.*$//'
)
- echo $PARSED_VERSION
+ echo "$PARSED_VERSION"
}
#--- FUNCTION ----------------------------------------------------------------
@@ -111,14 +111,14 @@ __parse_version_string() {
# enough.
#-------------------------------------------------------------------------------
__sort_release_files() {
- KNOWN_RELEASE_FILES=$(echo "(arch|centos|debian|ubuntu|fedora|redhat|suse|\
+ KNOWN_RELEASE_FILES=$(echo "(arch|centos|almalinux|rocky|debian|ubuntu|fedora|redhat|suse|\
mandrake|mandriva|gentoo|slackware|turbolinux|unitedlinux|lsb|system|\
os)(-|_)(release|version)" | sed -r 's:[[:space:]]::g')
primary_release_files=""
secondary_release_files=""
# Sort know VS un-known files first
- for release_file in $(echo $@ | sed -r 's:[[:space:]]:\n:g' | sort --unique --ignore-case); do
- match=$(echo $release_file | egrep -i ${KNOWN_RELEASE_FILES})
+ for release_file in $(echo "$@" | sed -r 's:[[:space:]]:\n:g' | sort --unique --ignore-case); do
+ match=$(echo "$release_file" | grep -E -i "${KNOWN_RELEASE_FILES}")
if [ "x${match}" != "x" ]; then
primary_release_files="${primary_release_files} ${release_file}"
else
@@ -129,15 +129,15 @@ __sort_release_files() {
# Now let's sort by know files importance, max important goes last in the max_prio list
max_prio="redhat-release centos-release"
for entry in $max_prio; do
- if [ "x$(echo ${primary_release_files} | grep $entry)" != "x" ]; then
- primary_release_files=$(echo ${primary_release_files} | sed -e "s:\(.*\)\($entry\)\(.*\):\2 \1 \3:g")
+ if [ "x$(echo "${primary_release_files}" | grep "$entry")" != "x" ]; then
+ primary_release_files=$(echo "${primary_release_files}" | sed -e "s:\(.*\)\($entry\)\(.*\):\2 \1 \3:g")
fi
done
# Now, least important goes last in the min_prio list
min_prio="lsb-release"
- for entry in $max_prio; do
- if [ "x$(echo ${primary_release_files} | grep $entry)" != "x" ]; then
- primary_release_files=$(echo ${primary_release_files} | sed -e "s:\(.*\)\($entry\)\(.*\):\1 \3 \2:g")
+ for entry in $min_prio; do
+ if [ "x$(echo "${primary_release_files}" | grep "$entry")" != "x" ]; then
+ primary_release_files=$(echo "${primary_release_files}" | sed -e "s:\(.*\)\($entry\)\(.*\):\1 \3 \2:g")
fi
done
@@ -154,8 +154,7 @@ __gather_linux_system_info() {
DISTRO_VERSION=""
# Let's test if the lsb_release binary is available
- rv=$(lsb_release >/dev/null 2>&1)
- if [ $? -eq 0 ]; then
+ if lsb_release >/dev/null 2>&1; then
DISTRO_NAME=$(lsb_release -si)
if [ "x$(echo "$DISTRO_NAME" | grep RedHat)" != "x" ]; then
# Let's convert CamelCase to Camel Case
@@ -183,24 +182,24 @@ __gather_linux_system_info() {
return
fi
- for rsource in $(__sort_release_files $(
- cd /etc && /bin/ls *[_-]release *[_-]version 2>/dev/null | env -i sort | \
+ for rsource in $(__sort_release_files "$(
+ cd /etc && find ./*[_-]release ./*[_-]version -printf "%f\n" 2>/dev/null | env -i sort | \
sed -e '/^redhat-release$/d' -e '/^lsb-release$/d'; \
echo redhat-release lsb-release
- )); do
+ )"); do
[ -L "/etc/${rsource}" ] && continue # Don't follow symlinks
[ ! -f "/etc/${rsource}" ] && continue # Does not exist
- n=$(echo ${rsource} | sed -e 's/[_-]release$//' -e 's/[_-]version$//')
- rv=$( (grep VERSION /etc/${rsource}; cat /etc/${rsource}) | grep '[0-9]' | sed -e 'q' )
+ n=$(echo "${rsource}" | sed -e 's/[_-]release$//' -e 's/[_-]version$//')
+ rv=$( (grep VERSION /etc/"${rsource}"; cat /etc/"${rsource}") | grep '[0-9]' | sed -e 'q' )
[ "${rv}x" = "x" ] && continue # There's no version information. Continue to next rsource
v=$(__parse_version_string "$rv")
- case $(echo ${n} | tr '[:upper:]' '[:lower:]') in
+ case $(echo "${n}" | tr '[:upper:]' '[:lower:]') in
redhat )
- if [ ".$(egrep 'CentOS' /etc/${rsource})" != . ]; then
+ if [ ".$(grep -E 'CentOS' /etc/"${rsource}")" != . ]; then
n="CentOS"
- elif [ ".$(egrep 'Red Hat Enterprise Linux' /etc/${rsource})" != . ]; then
+ elif [ ".$(grep -E 'Red Hat Enterprise Linux' /etc/"${rsource}")" != . ]; then
n="ed at nterprise inux"
else
n="ed at inux"
@@ -208,6 +207,7 @@ __gather_linux_system_info() {
;;
arch ) n="Arch Linux" ;;
centos ) n="CentOS" ;;
+ almalinux ) n="AlmaLinux" ;;
debian ) n="Debian" ;;
ubuntu ) n="Ubuntu" ;;
fedora ) n="Fedora" ;;
@@ -220,13 +220,13 @@ __gather_linux_system_info() {
n="Amazon Linux AMI"
break
esac
- done < /etc/${rsource}
+ done < /etc/"${rsource}"
;;
os )
nn=$(grep '^ID=' /etc/os-release | sed -e 's/^ID=\(.*\)$/\1/g')
rv=$(grep '^VERSION_ID=' /etc/os-release | sed -e 's/^VERSION_ID=\(.*\)$/\1/g')
[ "${rv}x" != "x" ] && v=$(__parse_version_string "$rv") || v=""
- case $(echo ${nn} | tr '[:upper:]' '[:lower:]') in
+ case $(echo "${nn}" | tr '[:upper:]' '[:lower:]') in
arch )
n="Arch Linux"
v="" # Arch Linux does not provide a version.
@@ -247,7 +247,7 @@ __gather_linux_system_info() {
;;
esac
;;
- * ) n="${n}" ;
+ * ) ;;
esac
DISTRO_NAME=$n
DISTRO_VERSION=$v
@@ -257,9 +257,9 @@ __gather_linux_system_info() {
__gather_linux_system_info
# Simplify distro name naming on functions
-DISTRO_NAME_L=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]' | sed 's/[^a-zA-Z0-9_ ]//g' | sed -re 's/([[:space:]])+/_/g')
-DISTRO_MAJOR_VERSION="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).*/\1/g')"
-DISTRO_MINOR_VERSION="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).\([0-9]*\).*/\2/g')"
+DISTRO_NAME_L=$(echo "$DISTRO_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-zA-Z0-9_ ]//g' | sed -re 's/([[:space:]])+/_/g')
+DISTRO_MAJOR_VERSION="$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).*/\1/g')"
+DISTRO_MINOR_VERSION="$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).\([0-9]*\).*/\2/g')"
PREFIXED_DISTRO_MAJOR_VERSION="_${DISTRO_MAJOR_VERSION}"
if [ "${PREFIXED_DISTRO_MAJOR_VERSION}" = "_" ]; then
PREFIXED_DISTRO_MAJOR_VERSION=""
@@ -278,7 +278,7 @@ __check_end_of_life_versions() {
case "${DISTRO_NAME_L}" in
debian)
# Debian versions bellow 6 are not supported
- if [ $DISTRO_MAJOR_VERSION -lt 6 ]; then
+ if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then
echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:"
echoerror " https://wiki.debian.org/DebianReleases"
@@ -293,10 +293,10 @@ __check_end_of_life_versions() {
# = 10.10
# = 11.04
# = 11.10
- if ([ $DISTRO_MAJOR_VERSION -eq 10 ] && [ $DISTRO_MINOR_VERSION -eq 10 ]) || \
- ([ $DISTRO_MAJOR_VERSION -eq 11 ] && [ $DISTRO_MINOR_VERSION -eq 04 ]) || \
- ([ $DISTRO_MAJOR_VERSION -eq 11 ] && [ $DISTRO_MINOR_VERSION -eq 10 ]) || \
- [ $DISTRO_MAJOR_VERSION -lt 10 ]; then
+ if { [ "$DISTRO_MAJOR_VERSION" -eq 10 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
+ { [ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$DISTRO_MINOR_VERSION" -eq 04 ]; } || \
+ { [ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
+ [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then
echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:"
echoerror " https://wiki.ubuntu.com/Releases"
@@ -308,7 +308,7 @@ __check_end_of_life_versions() {
# openSUSE versions not supported
#
# <= 12.1
- if ([ $DISTRO_MAJOR_VERSION -eq 12 ] && [ $DISTRO_MINOR_VERSION -eq 1 ]) || [ $DISTRO_MAJOR_VERSION -lt 12 ]; then
+ if { [ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$DISTRO_MINOR_VERSION" -eq 1 ]; } || [ "$DISTRO_MAJOR_VERSION" -lt 12 ]; then
echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:"
echoerror " http://en.opensuse.org/Lifetime"
@@ -324,7 +324,7 @@ __check_end_of_life_versions() {
if [ "x${SUSE_PATCHLEVEL}" = "x" ]; then
SUSE_PATCHLEVEL="00"
fi
- if ([ $DISTRO_MAJOR_VERSION -eq 11 ] && [ $SUSE_PATCHLEVEL -lt 02 ]) || [ $DISTRO_MAJOR_VERSION -lt 11 ]; then
+ if { [ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]; } || [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
echoerror "Versions lower than SuSE 11 SP2 are not supported."
echoerror "Please consider upgrading to the next stable"
exit 1
@@ -333,7 +333,7 @@ __check_end_of_life_versions() {
fedora)
# Fedora lower than 18 are no longer supported
- if [ $DISTRO_MAJOR_VERSION -lt 18 ]; then
+ if [ "$DISTRO_MAJOR_VERSION" -lt 18 ]; then
echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:"
echoerror " https://fedoraproject.org/wiki/Releases"
@@ -342,8 +342,8 @@ __check_end_of_life_versions() {
;;
centos)
- # CentOS versions lower than 5 are no longer supported
- if ([ $DISTRO_MAJOR_VERSION -eq 6 ] && [ $DISTRO_MINOR_VERSION -lt 3 ]) || [ $DISTRO_MAJOR_VERSION -lt 5 ]; then
+ # CentOS versions lower than 6 are no longer supported
+ if { [ "$DISTRO_MAJOR_VERSION" -eq 6 ] && [ "$DISTRO_MINOR_VERSION" -lt 3 ]; } || [ "$DISTRO_MAJOR_VERSION" -lt 5 ]; then
echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:"
echoerror " http://wiki.centos.org/Download"
@@ -353,7 +353,7 @@ __check_end_of_life_versions() {
red_hat*linux)
# Red Hat (Enterprise) Linux versions lower than 5 are no longer supported
- if ([ $DISTRO_MAJOR_VERSION -eq 6 ] && [ $DISTRO_MINOR_VERSION -lt 3 ]) || [ $DISTRO_MAJOR_VERSION -lt 5 ]; then
+ if { [ "$DISTRO_MAJOR_VERSION" -eq 6 ] && [ "$DISTRO_MINOR_VERSION" -lt 3 ]; } || [ "$DISTRO_MAJOR_VERSION" -lt 5 ]; then
echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:"
echoerror " https://access.redhat.com/support/policy/updates/errata/"
@@ -374,34 +374,48 @@ __check_end_of_life_versions
# CentOS Install Functions
#
install_centos() {
- if [ $DISTRO_MAJOR_VERSION -ge 6 ]; then
- yum -y install qemu-kvm libvirt bridge-utils python-libguestfs supervisor || return 1
+ yum -y install epel-release || return 1
+
+ if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then
+ yum -y install qemu-kvm libvirt bridge-utils python-libguestfs libguestfs-tools supervisor cyrus-sasl-md5 || return 1
+ else
+ yum -y install qemu-kvm libvirt python3-libguestfs libguestfs-tools cyrus-sasl-md5 supervisor || return 1
fi
return 0
}
install_centos_post() {
- if [ -f /etc/sysconfig/libvirtd ]; then
- sed -i 's/#LIBVIRTD_ARGS/LIBVIRTD_ARGS/g' /etc/sysconfig/libvirtd
- else
- echoerror "/etc/sysconfig/libvirtd not found. Exiting..."
- exit 1
- fi
- if [ -f /etc/libvirt/libvirtd.conf ]; then
- sed -i 's/#listen_tls/listen_tls/g' /etc/libvirt/libvirtd.conf
- sed -i 's/#listen_tcp/listen_tcp/g' /etc/libvirt/libvirtd.conf
- sed -i 's/#auth_tcp/auth_tcp/g' /etc/libvirt/libvirtd.conf
- else
- echoerror "/etc/libvirt/libvirtd.conf not found. Exiting..."
- exit 1
+ if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then
+ if [ -f /etc/sysconfig/libvirtd ]; then
+ sed -i 's/#LIBVIRTD_ARGS/LIBVIRTD_ARGS/g' /etc/sysconfig/libvirtd
+ else
+ echoerror "/etc/sysconfig/libvirtd not found. Exiting..."
+ exit 1
+ fi
+ if [ -f /etc/libvirt/libvirtd.conf ]; then
+ sed -i 's/#listen_tls/listen_tls/g' /etc/libvirt/libvirtd.conf
+ sed -i 's/#listen_tcp/listen_tcp/g' /etc/libvirt/libvirtd.conf
+ sed -i 's/#auth_tcp/auth_tcp/g' /etc/libvirt/libvirtd.conf
+ else
+ echoerror "/etc/libvirt/libvirtd.conf not found. Exiting..."
+ exit 1
+ fi
fi
if [ -f /etc/libvirt/qemu.conf ]; then
- sed -i 's/#vnc_listen/vnc_listen/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*vnc_listen.*/vnc_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*spice_listen.*/spice_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
else
echoerror "/etc/libvirt/qemu.conf not found. Exiting..."
exit 1
fi
- if [ $DISTRO_MAJOR_VERSION -lt 7 ]; then
+ if [ -f /etc/sasl2/libvirt.conf ]; then
+ sed -i 's/: gssapi/: digest-md5/g' /etc/sasl2/libvirt.conf
+ sed -i 's/#sasldb_path/sasldb_path/g' /etc/sasl2/libvirt.conf
+ else
+ echoerror "/etc/sasl2/libvirt.conf not found. Exiting..."
+ exit 1
+ fi
+ if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then
if [ -f /etc/supervisord.conf ]; then
curl https://raw.githubusercontent.com/retspen/webvirtcloud/master/conf/daemon/gstfsd > /usr/local/bin/gstfsd
chmod +x /usr/local/bin/gstfsd
@@ -432,14 +446,24 @@ daemons_running_centos() {
service libvirt-guests stop > /dev/null 2>&1
service libvirt-guests start
fi
- if [ -f /usr/lib/systemd/system/libvirtd.service ]; then
- systemctl stop libvirtd.service > /dev/null 2>&1
- systemctl start libvirtd.service
+
+ if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then
+ if [ -f /usr/lib/systemd/system/libvirtd.service ]; then
+ systemctl stop libvirtd.service > /dev/null 2>&1
+ systemctl start libvirtd.service
+ fi
+ else
+ if [ -f /usr/lib/systemd/system/libvirtd-tcp.socket ]; then
+ systemctl stop libvirtd-tcp.socket > /dev/null 2>&1
+ systemctl start libvirtd-tcp.socket
+ fi
fi
+
if [ -f /usr/lib/systemd/system/libvirt-guests.service ]; then
systemctl stop libvirt-guests.service > /dev/null 2>&1
systemctl start libvirt-guests.service
fi
+
if [ -f /etc/init.d/supervisord ]; then
service supervisord stop > /dev/null 2>&1
service supervisord start
@@ -449,7 +473,7 @@ daemons_running_centos() {
systemctl start supervisord.service
fi
return 0
-}
+}
#
# Ended CentOS Install Functions
#
@@ -460,7 +484,7 @@ daemons_running_centos() {
# Fedora Install Functions
#
install_fedora() {
- yum -y install kvm libvirt bridge-utils python-libguestfs supervisor || return 1
+ yum -y install kvm libvirt bridge-utils python3-libguestfs supervisor || return 1
return 0
}
@@ -480,7 +504,8 @@ install_fedora_post() {
exit 1
fi
if [ -f /etc/libvirt/qemu.conf ]; then
- sed -i 's/#vnc_listen/vnc_listen/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*vnc_listen.*/vnc_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*spice_listen.*/spice_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
else
echoerror "/etc/libvirt/qemu.conf not found. Exiting..."
exit 1
@@ -510,7 +535,7 @@ daemons_running_fedora() {
systemctl start supervisord.service
fi
return 0
-}
+}
#
# Ended Fedora Install Functions
#
@@ -521,7 +546,7 @@ daemons_running_fedora() {
# Opensuse Install Functions
#
install_opensuse() {
- zypper -n install -l kvm libvirt bridge-utils python-libguestfs supervisor || return 1
+ zypper -n install -l kvm libvirt bridge-utils python3-libguestfs supervisor || return 1
return 0
}
@@ -541,7 +566,8 @@ install_opensuse_post() {
exit 1
fi
if [ -f /etc/libvirt/qemu.conf ]; then
- sed -i 's/#vnc_listen/vnc_listen/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*vnc_listen.*/vnc_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*spice_listen.*/spice_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
else
echoerror "/etc/libvirt/qemu.conf not found. Exiting..."
exit 1
@@ -583,31 +609,37 @@ daemons_running_opensuse() {
#
install_ubuntu() {
apt-get update || return 1
- apt-get -y install kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
+ if [ "$DISTRO_MAJOR_VERSION" -lt 18 ]; then
+ apt-get -y install kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
+ else
+ apt install -y qemu-kvm libvirt-clients libvirt-daemon-system bridge-utils virt-manager sasl2-bin python3-guestfs supervisor || return 1
+ fi
+
return 0
}
install_ubuntu_post() {
if [ -f /etc/default/libvirt-bin ]; then
sed -i 's/libvirtd_opts="-d"/libvirtd_opts="-d -l"/g' /etc/default/libvirt-bin
+ elif [ -f /etc/default/libvirtd ]; then
+ sed -i 's/libvirtd_opts="-d"/libvirtd_opts="-d -l"/g' /etc/default/libvirtd
else
- echoerror "/etc/default/libvirt-bin not found. Exiting..."
+ echoerror "/etc/default/libvirt-bin or /etc/default/libvirtd not found. Exiting..."
exit 1
fi
if [ -f /etc/libvirt/libvirtd.conf ]; then
sed -i 's/#listen_tls/listen_tls/g' /etc/libvirt/libvirtd.conf
sed -i 's/#listen_tcp/listen_tcp/g' /etc/libvirt/libvirtd.conf
sed -i 's/#auth_tcp/auth_tcp/g' /etc/libvirt/libvirtd.conf
+ sed -i 's/#auth_unix_rw = "polkit"/auth_unix_rw = "none"/g' /etc/libvirt/libvirtd.conf
else
echoerror "/etc/libvirt/libvirtd.conf not found. Exiting..."
exit 1
fi
if [ -f /etc/libvirt/qemu.conf ]; then
- if ([ $DISTRO_MAJOR_VERSION -eq 12 ] && [ $DISTRO_MINOR_VERSION -eq 04 ]); then
- sed -i 's/# vnc_listen/vnc_listen/g' /etc/libvirt/qemu.conf
- else
- sed -i 's/#vnc_listen/vnc_listen/g' /etc/libvirt/qemu.conf
- fi
+ sed -i 's/#[ ]*vnc_listen.*/vnc_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*spice_listen.*/spice_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
+
else
echoerror "/etc/libvirt/qemu.conf not found. Exiting..."
exit 1
@@ -635,7 +667,7 @@ daemons_running_ubuntu() {
service supervisor start
fi
return 0
-}
+}
#
# Ended Ubuntu Install Functions
#
@@ -647,19 +679,25 @@ daemons_running_ubuntu() {
#
install_debian() {
apt-get update || return 1
- apt-get -y install kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
+ if [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then
+ apt-get -y install qemu-kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
+ elif [ "$DISTRO_MAJOR_VERSION" -lt 12 ]; then
+ apt-get -y install qemu qemu-kvm qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin python3-guestfs virtinst supervisor || return 1
+ else
+ apt-get -y install qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin python3-guestfs virtinst supervisor || return 1
+ fi
return 0
}
install_debian_post() {
- if [ $DISTRO_MAJOR_VERSION -ge 8 ]; then
+ if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
LIBVIRTSVC=libvirtd
else
LIBVIRTSVC=libvirt-bin
fi
if [ -f /etc/default/$LIBVIRTSVC ]; then
if [ "$( grep -c '^libvirtd_opts *=' /etc/default/$LIBVIRTSVC )" -gt 0 ]; then
- if [ $( grep -c '^libvirtd_opts *=.*-l' /etc/default/$LIBVIRTSVC ) -eq 0 ]; then
+ if [ "$( grep -c '^libvirtd_opts *=.*-l' /etc/default/$LIBVIRTSVC )" -eq 0 ]; then
sed -i 's/^libvirtd_opts="\([^"]*\)"/libvirtd_opts="\1 -l"/g' /etc/default/$LIBVIRTSVC
fi
else
@@ -673,16 +711,25 @@ install_debian_post() {
sed -i 's/#listen_tls/listen_tls/g' /etc/libvirt/libvirtd.conf
sed -i 's/#listen_tcp/listen_tcp/g' /etc/libvirt/libvirtd.conf
sed -i 's/#auth_tcp/auth_tcp/g' /etc/libvirt/libvirtd.conf
+ sed -i 's/#auth_unix_rw = "polkit"/auth_unix_rw = "none"/g' /etc/libvirt/libvirtd.conf
else
echoerror "/etc/libvirt/libvirtd.conf not found. Exiting..."
exit 1
fi
if [ -f /etc/libvirt/qemu.conf ]; then
- sed -i 's/# vnc_listen/vnc_listen/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*vnc_listen.*/vnc_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
+ sed -i 's/#[ ]*spice_listen.*/spice_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf
else
echoerror "/etc/libvirt/qemu.conf not found. Exiting..."
exit 1
fi
+ if [ -f /etc/sasl2/libvirt.conf ]; then
+ sed -i 's/: gssapi/: digest-md5/g' /etc/sasl2/libvirt.conf
+ sed -i 's/#sasldb_path/sasldb_path/g' /etc/sasl2/libvirt.conf
+ else
+ echoerror "/etc/sasl2/libvirt.conf not found. Exiting..."
+ exit 1
+ fi
if [ -f /etc/supervisor/supervisord.conf ]; then
wget -O /usr/local/bin/gstfsd https://raw.githubusercontent.com/retspen/webvirtcloud/master/conf/daemon/gstfsd
chmod +x /usr/local/bin/gstfsd
@@ -695,7 +742,7 @@ install_debian_post() {
}
daemons_running_debian() {
- if [ $DISTRO_MAJOR_VERSION -ge 8 ]; then
+ if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
LIBVIRTSVC=libvirtd
else
LIBVIRTSVC=libvirt-bin
@@ -709,7 +756,7 @@ daemons_running_debian() {
service supervisor start
fi
return 0
-}
+}
#
# Ended Debian Install Functions
#
@@ -722,21 +769,20 @@ daemons_running_debian() {
INSTALL_FUNC_NAMES="install_${DISTRO_NAME_L}"
INSTALL_FUNC="null"
-for FUNC_NAME in $(__strip_duplicates $INSTALL_FUNC_NAMES); do
- if __function_defined $FUNC_NAME; then
+for FUNC_NAME in $(__strip_duplicates "$INSTALL_FUNC_NAMES"); do
+ if __function_defined "$FUNC_NAME"; then
INSTALL_FUNC=$FUNC_NAME
break
fi
done
echodebug "INSTALL_FUNC=${INSTALL_FUNC}"
-if [ $INSTALL_FUNC = "null" ]; then
+if [ "$INSTALL_FUNC" = "null" ]; then
echoerror "No installation function found. Exiting..."
exit 1
else
echoinfo "Running ${INSTALL_FUNC}()"
- $INSTALL_FUNC
- if [ $? -ne 0 ]; then
+ if ! $INSTALL_FUNC; then
echoerror "Failed to run ${INSTALL_FUNC}()!!!"
exit 1
fi
@@ -746,21 +792,20 @@ fi
POST_FUNC_NAMES="install_${DISTRO_NAME_L}_post"
POST_INSTALL_FUNC="null"
-for FUNC_NAME in $(__strip_duplicates $POST_FUNC_NAMES); do
- if __function_defined $FUNC_NAME; then
+for FUNC_NAME in $(__strip_duplicates "$POST_FUNC_NAMES"); do
+ if __function_defined "$FUNC_NAME"; then
POST_INSTALL_FUNC=$FUNC_NAME
break
fi
done
echodebug "POST_INSTALL_FUNC=${POST_INSTALL_FUNC}"
-if [ $POST_INSTALL_FUNC = "null" ]; then
+if [ "$POST_INSTALL_FUNC" = "null" ]; then
echoerror "No installation function found. Exiting..."
exit 1
else
echoinfo "Running ${POST_INSTALL_FUNC}()"
- $POST_INSTALL_FUNC
- if [ $? -ne 0 ]; then
+ if ! $POST_INSTALL_FUNC; then
echoerror "Failed to run ${POST_INSTALL_FUNC}()!!!"
exit 1
fi
@@ -770,21 +815,20 @@ fi
DAEMONS_RUNNING_FUNC_NAMES="daemons_running_${DISTRO_NAME_L}"
DAEMONS_RUNNING_FUNC="null"
-for FUNC_NAME in $(__strip_duplicates $DAEMONS_RUNNING_FUNC_NAMES); do
- if __function_defined $FUNC_NAME; then
+for FUNC_NAME in $(__strip_duplicates "$DAEMONS_RUNNING_FUNC_NAMES"); do
+ if __function_defined "$FUNC_NAME"; then
DAEMONS_RUNNING_FUNC=$FUNC_NAME
break
fi
done
echodebug "DAEMONS_RUNNING_FUNC=${DAEMONS_RUNNING_FUNC}"
-if [ $DAEMONS_RUNNING_FUNC = "null" ]; then
+if [ "$DAEMONS_RUNNING_FUNC" = "null" ]; then
echoerror "No installation function found. Exiting..."
exit 1
else
echoinfo "Running ${DAEMONS_RUNNING_FUNC}()"
- $DAEMONS_RUNNING_FUNC
- if [ $? -ne 0 ]; then
+ if ! $DAEMONS_RUNNING_FUNC; then
echoerror "Failed to run ${DAEMONS_RUNNING_FUNC}()!!!"
exit 1
fi
diff --git a/dev/requirements.txt b/dev/requirements.txt
index ce7c957..8cb60cf 100644
--- a/dev/requirements.txt
+++ b/dev/requirements.txt
@@ -1,4 +1,9 @@
-r ../conf/requirements.txt
-pep8==1.6.2
-pyflakes==0.8.1
-pylint==1.4.3
+coverage==7.9.1
+django-debug-toolbar==5.2.0
+django-debug-toolbar-template-profiler
+pycodestyle==2.14.0
+pyflakes==3.4.0
+pylint==3.3.7
+yapf==0.43.0
+black==25.1.0
diff --git a/dev/scss/bootstrap-overrides.scss b/dev/scss/bootstrap-overrides.scss
new file mode 100644
index 0000000..a5ad147
--- /dev/null
+++ b/dev/scss/bootstrap-overrides.scss
@@ -0,0 +1,68 @@
+/*!
+ * Bootstrap v5.2.2 (https://getbootstrap.com/)
+ * Copyright 2011-2022 The Bootstrap Authors
+ * Copyright 2011-2022 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */
+
+ $enable-gradients: true;
+
+
+/*!
+ * Bootstrap v5.2.2 (https://getbootstrap.com/)
+ * Copyright 2011-2022 The Bootstrap Authors
+ * Copyright 2011-2022 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */
+
+ @import "bootstrap/mixins/banner";
+ @include bsBanner("");
+
+
+ // scss-docs-start import-stack
+ // Configuration
+ @import "bootstrap/functions";
+ @import "bootstrap/variables";
+ @import "bootstrap/maps";
+ @import "bootstrap/mixins";
+ @import "bootstrap/utilities";
+
+ // Layout & components
+ @import "bootstrap/root";
+ @import "bootstrap/reboot";
+ @import "bootstrap/type";
+ @import "bootstrap/images";
+ @import "bootstrap/containers";
+ @import "bootstrap/grid";
+ @import "bootstrap/tables";
+ @import "bootstrap/forms";
+ @import "bootstrap/buttons";
+ @import "bootstrap/transitions";
+ @import "bootstrap/dropdown";
+ @import "bootstrap/button-group";
+ @import "bootstrap/nav";
+ @import "bootstrap/navbar";
+ @import "bootstrap/card";
+ @import "bootstrap/accordion";
+ @import "bootstrap/breadcrumb";
+ @import "bootstrap/pagination";
+ @import "bootstrap/badge";
+ @import "bootstrap/alert";
+ @import "bootstrap/progress";
+ @import "bootstrap/list-group";
+ @import "bootstrap/close";
+ @import "bootstrap/toasts";
+ @import "bootstrap/modal";
+ @import "bootstrap/tooltip";
+ @import "bootstrap/popover";
+ @import "bootstrap/carousel";
+ @import "bootstrap/spinners";
+ @import "bootstrap/offcanvas";
+ @import "bootstrap/placeholders";
+
+ // Helpers
+ @import "bootstrap/helpers";
+
+ // Utilities
+ @import "bootstrap/utilities/api";
+ // scss-docs-end import-stack
\ No newline at end of file
diff --git a/dev/scss/bootstrap/_accordion.scss b/dev/scss/bootstrap/_accordion.scss
new file mode 100755
index 0000000..f09601b
--- /dev/null
+++ b/dev/scss/bootstrap/_accordion.scss
@@ -0,0 +1,149 @@
+//
+// Base styles
+//
+
+.accordion {
+ // scss-docs-start accordion-css-vars
+ --#{$prefix}accordion-color: #{$accordion-color};
+ --#{$prefix}accordion-bg: #{$accordion-bg};
+ --#{$prefix}accordion-transition: #{$accordion-transition};
+ --#{$prefix}accordion-border-color: #{$accordion-border-color};
+ --#{$prefix}accordion-border-width: #{$accordion-border-width};
+ --#{$prefix}accordion-border-radius: #{$accordion-border-radius};
+ --#{$prefix}accordion-inner-border-radius: #{$accordion-inner-border-radius};
+ --#{$prefix}accordion-btn-padding-x: #{$accordion-button-padding-x};
+ --#{$prefix}accordion-btn-padding-y: #{$accordion-button-padding-y};
+ --#{$prefix}accordion-btn-color: #{$accordion-button-color};
+ --#{$prefix}accordion-btn-bg: #{$accordion-button-bg};
+ --#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon)};
+ --#{$prefix}accordion-btn-icon-width: #{$accordion-icon-width};
+ --#{$prefix}accordion-btn-icon-transform: #{$accordion-icon-transform};
+ --#{$prefix}accordion-btn-icon-transition: #{$accordion-icon-transition};
+ --#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon)};
+ --#{$prefix}accordion-btn-focus-border-color: #{$accordion-button-focus-border-color};
+ --#{$prefix}accordion-btn-focus-box-shadow: #{$accordion-button-focus-box-shadow};
+ --#{$prefix}accordion-body-padding-x: #{$accordion-body-padding-x};
+ --#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y};
+ --#{$prefix}accordion-active-color: #{$accordion-button-active-color};
+ --#{$prefix}accordion-active-bg: #{$accordion-button-active-bg};
+ // scss-docs-end accordion-css-vars
+}
+
+.accordion-button {
+ position: relative;
+ display: flex;
+ align-items: center;
+ width: 100%;
+ padding: var(--#{$prefix}accordion-btn-padding-y) var(--#{$prefix}accordion-btn-padding-x);
+ @include font-size($font-size-base);
+ color: var(--#{$prefix}accordion-btn-color);
+ text-align: left; // Reset button style
+ background-color: var(--#{$prefix}accordion-btn-bg);
+ border: 0;
+ @include border-radius(0);
+ overflow-anchor: none;
+ @include transition(var(--#{$prefix}accordion-transition));
+
+ &:not(.collapsed) {
+ color: var(--#{$prefix}accordion-active-color);
+ background-color: var(--#{$prefix}accordion-active-bg);
+ box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list
+
+ &::after {
+ background-image: var(--#{$prefix}accordion-btn-active-icon);
+ transform: var(--#{$prefix}accordion-btn-icon-transform);
+ }
+ }
+
+ // Accordion icon
+ &::after {
+ flex-shrink: 0;
+ width: var(--#{$prefix}accordion-btn-icon-width);
+ height: var(--#{$prefix}accordion-btn-icon-width);
+ margin-left: auto;
+ content: "";
+ background-image: var(--#{$prefix}accordion-btn-icon);
+ background-repeat: no-repeat;
+ background-size: var(--#{$prefix}accordion-btn-icon-width);
+ @include transition(var(--#{$prefix}accordion-btn-icon-transition));
+ }
+
+ &:hover {
+ z-index: 2;
+ }
+
+ &:focus {
+ z-index: 3;
+ border-color: var(--#{$prefix}accordion-btn-focus-border-color);
+ outline: 0;
+ box-shadow: var(--#{$prefix}accordion-btn-focus-box-shadow);
+ }
+}
+
+.accordion-header {
+ margin-bottom: 0;
+}
+
+.accordion-item {
+ color: var(--#{$prefix}accordion-color);
+ background-color: var(--#{$prefix}accordion-bg);
+ border: var(--#{$prefix}accordion-border-width) solid var(--#{$prefix}accordion-border-color);
+
+ &:first-of-type {
+ @include border-top-radius(var(--#{$prefix}accordion-border-radius));
+
+ .accordion-button {
+ @include border-top-radius(var(--#{$prefix}accordion-inner-border-radius));
+ }
+ }
+
+ &:not(:first-of-type) {
+ border-top: 0;
+ }
+
+ // Only set a border-radius on the last item if the accordion is collapsed
+ &:last-of-type {
+ @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
+
+ .accordion-button {
+ &.collapsed {
+ @include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius));
+ }
+ }
+
+ .accordion-collapse {
+ @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
+ }
+ }
+}
+
+.accordion-body {
+ padding: var(--#{$prefix}accordion-body-padding-y) var(--#{$prefix}accordion-body-padding-x);
+}
+
+
+// Flush accordion items
+//
+// Remove borders and border-radius to keep accordion items edge-to-edge.
+
+.accordion-flush {
+ .accordion-collapse {
+ border-width: 0;
+ }
+
+ .accordion-item {
+ border-right: 0;
+ border-left: 0;
+ @include border-radius(0);
+
+ &:first-child { border-top: 0; }
+ &:last-child { border-bottom: 0; }
+
+ .accordion-button {
+ &,
+ &.collapsed {
+ @include border-radius(0);
+ }
+ }
+ }
+}
diff --git a/dev/scss/bootstrap/_alert.scss b/dev/scss/bootstrap/_alert.scss
new file mode 100755
index 0000000..c8bc91b
--- /dev/null
+++ b/dev/scss/bootstrap/_alert.scss
@@ -0,0 +1,71 @@
+//
+// Base styles
+//
+
+.alert {
+ // scss-docs-start alert-css-vars
+ --#{$prefix}alert-bg: transparent;
+ --#{$prefix}alert-padding-x: #{$alert-padding-x};
+ --#{$prefix}alert-padding-y: #{$alert-padding-y};
+ --#{$prefix}alert-margin-bottom: #{$alert-margin-bottom};
+ --#{$prefix}alert-color: inherit;
+ --#{$prefix}alert-border-color: transparent;
+ --#{$prefix}alert-border: #{$alert-border-width} solid var(--#{$prefix}alert-border-color);
+ --#{$prefix}alert-border-radius: #{$alert-border-radius};
+ // scss-docs-end alert-css-vars
+
+ position: relative;
+ padding: var(--#{$prefix}alert-padding-y) var(--#{$prefix}alert-padding-x);
+ margin-bottom: var(--#{$prefix}alert-margin-bottom);
+ color: var(--#{$prefix}alert-color);
+ background-color: var(--#{$prefix}alert-bg);
+ border: var(--#{$prefix}alert-border);
+ @include border-radius(var(--#{$prefix}alert-border-radius));
+}
+
+// Headings for larger alerts
+.alert-heading {
+ // Specified to prevent conflicts of changing $headings-color
+ color: inherit;
+}
+
+// Provide class for links that match alerts
+.alert-link {
+ font-weight: $alert-link-font-weight;
+}
+
+
+// Dismissible alerts
+//
+// Expand the right padding and account for the close button's positioning.
+
+.alert-dismissible {
+ padding-right: $alert-dismissible-padding-r;
+
+ // Adjust close link position
+ .btn-close {
+ position: absolute;
+ top: 0;
+ right: 0;
+ z-index: $stretched-link-z-index + 1;
+ padding: $alert-padding-y * 1.25 $alert-padding-x;
+ }
+}
+
+
+// scss-docs-start alert-modifiers
+// Generate contextual modifier classes for colorizing the alert.
+
+@each $state, $value in $theme-colors {
+ $alert-background: shift-color($value, $alert-bg-scale);
+ $alert-border: shift-color($value, $alert-border-scale);
+ $alert-color: shift-color($value, $alert-color-scale);
+
+ @if (contrast-ratio($alert-background, $alert-color) < $min-contrast-ratio) {
+ $alert-color: mix($value, color-contrast($alert-background), abs($alert-color-scale));
+ }
+ .alert-#{$state} {
+ @include alert-variant($alert-background, $alert-border, $alert-color);
+ }
+}
+// scss-docs-end alert-modifiers
diff --git a/dev/scss/bootstrap/_badge.scss b/dev/scss/bootstrap/_badge.scss
new file mode 100755
index 0000000..cc3d269
--- /dev/null
+++ b/dev/scss/bootstrap/_badge.scss
@@ -0,0 +1,38 @@
+// Base class
+//
+// Requires one of the contextual, color modifier classes for `color` and
+// `background-color`.
+
+.badge {
+ // scss-docs-start badge-css-vars
+ --#{$prefix}badge-padding-x: #{$badge-padding-x};
+ --#{$prefix}badge-padding-y: #{$badge-padding-y};
+ @include rfs($badge-font-size, --#{$prefix}badge-font-size);
+ --#{$prefix}badge-font-weight: #{$badge-font-weight};
+ --#{$prefix}badge-color: #{$badge-color};
+ --#{$prefix}badge-border-radius: #{$badge-border-radius};
+ // scss-docs-end badge-css-vars
+
+ display: inline-block;
+ padding: var(--#{$prefix}badge-padding-y) var(--#{$prefix}badge-padding-x);
+ @include font-size(var(--#{$prefix}badge-font-size));
+ font-weight: var(--#{$prefix}badge-font-weight);
+ line-height: 1;
+ color: var(--#{$prefix}badge-color);
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: baseline;
+ @include border-radius(var(--#{$prefix}badge-border-radius));
+ @include gradient-bg();
+
+ // Empty badges collapse automatically
+ &:empty {
+ display: none;
+ }
+}
+
+// Quick fix for badges in buttons
+.btn .badge {
+ position: relative;
+ top: -1px;
+}
diff --git a/dev/scss/bootstrap/_breadcrumb.scss b/dev/scss/bootstrap/_breadcrumb.scss
new file mode 100755
index 0000000..b8252ff
--- /dev/null
+++ b/dev/scss/bootstrap/_breadcrumb.scss
@@ -0,0 +1,40 @@
+.breadcrumb {
+ // scss-docs-start breadcrumb-css-vars
+ --#{$prefix}breadcrumb-padding-x: #{$breadcrumb-padding-x};
+ --#{$prefix}breadcrumb-padding-y: #{$breadcrumb-padding-y};
+ --#{$prefix}breadcrumb-margin-bottom: #{$breadcrumb-margin-bottom};
+ @include rfs($breadcrumb-font-size, --#{$prefix}breadcrumb-font-size);
+ --#{$prefix}breadcrumb-bg: #{$breadcrumb-bg};
+ --#{$prefix}breadcrumb-border-radius: #{$breadcrumb-border-radius};
+ --#{$prefix}breadcrumb-divider-color: #{$breadcrumb-divider-color};
+ --#{$prefix}breadcrumb-item-padding-x: #{$breadcrumb-item-padding-x};
+ --#{$prefix}breadcrumb-item-active-color: #{$breadcrumb-active-color};
+ // scss-docs-end breadcrumb-css-vars
+
+ display: flex;
+ flex-wrap: wrap;
+ padding: var(--#{$prefix}breadcrumb-padding-y) var(--#{$prefix}breadcrumb-padding-x);
+ margin-bottom: var(--#{$prefix}breadcrumb-margin-bottom);
+ @include font-size(var(--#{$prefix}breadcrumb-font-size));
+ list-style: none;
+ background-color: var(--#{$prefix}breadcrumb-bg);
+ @include border-radius(var(--#{$prefix}breadcrumb-border-radius));
+}
+
+.breadcrumb-item {
+ // The separator between breadcrumbs (by default, a forward-slash: "/")
+ + .breadcrumb-item {
+ padding-left: var(--#{$prefix}breadcrumb-item-padding-x);
+
+ &::before {
+ float: left; // Suppress inline spacings and underlining of the separator
+ padding-right: var(--#{$prefix}breadcrumb-item-padding-x);
+ color: var(--#{$prefix}breadcrumb-divider-color);
+ content: var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider)) #{"/* rtl:"} var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider-flipped)) #{"*/"};
+ }
+ }
+
+ &.active {
+ color: var(--#{$prefix}breadcrumb-item-active-color);
+ }
+}
diff --git a/dev/scss/bootstrap/_button-group.scss b/dev/scss/bootstrap/_button-group.scss
new file mode 100755
index 0000000..79b100c
--- /dev/null
+++ b/dev/scss/bootstrap/_button-group.scss
@@ -0,0 +1,142 @@
+// Make the div behave like a button
+.btn-group,
+.btn-group-vertical {
+ position: relative;
+ display: inline-flex;
+ vertical-align: middle; // match .btn alignment given font-size hack above
+
+ > .btn {
+ position: relative;
+ flex: 1 1 auto;
+ }
+
+ // Bring the hover, focused, and "active" buttons to the front to overlay
+ // the borders properly
+ > .btn-check:checked + .btn,
+ > .btn-check:focus + .btn,
+ > .btn:hover,
+ > .btn:focus,
+ > .btn:active,
+ > .btn.active {
+ z-index: 1;
+ }
+}
+
+// Optional: Group multiple button groups together for a toolbar
+.btn-toolbar {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+
+ .input-group {
+ width: auto;
+ }
+}
+
+.btn-group {
+ @include border-radius($btn-border-radius);
+
+ // Prevent double borders when buttons are next to each other
+ > :not(.btn-check:first-child) + .btn,
+ > .btn-group:not(:first-child) {
+ margin-left: -$btn-border-width;
+ }
+
+ // Reset rounded corners
+ > .btn:not(:last-child):not(.dropdown-toggle),
+ > .btn.dropdown-toggle-split:first-child,
+ > .btn-group:not(:last-child) > .btn {
+ @include border-end-radius(0);
+ }
+
+ // The left radius should be 0 if the button is:
+ // - the "third or more" child
+ // - the second child and the previous element isn't `.btn-check` (making it the first child visually)
+ // - part of a btn-group which isn't the first child
+ > .btn:nth-child(n + 3),
+ > :not(.btn-check) + .btn,
+ > .btn-group:not(:first-child) > .btn {
+ @include border-start-radius(0);
+ }
+}
+
+// Sizing
+//
+// Remix the default button sizing classes into new ones for easier manipulation.
+
+.btn-group-sm > .btn { @extend .btn-sm; }
+.btn-group-lg > .btn { @extend .btn-lg; }
+
+
+//
+// Split button dropdowns
+//
+
+.dropdown-toggle-split {
+ padding-right: $btn-padding-x * .75;
+ padding-left: $btn-padding-x * .75;
+
+ &::after,
+ .dropup &::after,
+ .dropend &::after {
+ margin-left: 0;
+ }
+
+ .dropstart &::before {
+ margin-right: 0;
+ }
+}
+
+.btn-sm + .dropdown-toggle-split {
+ padding-right: $btn-padding-x-sm * .75;
+ padding-left: $btn-padding-x-sm * .75;
+}
+
+.btn-lg + .dropdown-toggle-split {
+ padding-right: $btn-padding-x-lg * .75;
+ padding-left: $btn-padding-x-lg * .75;
+}
+
+
+// The clickable button for toggling the menu
+// Set the same inset shadow as the :active state
+.btn-group.show .dropdown-toggle {
+ @include box-shadow($btn-active-box-shadow);
+
+ // Show no shadow for `.btn-link` since it has no other button styles.
+ &.btn-link {
+ @include box-shadow(none);
+ }
+}
+
+
+//
+// Vertical button groups
+//
+
+.btn-group-vertical {
+ flex-direction: column;
+ align-items: flex-start;
+ justify-content: center;
+
+ > .btn,
+ > .btn-group {
+ width: 100%;
+ }
+
+ > .btn:not(:first-child),
+ > .btn-group:not(:first-child) {
+ margin-top: -$btn-border-width;
+ }
+
+ // Reset rounded corners
+ > .btn:not(:last-child):not(.dropdown-toggle),
+ > .btn-group:not(:last-child) > .btn {
+ @include border-bottom-radius(0);
+ }
+
+ > .btn ~ .btn,
+ > .btn-group:not(:first-child) > .btn {
+ @include border-top-radius(0);
+ }
+}
diff --git a/dev/scss/bootstrap/_buttons.scss b/dev/scss/bootstrap/_buttons.scss
new file mode 100755
index 0000000..f2c4c13
--- /dev/null
+++ b/dev/scss/bootstrap/_buttons.scss
@@ -0,0 +1,207 @@
+//
+// Base styles
+//
+
+.btn {
+ // scss-docs-start btn-css-vars
+ --#{$prefix}btn-padding-x: #{$btn-padding-x};
+ --#{$prefix}btn-padding-y: #{$btn-padding-y};
+ --#{$prefix}btn-font-family: #{$btn-font-family};
+ @include rfs($btn-font-size, --#{$prefix}btn-font-size);
+ --#{$prefix}btn-font-weight: #{$btn-font-weight};
+ --#{$prefix}btn-line-height: #{$btn-line-height};
+ --#{$prefix}btn-color: #{$body-color};
+ --#{$prefix}btn-bg: transparent;
+ --#{$prefix}btn-border-width: #{$btn-border-width};
+ --#{$prefix}btn-border-color: transparent;
+ --#{$prefix}btn-border-radius: #{$btn-border-radius};
+ --#{$prefix}btn-hover-border-color: transparent;
+ --#{$prefix}btn-box-shadow: #{$btn-box-shadow};
+ --#{$prefix}btn-disabled-opacity: #{$btn-disabled-opacity};
+ --#{$prefix}btn-focus-box-shadow: 0 0 0 #{$btn-focus-width} rgba(var(--#{$prefix}btn-focus-shadow-rgb), .5);
+ // scss-docs-end btn-css-vars
+
+ display: inline-block;
+ padding: var(--#{$prefix}btn-padding-y) var(--#{$prefix}btn-padding-x);
+ font-family: var(--#{$prefix}btn-font-family);
+ @include font-size(var(--#{$prefix}btn-font-size));
+ font-weight: var(--#{$prefix}btn-font-weight);
+ line-height: var(--#{$prefix}btn-line-height);
+ color: var(--#{$prefix}btn-color);
+ text-align: center;
+ text-decoration: if($link-decoration == none, null, none);
+ white-space: $btn-white-space;
+ vertical-align: middle;
+ cursor: if($enable-button-pointers, pointer, null);
+ user-select: none;
+ border: var(--#{$prefix}btn-border-width) solid var(--#{$prefix}btn-border-color);
+ @include border-radius(var(--#{$prefix}btn-border-radius));
+ @include gradient-bg(var(--#{$prefix}btn-bg));
+ @include box-shadow(var(--#{$prefix}btn-box-shadow));
+ @include transition($btn-transition);
+
+ &:hover {
+ color: var(--#{$prefix}btn-hover-color);
+ text-decoration: if($link-hover-decoration == underline, none, null);
+ background-color: var(--#{$prefix}btn-hover-bg);
+ border-color: var(--#{$prefix}btn-hover-border-color);
+ }
+
+ .btn-check + &:hover {
+ // override for the checkbox/radio buttons
+ color: var(--#{$prefix}btn-color);
+ background-color: var(--#{$prefix}btn-bg);
+ border-color: var(--#{$prefix}btn-border-color);
+ }
+
+ &:focus-visible {
+ color: var(--#{$prefix}btn-hover-color);
+ @include gradient-bg(var(--#{$prefix}btn-hover-bg));
+ border-color: var(--#{$prefix}btn-hover-border-color);
+ outline: 0;
+ // Avoid using mixin so we can pass custom focus shadow properly
+ @if $enable-shadows {
+ box-shadow: var(--#{$prefix}btn-box-shadow), var(--#{$prefix}btn-focus-box-shadow);
+ } @else {
+ box-shadow: var(--#{$prefix}btn-focus-box-shadow);
+ }
+ }
+
+ .btn-check:focus-visible + & {
+ border-color: var(--#{$prefix}btn-hover-border-color);
+ outline: 0;
+ // Avoid using mixin so we can pass custom focus shadow properly
+ @if $enable-shadows {
+ box-shadow: var(--#{$prefix}btn-box-shadow), var(--#{$prefix}btn-focus-box-shadow);
+ } @else {
+ box-shadow: var(--#{$prefix}btn-focus-box-shadow);
+ }
+ }
+
+ .btn-check:checked + &,
+ :not(.btn-check) + &:active,
+ &:first-child:active,
+ &.active,
+ &.show {
+ color: var(--#{$prefix}btn-active-color);
+ background-color: var(--#{$prefix}btn-active-bg);
+ // Remove CSS gradients if they're enabled
+ background-image: if($enable-gradients, none, null);
+ border-color: var(--#{$prefix}btn-active-border-color);
+ @include box-shadow(var(--#{$prefix}btn-active-shadow));
+
+ &:focus-visible {
+ // Avoid using mixin so we can pass custom focus shadow properly
+ @if $enable-shadows {
+ box-shadow: var(--#{$prefix}btn-active-shadow), var(--#{$prefix}btn-focus-box-shadow);
+ } @else {
+ box-shadow: var(--#{$prefix}btn-focus-box-shadow);
+ }
+ }
+ }
+
+ &:disabled,
+ &.disabled,
+ fieldset:disabled & {
+ color: var(--#{$prefix}btn-disabled-color);
+ pointer-events: none;
+ background-color: var(--#{$prefix}btn-disabled-bg);
+ background-image: if($enable-gradients, none, null);
+ border-color: var(--#{$prefix}btn-disabled-border-color);
+ opacity: var(--#{$prefix}btn-disabled-opacity);
+ @include box-shadow(none);
+ }
+}
+
+
+//
+// Alternate buttons
+//
+
+// scss-docs-start btn-variant-loops
+@each $color, $value in $theme-colors {
+ .btn-#{$color} {
+ @if $color == "light" {
+ @include button-variant(
+ $value,
+ $value,
+ $hover-background: shade-color($value, $btn-hover-bg-shade-amount),
+ $hover-border: shade-color($value, $btn-hover-border-shade-amount),
+ $active-background: shade-color($value, $btn-active-bg-shade-amount),
+ $active-border: shade-color($value, $btn-active-border-shade-amount)
+ );
+ } @else if $color == "dark" {
+ @include button-variant(
+ $value,
+ $value,
+ $hover-background: tint-color($value, $btn-hover-bg-tint-amount),
+ $hover-border: tint-color($value, $btn-hover-border-tint-amount),
+ $active-background: tint-color($value, $btn-active-bg-tint-amount),
+ $active-border: tint-color($value, $btn-active-border-tint-amount)
+ );
+ } @else {
+ @include button-variant($value, $value);
+ }
+ }
+}
+
+@each $color, $value in $theme-colors {
+ .btn-outline-#{$color} {
+ @include button-outline-variant($value);
+ }
+}
+// scss-docs-end btn-variant-loops
+
+
+//
+// Link buttons
+//
+
+// Make a button look and behave like a link
+.btn-link {
+ --#{$prefix}btn-font-weight: #{$font-weight-normal};
+ --#{$prefix}btn-color: #{$btn-link-color};
+ --#{$prefix}btn-bg: transparent;
+ --#{$prefix}btn-border-color: transparent;
+ --#{$prefix}btn-hover-color: #{$btn-link-hover-color};
+ --#{$prefix}btn-hover-border-color: transparent;
+ --#{$prefix}btn-active-color: #{$btn-link-hover-color};
+ --#{$prefix}btn-active-border-color: transparent;
+ --#{$prefix}btn-disabled-color: #{$btn-link-disabled-color};
+ --#{$prefix}btn-disabled-border-color: transparent;
+ --#{$prefix}btn-box-shadow: none;
+ --#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($primary), $primary, 15%))};
+
+ text-decoration: $link-decoration;
+ @if $enable-gradients {
+ background-image: none;
+ }
+
+ &:hover,
+ &:focus-visible {
+ text-decoration: $link-hover-decoration;
+ }
+
+ &:focus-visible {
+ color: var(--#{$prefix}btn-color);
+ }
+
+ &:hover {
+ color: var(--#{$prefix}btn-hover-color);
+ }
+
+ // No need for an active state here
+}
+
+
+//
+// Button Sizes
+//
+
+.btn-lg {
+ @include button-size($btn-padding-y-lg, $btn-padding-x-lg, $btn-font-size-lg, $btn-border-radius-lg);
+}
+
+.btn-sm {
+ @include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-border-radius-sm);
+}
diff --git a/dev/scss/bootstrap/_card.scss b/dev/scss/bootstrap/_card.scss
new file mode 100755
index 0000000..ce8c02f
--- /dev/null
+++ b/dev/scss/bootstrap/_card.scss
@@ -0,0 +1,234 @@
+//
+// Base styles
+//
+
+.card {
+ // scss-docs-start card-css-vars
+ --#{$prefix}card-spacer-y: #{$card-spacer-y};
+ --#{$prefix}card-spacer-x: #{$card-spacer-x};
+ --#{$prefix}card-title-spacer-y: #{$card-title-spacer-y};
+ --#{$prefix}card-border-width: #{$card-border-width};
+ --#{$prefix}card-border-color: #{$card-border-color};
+ --#{$prefix}card-border-radius: #{$card-border-radius};
+ --#{$prefix}card-box-shadow: #{$card-box-shadow};
+ --#{$prefix}card-inner-border-radius: #{$card-inner-border-radius};
+ --#{$prefix}card-cap-padding-y: #{$card-cap-padding-y};
+ --#{$prefix}card-cap-padding-x: #{$card-cap-padding-x};
+ --#{$prefix}card-cap-bg: #{$card-cap-bg};
+ --#{$prefix}card-cap-color: #{$card-cap-color};
+ --#{$prefix}card-height: #{$card-height};
+ --#{$prefix}card-color: #{$card-color};
+ --#{$prefix}card-bg: #{$card-bg};
+ --#{$prefix}card-img-overlay-padding: #{$card-img-overlay-padding};
+ --#{$prefix}card-group-margin: #{$card-group-margin};
+ // scss-docs-end card-css-vars
+
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106
+ height: var(--#{$prefix}card-height);
+ word-wrap: break-word;
+ background-color: var(--#{$prefix}card-bg);
+ background-clip: border-box;
+ border: var(--#{$prefix}card-border-width) solid var(--#{$prefix}card-border-color);
+ @include border-radius(var(--#{$prefix}card-border-radius));
+ @include box-shadow(var(--#{$prefix}card-box-shadow));
+
+ > hr {
+ margin-right: 0;
+ margin-left: 0;
+ }
+
+ > .list-group {
+ border-top: inherit;
+ border-bottom: inherit;
+
+ &:first-child {
+ border-top-width: 0;
+ @include border-top-radius(var(--#{$prefix}card-inner-border-radius));
+ }
+
+ &:last-child {
+ border-bottom-width: 0;
+ @include border-bottom-radius(var(--#{$prefix}card-inner-border-radius));
+ }
+ }
+
+ // Due to specificity of the above selector (`.card > .list-group`), we must
+ // use a child selector here to prevent double borders.
+ > .card-header + .list-group,
+ > .list-group + .card-footer {
+ border-top: 0;
+ }
+}
+
+.card-body {
+ // Enable `flex-grow: 1` for decks and groups so that card blocks take up
+ // as much space as possible, ensuring footers are aligned to the bottom.
+ flex: 1 1 auto;
+ padding: var(--#{$prefix}card-spacer-y) var(--#{$prefix}card-spacer-x);
+ color: var(--#{$prefix}card-color);
+}
+
+.card-title {
+ margin-bottom: var(--#{$prefix}card-title-spacer-y);
+}
+
+.card-subtitle {
+ margin-top: calc(-.5 * var(--#{$prefix}card-title-spacer-y)); // stylelint-disable-line function-disallowed-list
+ margin-bottom: 0;
+}
+
+.card-text:last-child {
+ margin-bottom: 0;
+}
+
+.card-link {
+ &:hover {
+ text-decoration: if($link-hover-decoration == underline, none, null);
+ }
+
+ + .card-link {
+ margin-left: var(--#{$prefix}card-spacer-x);
+ }
+}
+
+//
+// Optional textual caps
+//
+
+.card-header {
+ padding: var(--#{$prefix}card-cap-padding-y) var(--#{$prefix}card-cap-padding-x);
+ margin-bottom: 0; // Removes the default margin-bottom of
+ color: var(--#{$prefix}card-cap-color);
+ background-color: var(--#{$prefix}card-cap-bg);
+ border-bottom: var(--#{$prefix}card-border-width) solid var(--#{$prefix}card-border-color);
+
+ &:first-child {
+ @include border-radius(var(--#{$prefix}card-inner-border-radius) var(--#{$prefix}card-inner-border-radius) 0 0);
+ }
+}
+
+.card-footer {
+ padding: var(--#{$prefix}card-cap-padding-y) var(--#{$prefix}card-cap-padding-x);
+ color: var(--#{$prefix}card-cap-color);
+ background-color: var(--#{$prefix}card-cap-bg);
+ border-top: var(--#{$prefix}card-border-width) solid var(--#{$prefix}card-border-color);
+
+ &:last-child {
+ @include border-radius(0 0 var(--#{$prefix}card-inner-border-radius) var(--#{$prefix}card-inner-border-radius));
+ }
+}
+
+
+//
+// Header navs
+//
+
+.card-header-tabs {
+ margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
+ margin-bottom: calc(-1 * var(--#{$prefix}card-cap-padding-y)); // stylelint-disable-line function-disallowed-list
+ margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
+ border-bottom: 0;
+
+ .nav-link.active {
+ background-color: var(--#{$prefix}card-bg);
+ border-bottom-color: var(--#{$prefix}card-bg);
+ }
+}
+
+.card-header-pills {
+ margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
+ margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
+}
+
+// Card image
+.card-img-overlay {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ padding: var(--#{$prefix}card-img-overlay-padding);
+ @include border-radius(var(--#{$prefix}card-inner-border-radius));
+}
+
+.card-img,
+.card-img-top,
+.card-img-bottom {
+ width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
+}
+
+.card-img,
+.card-img-top {
+ @include border-top-radius(var(--#{$prefix}card-inner-border-radius));
+}
+
+.card-img,
+.card-img-bottom {
+ @include border-bottom-radius(var(--#{$prefix}card-inner-border-radius));
+}
+
+
+//
+// Card groups
+//
+
+.card-group {
+ // The child selector allows nested `.card` within `.card-group`
+ // to display properly.
+ > .card {
+ margin-bottom: var(--#{$prefix}card-group-margin);
+ }
+
+ @include media-breakpoint-up(sm) {
+ display: flex;
+ flex-flow: row wrap;
+ // The child selector allows nested `.card` within `.card-group`
+ // to display properly.
+ > .card {
+ // Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
+ flex: 1 0 0%;
+ margin-bottom: 0;
+
+ + .card {
+ margin-left: 0;
+ border-left: 0;
+ }
+
+ // Handle rounded corners
+ @if $enable-rounded {
+ &:not(:last-child) {
+ @include border-end-radius(0);
+
+ .card-img-top,
+ .card-header {
+ // stylelint-disable-next-line property-disallowed-list
+ border-top-right-radius: 0;
+ }
+ .card-img-bottom,
+ .card-footer {
+ // stylelint-disable-next-line property-disallowed-list
+ border-bottom-right-radius: 0;
+ }
+ }
+
+ &:not(:first-child) {
+ @include border-start-radius(0);
+
+ .card-img-top,
+ .card-header {
+ // stylelint-disable-next-line property-disallowed-list
+ border-top-left-radius: 0;
+ }
+ .card-img-bottom,
+ .card-footer {
+ // stylelint-disable-next-line property-disallowed-list
+ border-bottom-left-radius: 0;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/dev/scss/bootstrap/_carousel.scss b/dev/scss/bootstrap/_carousel.scss
new file mode 100755
index 0000000..3d8fb15
--- /dev/null
+++ b/dev/scss/bootstrap/_carousel.scss
@@ -0,0 +1,229 @@
+// Notes on the classes:
+//
+// 1. .carousel.pointer-event should ideally be pan-y (to allow for users to scroll vertically)
+// even when their scroll action started on a carousel, but for compatibility (with Firefox)
+// we're preventing all actions instead
+// 2. The .carousel-item-start and .carousel-item-end is used to indicate where
+// the active slide is heading.
+// 3. .active.carousel-item is the current slide.
+// 4. .active.carousel-item-start and .active.carousel-item-end is the current
+// slide in its in-transition state. Only one of these occurs at a time.
+// 5. .carousel-item-next.carousel-item-start and .carousel-item-prev.carousel-item-end
+// is the upcoming slide in transition.
+
+.carousel {
+ position: relative;
+}
+
+.carousel.pointer-event {
+ touch-action: pan-y;
+}
+
+.carousel-inner {
+ position: relative;
+ width: 100%;
+ overflow: hidden;
+ @include clearfix();
+}
+
+.carousel-item {
+ position: relative;
+ display: none;
+ float: left;
+ width: 100%;
+ margin-right: -100%;
+ backface-visibility: hidden;
+ @include transition($carousel-transition);
+}
+
+.carousel-item.active,
+.carousel-item-next,
+.carousel-item-prev {
+ display: block;
+}
+
+/* rtl:begin:ignore */
+.carousel-item-next:not(.carousel-item-start),
+.active.carousel-item-end {
+ transform: translateX(100%);
+}
+
+.carousel-item-prev:not(.carousel-item-end),
+.active.carousel-item-start {
+ transform: translateX(-100%);
+}
+
+/* rtl:end:ignore */
+
+
+//
+// Alternate transitions
+//
+
+.carousel-fade {
+ .carousel-item {
+ opacity: 0;
+ transition-property: opacity;
+ transform: none;
+ }
+
+ .carousel-item.active,
+ .carousel-item-next.carousel-item-start,
+ .carousel-item-prev.carousel-item-end {
+ z-index: 1;
+ opacity: 1;
+ }
+
+ .active.carousel-item-start,
+ .active.carousel-item-end {
+ z-index: 0;
+ opacity: 0;
+ @include transition(opacity 0s $carousel-transition-duration);
+ }
+}
+
+
+//
+// Left/right controls for nav
+//
+
+.carousel-control-prev,
+.carousel-control-next {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ z-index: 1;
+ // Use flex for alignment (1-3)
+ display: flex; // 1. allow flex styles
+ align-items: center; // 2. vertically center contents
+ justify-content: center; // 3. horizontally center contents
+ width: $carousel-control-width;
+ padding: 0;
+ color: $carousel-control-color;
+ text-align: center;
+ background: none;
+ border: 0;
+ opacity: $carousel-control-opacity;
+ @include transition($carousel-control-transition);
+
+ // Hover/focus state
+ &:hover,
+ &:focus {
+ color: $carousel-control-color;
+ text-decoration: none;
+ outline: 0;
+ opacity: $carousel-control-hover-opacity;
+ }
+}
+.carousel-control-prev {
+ left: 0;
+ background-image: if($enable-gradients, linear-gradient(90deg, rgba($black, .25), rgba($black, .001)), null);
+}
+.carousel-control-next {
+ right: 0;
+ background-image: if($enable-gradients, linear-gradient(270deg, rgba($black, .25), rgba($black, .001)), null);
+}
+
+// Icons for within
+.carousel-control-prev-icon,
+.carousel-control-next-icon {
+ display: inline-block;
+ width: $carousel-control-icon-width;
+ height: $carousel-control-icon-width;
+ background-repeat: no-repeat;
+ background-position: 50%;
+ background-size: 100% 100%;
+}
+
+/* rtl:options: {
+ "autoRename": true,
+ "stringMap":[ {
+ "name" : "prev-next",
+ "search" : "prev",
+ "replace" : "next"
+ } ]
+} */
+.carousel-control-prev-icon {
+ background-image: escape-svg($carousel-control-prev-icon-bg);
+}
+.carousel-control-next-icon {
+ background-image: escape-svg($carousel-control-next-icon-bg);
+}
+
+// Optional indicator pips/controls
+//
+// Add a container (such as a list) with the following class and add an item (ideally a focusable control,
+// like a button) with data-bs-target for each slide your carousel holds.
+
+.carousel-indicators {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 2;
+ display: flex;
+ justify-content: center;
+ padding: 0;
+ // Use the .carousel-control's width as margin so we don't overlay those
+ margin-right: $carousel-control-width;
+ margin-bottom: 1rem;
+ margin-left: $carousel-control-width;
+ list-style: none;
+
+ [data-bs-target] {
+ box-sizing: content-box;
+ flex: 0 1 auto;
+ width: $carousel-indicator-width;
+ height: $carousel-indicator-height;
+ padding: 0;
+ margin-right: $carousel-indicator-spacer;
+ margin-left: $carousel-indicator-spacer;
+ text-indent: -999px;
+ cursor: pointer;
+ background-color: $carousel-indicator-active-bg;
+ background-clip: padding-box;
+ border: 0;
+ // Use transparent borders to increase the hit area by 10px on top and bottom.
+ border-top: $carousel-indicator-hit-area-height solid transparent;
+ border-bottom: $carousel-indicator-hit-area-height solid transparent;
+ opacity: $carousel-indicator-opacity;
+ @include transition($carousel-indicator-transition);
+ }
+
+ .active {
+ opacity: $carousel-indicator-active-opacity;
+ }
+}
+
+
+// Optional captions
+//
+//
+
+.carousel-caption {
+ position: absolute;
+ right: (100% - $carousel-caption-width) * .5;
+ bottom: $carousel-caption-spacer;
+ left: (100% - $carousel-caption-width) * .5;
+ padding-top: $carousel-caption-padding-y;
+ padding-bottom: $carousel-caption-padding-y;
+ color: $carousel-caption-color;
+ text-align: center;
+}
+
+// Dark mode carousel
+
+.carousel-dark {
+ .carousel-control-prev-icon,
+ .carousel-control-next-icon {
+ filter: $carousel-dark-control-icon-filter;
+ }
+
+ .carousel-indicators [data-bs-target] {
+ background-color: $carousel-dark-indicator-active-bg;
+ }
+
+ .carousel-caption {
+ color: $carousel-dark-caption-color;
+ }
+}
diff --git a/dev/scss/bootstrap/_close.scss b/dev/scss/bootstrap/_close.scss
new file mode 100755
index 0000000..a0813de
--- /dev/null
+++ b/dev/scss/bootstrap/_close.scss
@@ -0,0 +1,40 @@
+// Transparent background and border properties included for button version.
+// iOS requires the button element instead of an anchor tag.
+// If you want the anchor version, it requires `href="#"`.
+// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
+
+.btn-close {
+ box-sizing: content-box;
+ width: $btn-close-width;
+ height: $btn-close-height;
+ padding: $btn-close-padding-y $btn-close-padding-x;
+ color: $btn-close-color;
+ background: transparent escape-svg($btn-close-bg) center / $btn-close-width auto no-repeat; // include transparent for button elements
+ border: 0; // for button elements
+ @include border-radius();
+ opacity: $btn-close-opacity;
+
+ // Override 's hover style
+ &:hover {
+ color: $btn-close-color;
+ text-decoration: none;
+ opacity: $btn-close-hover-opacity;
+ }
+
+ &:focus {
+ outline: 0;
+ box-shadow: $btn-close-focus-shadow;
+ opacity: $btn-close-focus-opacity;
+ }
+
+ &:disabled,
+ &.disabled {
+ pointer-events: none;
+ user-select: none;
+ opacity: $btn-close-disabled-opacity;
+ }
+}
+
+.btn-close-white {
+ filter: $btn-close-white-filter;
+}
diff --git a/dev/scss/bootstrap/_containers.scss b/dev/scss/bootstrap/_containers.scss
new file mode 100755
index 0000000..83b3138
--- /dev/null
+++ b/dev/scss/bootstrap/_containers.scss
@@ -0,0 +1,41 @@
+// Container widths
+//
+// Set the container width, and override it for fixed navbars in media queries.
+
+@if $enable-container-classes {
+ // Single container class with breakpoint max-widths
+ .container,
+ // 100% wide container at all breakpoints
+ .container-fluid {
+ @include make-container();
+ }
+
+ // Responsive containers that are 100% wide until a breakpoint
+ @each $breakpoint, $container-max-width in $container-max-widths {
+ .container-#{$breakpoint} {
+ @extend .container-fluid;
+ }
+
+ @include media-breakpoint-up($breakpoint, $grid-breakpoints) {
+ %responsive-container-#{$breakpoint} {
+ max-width: $container-max-width;
+ }
+
+ // Extend each breakpoint which is smaller or equal to the current breakpoint
+ $extend-breakpoint: true;
+
+ @each $name, $width in $grid-breakpoints {
+ @if ($extend-breakpoint) {
+ .container#{breakpoint-infix($name, $grid-breakpoints)} {
+ @extend %responsive-container-#{$breakpoint};
+ }
+
+ // Once the current breakpoint is reached, stop extending
+ @if ($breakpoint == $name) {
+ $extend-breakpoint: false;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/dev/scss/bootstrap/_dropdown.scss b/dev/scss/bootstrap/_dropdown.scss
new file mode 100755
index 0000000..8899d25
--- /dev/null
+++ b/dev/scss/bootstrap/_dropdown.scss
@@ -0,0 +1,249 @@
+// The dropdown wrapper (`
-
- {% trans "CPU utilization" %}
-
-
+
-
-
-
-
-
+
{% endblock %}
{% block script %}
-
+
{% endblock %}
diff --git a/computes/tests.py b/computes/tests.py
index 7ce503c..5f5cd67 100644
--- a/computes/tests.py
+++ b/computes/tests.py
@@ -1,3 +1,159 @@
+from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import reverse
from django.test import TestCase
-# Create your tests here.
+from .models import Compute
+
+
+class ComputesTestCase(TestCase):
+ def setUp(self):
+ self.client.login(username="admin", password="admin")
+ Compute(
+ name="local",
+ hostname="localhost",
+ login="",
+ password="",
+ details="local",
+ type=4,
+ ).save()
+
+ def test_index(self):
+ response = self.client.get(reverse("computes"))
+ self.assertEqual(response.status_code, 200)
+
+ def test_create_update_delete(self):
+ response = self.client.get(reverse("add_socket_host"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("add_socket_host"),
+ {
+ "name": "l1",
+ "details": "Created",
+ "hostname": "localhost",
+ "type": 4,
+ },
+ )
+ self.assertRedirects(response, reverse("computes"))
+
+ compute = Compute.objects.get(pk=2)
+ self.assertEqual(compute.name, "l1")
+ self.assertEqual(compute.details, "Created")
+
+ response = self.client.get(reverse("compute_update", args=[2]))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(
+ reverse("compute_update", args=[2]),
+ {
+ "name": "l2",
+ "details": "Updated",
+ "hostname": "localhost",
+ "type": 4,
+ },
+ )
+ self.assertRedirects(response, reverse("computes"))
+
+ compute = Compute.objects.get(pk=2)
+ self.assertEqual(compute.name, "l2")
+ self.assertEqual(compute.details, "Updated")
+
+ response = self.client.get(reverse("compute_delete", args=[2]))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("compute_delete", args=[2]))
+ self.assertRedirects(response, reverse("computes"))
+
+ with self.assertRaises(ObjectDoesNotExist):
+ Compute.objects.get(id=2)
+
+ def test_overview(self):
+ response = self.client.get(reverse("overview", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ def test_graph(self):
+ response = self.client.get(reverse("compute_graph", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ def test_instances(self):
+ response = self.client.get(reverse("instances", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ def test_storages(self):
+ response = self.client.get(reverse("storages", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ def test_storage(self):
+ pass
+
+ def test_default_storage_volumes(self):
+ response = self.client.get(
+ reverse("volumes", kwargs={"compute_id": 1, "pool": "default"})
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_default_storage(self):
+ response = self.client.get(
+ reverse("storage", kwargs={"compute_id": 1, "pool": "default"})
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_networks(self):
+ response = self.client.get(reverse("networks", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ def test_default_network(self):
+ response = self.client.get(
+ reverse("network", kwargs={"compute_id": 1, "pool": "default"})
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_interfaces(self):
+ response = self.client.get(reverse("interfaces", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ # TODO: add test for single interface
+
+ def test_nwfilters(self):
+ response = self.client.get(reverse("nwfilters", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ # TODO: add test for single nwfilter
+
+ def test_secrets(self):
+ response = self.client.get(reverse("virtsecrets", args=[1]))
+ self.assertEqual(response.status_code, 200)
+
+ # def test_create_instance_select_type(self):
+ # response = self.client.get(reverse('create_instance_select_type', args=[1]))
+ # self.assertEqual(response.status_code, 200)
+
+ # TODO: create_instance
+
+ def test_machines(self):
+ response = self.client.get(
+ reverse("machines", kwargs={"compute_id": 1, "arch": "x86_64"})
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_compute_disk_buses(self):
+ response = self.client.get(
+ reverse(
+ "buses",
+ kwargs={
+ "compute_id": 1,
+ "arch": "x86_64",
+ "machine": "pc",
+ "disk": "disk",
+ },
+ )
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_dom_capabilities(self):
+ response = self.client.get(
+ reverse(
+ "domcaps", kwargs={"compute_id": 1, "arch": "x86_64", "machine": "pc"}
+ )
+ )
+ self.assertEqual(response.status_code, 200)
diff --git a/computes/urls.py b/computes/urls.py
index 58a0497..99a3743 100644
--- a/computes/urls.py
+++ b/computes/urls.py
@@ -1,9 +1,79 @@
-from django.conf.urls import url
-from . import views
+from virtsecrets.views import secrets
+
+from django.urls import include, path
+from interfaces.views import interface, interfaces
+from networks.views import network, networks
+from nwfilters.views import nwfilter, nwfilters
+from storages.views import create_volume, get_volumes, storage, storages
+
+from . import forms, views
urlpatterns = [
- url(r'^$', views.computes, name='computes'),
- url(r'^overview/(?P{% trans "Basic details" %}
+-
+
- {% trans "Hostname" %} +
- {{ hostname }} +
- {% trans "Hypervisors" %} +
-
+ + {% for arch, hpv in hypervisor.items|slice:":4" %} + + -+-+--
{% trans "RAM utilization" %}
--+ {% endfor %} +--- --+ {% if hypervisor.items|length > 4 %} + + + {% endif %} ++ +- {% trans "Emulator" %}
+- {{ emulator }}
+- {% trans "Version" %}
+- + {% trans 'Qemu' %} + {{ version }} + {% trans 'Libvirt' %} + {{ lib_version }} +
+- {% trans "Memory" %}
+- {{ host_memory|filesizeformat }}
+- {% trans "Architecture" %}
+- {{ host_arch }}
+- {% trans "Logical CPUs" %}
+- {{ logical_cpu }}
+- {% trans "Processor" %}
+- {{ model_cpu }}
+- {% trans "Connection" %}
+- {{ uri_conn }}
+- {% trans "Details" %}
+- {{ compute.details }}
+ + +{% trans "Performance" %}
+++++ ++++ {% bs_icon 'arrow-right' %} + {% trans "CPU Utilization" %} +
+ ++++ {% bs_icon 'arrow-right'%} {% trans "RAM Utilization" %} +
+
+
+ {% block content %}{% endblock %}
+
+
+
+
+
+
+ {% block foot %}{% endblock %}
+
+
+
\ No newline at end of file
diff --git a/console/templates/console-spice-full.html b/console/templates/console-spice-full.html
new file mode 100644
index 0000000..0dfed9f
--- /dev/null
+++ b/console/templates/console-spice-full.html
@@ -0,0 +1,231 @@
+
+{% extends "console-base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% block head %}
+
+ SPICE
+
+
+
+
+
+ {% if perms.instances.passwordless_console %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block foot %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/console/templates/console-spice-lite.html b/console/templates/console-spice-lite.html
new file mode 100644
index 0000000..469c971
--- /dev/null
+++ b/console/templates/console-spice-lite.html
@@ -0,0 +1,232 @@
+
+{% extends "console-base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% block head %}
+
+
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/console/templates/console-spice.html b/console/templates/console-spice.html
deleted file mode 100644
index 4704ef3..0000000
--- a/console/templates/console-spice.html
+++ /dev/null
@@ -1,333 +0,0 @@
-{% load i18n %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/console/templates/console-vnc-full.html b/console/templates/console-vnc-full.html
new file mode 100755
index 0000000..a6ae1af
--- /dev/null
+++ b/console/templates/console-vnc-full.html
@@ -0,0 +1,330 @@
+{% extends "console-base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% block head %}
+
+
+
+
+
+
+
+ +
+{% trans 'noVNC encountered an error' %}:
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ no
+
+
+
+
+
+
+
+
+
+
+ no
VNC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
Power
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ Clipboard
+
+
+ + +
+
+
+
+
+
+
+
+ -
+
-
+
+
- + + +
- + + +
-
+
+
+ - + + +
- + + + +
-
+
+
+ -
+
+ +
-
+
- + + + +
- + + + +
- + + + +
-
+
+ +
-
+
- + + +
- + + + +
- + + + +
- + + + + +
+ - + + +
- + + + +
- + + +
- + + +
+ - + Version: + + +
+
+
+
+
+
+noVNC
+
+ Connect
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/console/templates/console-vnc-lite.html b/console/templates/console-vnc-lite.html
new file mode 100755
index 0000000..3da589a
--- /dev/null
+++ b/console/templates/console-vnc-lite.html
@@ -0,0 +1,234 @@
+{% extends "console-base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% block head %}
+
+
+
+
+{% trans 'Loading' %}
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/console/templates/console-vnc.html b/console/templates/console-vnc.html
deleted file mode 100644
index 59d0afa..0000000
--- a/console/templates/console-vnc.html
+++ /dev/null
@@ -1,205 +0,0 @@
-{% load i18n %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/console/templates/console-xterm.html b/console/templates/console-xterm.html
new file mode 100644
index 0000000..82d43ce
--- /dev/null
+++ b/console/templates/console-xterm.html
@@ -0,0 +1,111 @@
+{% extends "console-base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% block head %}
+
+ Status: connecting...
+
+
+
+
+
+{% endblock %}
diff --git a/console/tunnel.py b/console/tunnel.py
deleted file mode 100644
index a6ba2c8..0000000
--- a/console/tunnel.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This class provide from VirtManager project, from console.py
-# file.
-#
-# Copyright (C) 2006-2008 Red Hat, Inc.
-# Copyright (C) 2006 Daniel P. Berrange
-
-
-
- {% include 'errors_block.html' %}
-
-
- {% include 'create_flav_block.html' %}
-
- {% trans "New instance on" %} {{ compute.name }}
-
-
-
-
-
- - - {% trans "Custom" %} - - - {% trans "Template" %} - - - {% trans "XML" %} - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% if not flavors %}
-
-{% endblock %}
-{% block script %}
-
-
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/create/views.py b/create/views.py
deleted file mode 100644
index 5b03f8c..0000000
--- a/create/views.py
+++ /dev/null
@@ -1,140 +0,0 @@
-from django.shortcuts import render, get_object_or_404
-from django.http import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
-from computes.models import Compute
-from create.models import Flavor
-from create.forms import FlavorAddForm, NewVMForm
-from instances.models import Instance
-from vrtManager.create import wvmCreate
-from vrtManager import util
-from libvirt import libvirtError
-
-
-def create_instance(request, compute_id):
- """
- :param request:
- :return:
- """
-
- if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse('index'))
-
- if not request.user.is_superuser:
- return HttpResponseRedirect(reverse('index'))
-
- conn = None
- error_messages = []
- storages = []
- networks = []
- meta_prealloc = False
- computes = Compute.objects.all()
- compute = get_object_or_404(Compute, pk=compute_id)
- flavors = Flavor.objects.filter().order_by('id')
-
- try:
- conn = wvmCreate(compute.hostname,
- compute.login,
- compute.password,
- compute.type)
-
- storages = sorted(conn.get_storages())
- networks = sorted(conn.get_networks())
- instances = conn.get_instances()
- get_images = sorted(conn.get_storages_images())
- mac_auto = util.randomMAC()
- except libvirtError as lib_err:
- error_messages.append(lib_err)
-
- if conn:
- if not storages:
- msg = _("You haven't defined any storage pools")
- error_messages.append(msg)
- if not networks:
- msg = _("You haven't defined any network pools")
- error_messages.append(msg)
-
- if request.method == 'POST':
- if 'create_flavor' in request.POST:
- form = FlavorAddForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- create_flavor = Flavor(label=data['label'],
- vcpu=data['vcpu'],
- memory=data['memory'],
- disk=data['disk'])
- create_flavor.save()
- return HttpResponseRedirect(request.get_full_path())
- if 'delete_flavor' in request.POST:
- flavor_id = request.POST.get('flavor', '')
- delete_flavor = Flavor.objects.get(id=flavor_id)
- delete_flavor.delete()
- return HttpResponseRedirect(request.get_full_path())
- if 'create_xml' in request.POST:
- xml = request.POST.get('from_xml', '')
- try:
- name = util.get_xml_path(xml, '/domain/name')
- except util.libxml2.parserError:
- name = None
- if name in instances:
- error_msg = _("A virtual machine with this name already exists")
- error_messages.append(error_msg)
- else:
- try:
- conn._defineXML(xml)
- return HttpResponseRedirect(reverse('instance', args=[compute_id, name]))
- except libvirtError as lib_err:
- error_messages.append(lib_err.message)
- if 'create' in request.POST:
- volumes = {}
- form = NewVMForm(request.POST)
- if form.is_valid():
- data = form.cleaned_data
- if data['meta_prealloc']:
- meta_prealloc = True
- if instances:
- if data['name'] in instances:
- msg = _("A virtual machine with this name already exists")
- error_messages.append(msg)
- if not error_messages:
- if data['hdd_size']:
- if not data['mac']:
- error_msg = _("No Virtual Machine MAC has been entered")
- error_messages.append(error_msg)
- else:
- try:
- path = conn.create_volume(data['storage'], data['name'], data['hdd_size'],
- metadata=meta_prealloc)
- volumes[path] = conn.get_volume_type(path)
- except libvirtError as lib_err:
- error_messages.append(lib_err.message)
- elif data['template']:
- templ_path = conn.get_volume_path(data['template'])
- clone_path = conn.clone_from_template(data['name'], templ_path, metadata=meta_prealloc)
- volumes[clone_path] = conn.get_volume_type(clone_path)
- else:
- if not data['images']:
- error_msg = _("First you need to create or select an image")
- error_messages.append(error_msg)
- else:
- for vol in data['images'].split(','):
- try:
- path = conn.get_volume_path(vol)
- volumes[path] = conn.get_volume_type(path)
- except libvirtError as lib_err:
- error_messages.append(lib_err.message)
- if not error_messages:
- uuid = util.randomUUID()
- try:
- conn.create_instance(data['name'], data['memory'], data['vcpu'], data['host_model'],
- uuid, volumes, data['networks'], data['virtio'], data['mac'])
- create_instance = Instance(compute_id=compute_id, name=data['name'], uuid=uuid)
- create_instance.save()
- return HttpResponseRedirect(reverse('instance', args=[compute_id, data['name']]))
- except libvirtError as lib_err:
- if data['hdd_size']:
- conn.delete_volume(volumes.keys()[0])
- error_messages.append(lib_err)
- conn.close()
-
- return render(request, 'create_instance.html', locals())
diff --git a/secrets/__init__.py b/datasource/__init__.py
similarity index 100%
rename from secrets/__init__.py
rename to datasource/__init__.py
diff --git a/secrets/migrations/__init__.py b/datasource/migrations/__init__.py
similarity index 100%
rename from secrets/migrations/__init__.py
rename to datasource/migrations/__init__.py
diff --git a/datasource/models.py b/datasource/models.py
new file mode 100644
index 0000000..6b20219
--- /dev/null
+++ b/datasource/models.py
@@ -0,0 +1 @@
+# Create your models here.
diff --git a/datasource/templates/user_data b/datasource/templates/user_data
new file mode 100644
index 0000000..f6a4a58
--- /dev/null
+++ b/datasource/templates/user_data
@@ -0,0 +1,6 @@
+#cloud-config
+{% if instance_keys %}
+ssh_authorized_keys:
+{% for key in instance_keys %} - {{ key }}
+{% endfor %}
+{% endif %}
diff --git a/secrets/tests.py b/datasource/tests.py
similarity index 100%
rename from secrets/tests.py
rename to datasource/tests.py
diff --git a/datasource/urls.py b/datasource/urls.py
new file mode 100644
index 0000000..4c8f512
--- /dev/null
+++ b/datasource/urls.py
@@ -0,0 +1,16 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+ path("openstack/", views.os_index, name="ds_openstack_index"),
+ path(
+ "openstack/
-
- {% else %}
-
-
- {% trans "Warning:" %} {% trans "Hypervisor doesn't have any Flavors" %}
-
-
-
- {% endif %}
- {% trans "Create from flover" %}
-
-
-
-
-
- | # | -{% trans "Name" %} | -{% trans "VCPU's" %} | -{% trans "RAM" %} | -{% trans "HDD" %} | -{% trans "Action" %} | -|
|---|---|---|---|---|---|---|
| {{ forloop.counter }} | -{{ flavor.label }} | -{{ flavor.vcpu }} | -{{ flavor.memory }} {% trans "MB" %} | -{{ flavor.disk }} {% trans "GB" %} | -- - - - - | -- - | -
`)
+.dropup,
+.dropend,
+.dropdown,
+.dropstart,
+.dropup-center,
+.dropdown-center {
+ position: relative;
+}
+
+.dropdown-toggle {
+ white-space: nowrap;
+
+ // Generate the caret automatically
+ @include caret();
+}
+
+// The dropdown menu
+.dropdown-menu {
+ // scss-docs-start dropdown-css-vars
+ --#{$prefix}dropdown-zindex: #{$zindex-dropdown};
+ --#{$prefix}dropdown-min-width: #{$dropdown-min-width};
+ --#{$prefix}dropdown-padding-x: #{$dropdown-padding-x};
+ --#{$prefix}dropdown-padding-y: #{$dropdown-padding-y};
+ --#{$prefix}dropdown-spacer: #{$dropdown-spacer};
+ @include rfs($dropdown-font-size, --#{$prefix}dropdown-font-size);
+ --#{$prefix}dropdown-color: #{$dropdown-color};
+ --#{$prefix}dropdown-bg: #{$dropdown-bg};
+ --#{$prefix}dropdown-border-color: #{$dropdown-border-color};
+ --#{$prefix}dropdown-border-radius: #{$dropdown-border-radius};
+ --#{$prefix}dropdown-border-width: #{$dropdown-border-width};
+ --#{$prefix}dropdown-inner-border-radius: #{$dropdown-inner-border-radius};
+ --#{$prefix}dropdown-divider-bg: #{$dropdown-divider-bg};
+ --#{$prefix}dropdown-divider-margin-y: #{$dropdown-divider-margin-y};
+ --#{$prefix}dropdown-box-shadow: #{$dropdown-box-shadow};
+ --#{$prefix}dropdown-link-color: #{$dropdown-link-color};
+ --#{$prefix}dropdown-link-hover-color: #{$dropdown-link-hover-color};
+ --#{$prefix}dropdown-link-hover-bg: #{$dropdown-link-hover-bg};
+ --#{$prefix}dropdown-link-active-color: #{$dropdown-link-active-color};
+ --#{$prefix}dropdown-link-active-bg: #{$dropdown-link-active-bg};
+ --#{$prefix}dropdown-link-disabled-color: #{$dropdown-link-disabled-color};
+ --#{$prefix}dropdown-item-padding-x: #{$dropdown-item-padding-x};
+ --#{$prefix}dropdown-item-padding-y: #{$dropdown-item-padding-y};
+ --#{$prefix}dropdown-header-color: #{$dropdown-header-color};
+ --#{$prefix}dropdown-header-padding-x: #{$dropdown-header-padding-x};
+ --#{$prefix}dropdown-header-padding-y: #{$dropdown-header-padding-y};
+ // scss-docs-end dropdown-css-vars
+
+ position: absolute;
+ z-index: var(--#{$prefix}dropdown-zindex);
+ display: none; // none by default, but block on "open" of the menu
+ min-width: var(--#{$prefix}dropdown-min-width);
+ padding: var(--#{$prefix}dropdown-padding-y) var(--#{$prefix}dropdown-padding-x);
+ margin: 0; // Override default margin of ul
+ @include font-size(var(--#{$prefix}dropdown-font-size));
+ color: var(--#{$prefix}dropdown-color);
+ text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
+ list-style: none;
+ background-color: var(--#{$prefix}dropdown-bg);
+ background-clip: padding-box;
+ border: var(--#{$prefix}dropdown-border-width) solid var(--#{$prefix}dropdown-border-color);
+ @include border-radius(var(--#{$prefix}dropdown-border-radius));
+ @include box-shadow(var(--#{$prefix}dropdown-box-shadow));
+
+ &[data-bs-popper] {
+ top: 100%;
+ left: 0;
+ margin-top: var(--#{$prefix}dropdown-spacer);
+ }
+
+ @if $dropdown-padding-y == 0 {
+ > .dropdown-item:first-child,
+ > li:first-child .dropdown-item {
+ @include border-top-radius(var(--#{$prefix}dropdown-inner-border-radius));
+ }
+ > .dropdown-item:last-child,
+ > li:last-child .dropdown-item {
+ @include border-bottom-radius(var(--#{$prefix}dropdown-inner-border-radius));
+ }
+
+ }
+}
+
+// scss-docs-start responsive-breakpoints
+// We deliberately hardcode the `bs-` prefix because we check
+// this custom property in JS to determine Popper's positioning
+
+@each $breakpoint in map-keys($grid-breakpoints) {
+ @include media-breakpoint-up($breakpoint) {
+ $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+
+ .dropdown-menu#{$infix}-start {
+ --bs-position: start;
+
+ &[data-bs-popper] {
+ right: auto;
+ left: 0;
+ }
+ }
+
+ .dropdown-menu#{$infix}-end {
+ --bs-position: end;
+
+ &[data-bs-popper] {
+ right: 0;
+ left: auto;
+ }
+ }
+ }
+}
+// scss-docs-end responsive-breakpoints
+
+// Allow for dropdowns to go bottom up (aka, dropup-menu)
+// Just add .dropup after the standard .dropdown class and you're set.
+.dropup {
+ .dropdown-menu[data-bs-popper] {
+ top: auto;
+ bottom: 100%;
+ margin-top: 0;
+ margin-bottom: var(--#{$prefix}dropdown-spacer);
+ }
+
+ .dropdown-toggle {
+ @include caret(up);
+ }
+}
+
+.dropend {
+ .dropdown-menu[data-bs-popper] {
+ top: 0;
+ right: auto;
+ left: 100%;
+ margin-top: 0;
+ margin-left: var(--#{$prefix}dropdown-spacer);
+ }
+
+ .dropdown-toggle {
+ @include caret(end);
+ &::after {
+ vertical-align: 0;
+ }
+ }
+}
+
+.dropstart {
+ .dropdown-menu[data-bs-popper] {
+ top: 0;
+ right: 100%;
+ left: auto;
+ margin-top: 0;
+ margin-right: var(--#{$prefix}dropdown-spacer);
+ }
+
+ .dropdown-toggle {
+ @include caret(start);
+ &::before {
+ vertical-align: 0;
+ }
+ }
+}
+
+
+// Dividers (basically an `
`) within the dropdown +.dropdown-divider { + height: 0; + margin: var(--#{$prefix}dropdown-divider-margin-y) 0; + overflow: hidden; + border-top: 1px solid var(--#{$prefix}dropdown-divider-bg); + opacity: 1; // Revisit in v6 to de-dupe styles that conflict with
element +} + +// Links, buttons, and more within the dropdown menu +// +// `
`) within the dropdown +.dropdown-divider { + height: 0; + margin: var(--#{$prefix}dropdown-divider-margin-y) 0; + overflow: hidden; + border-top: 1px solid var(--#{$prefix}dropdown-divider-bg); + opacity: 1; // Revisit in v6 to de-dupe styles that conflict with
element +} + +// Links, buttons, and more within the dropdown menu +// +// `