From 4404d5941bd9b7830d2be9f82954f4bee4d9aac7 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Tue, 19 Jun 2018 13:06:57 +0200
Subject: [PATCH 01/10] add settings.CLONE_INSTANCE_AUTO_NAME. add mechanism
 that automatically selects new vname, mac, disk image names.

---
 instances/templates/instance.html |  4 ++++
 instances/views.py                | 29 +++++++++++++++++++++++++----
 webvirtcloud/settings.py.template |  1 +
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index f6dc355..061c394 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -843,6 +843,10 @@
                                                                 <button type="button" class="btn btn-sm btn-success pull-left" name="guess-clone-name"
                                                                         onclick="guess_clone_name()" style="margin-top: 2px;">{% trans "Guess" %}</button>
                                                             </div>
+                                                            {% elif clone_instance_auto_name %}
+                                                            <div class="col-sm-4">
+                                                                <input id="clone_instance_auto_name" type="text" class="form-control" name="auto_name" value="Automatic" disabled/>
+                                                            </div>
                                                             {% else %}
                                                             <div class="col-sm-4">
                                                                 <select id="select_clone_name" class="form-control" name="name" size="1"/>
diff --git a/instances/views.py b/instances/views.py
index 436110f..4d819a0 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -348,6 +348,7 @@ def instance(request, compute_id, vname):
         default_bus = settings.INSTANCE_VOLUME_DEFAULT_BUS
         show_access_root_password = settings.SHOW_ACCESS_ROOT_PASSWORD
         show_access_ssh_keys = settings.SHOW_ACCESS_SSH_KEYS
+        clone_instance_auto_name = settings.CLONE_INSTANCE_AUTO_NAME
 
         try:
             instance = Instance.objects.get(compute_id=compute_id, name=vname)
@@ -705,6 +706,21 @@ def instance(request, compute_id, vname):
                     for post in request.POST:
                         clone_data[post] = request.POST.get(post, '').strip()
                     
+                    if clone_instance_auto_name:
+                        auto_vname = clone_free_names[0]
+                        clone_data['name'] = auto_vname
+                        clone_data['clone-net-mac-0'] = _get_dhcp_mac_address(auto_vname)
+                        for post in clone_data.keys():
+                            if post.startswith('disk-'):
+                                disk_name = clone_data[post]
+                                if "-" in disk_name:
+                                    suffix = disk_name.split("-")[-1]
+                                    disk_name = '-'.join((auto_vname, suffix))
+                                else:
+                                    suffix = disk_name.split(".")[-1]
+                                    disk_name = '.'.join((auto_vname, suffix))
+                                clone_data[post] = disk_name
+                    
                     if not request.user.is_superuser and quota_msg:
                         msg = _("User %s quota reached, cannot create '%s'!" % (quota_msg, clone_data['name']))
                         error_messages.append(msg)
@@ -883,10 +899,9 @@ def inst_graph(request, compute_id, vname):
     response.write(data)
     return response
 
-@login_required
-def guess_mac_address(request, vname):
+def _get_dhcp_mac_address(vname):
     dhcp_file = '/srv/webvirtcloud/dhcpd.conf'
-    data = { 'vname': vname, 'mac': '52:54:00:' }
+    mac = '52:54:00:'
     if os.path.isfile(dhcp_file):
         with open(dhcp_file, 'r') as f:
             name_found = False
@@ -894,8 +909,14 @@ def guess_mac_address(request, vname):
                 if "host %s." % vname in line:
                     name_found = True
                 if name_found and "hardware ethernet" in line:
-                    data['mac'] = line.split(' ')[-1].strip().strip(';')
+                    mac = line.split(' ')[-1].strip().strip(';')
                     break
+    return mac
+
+@login_required
+def guess_mac_address(request, vname):
+    data = { 'vname': vname }
+    data['mac'] = _get_dhcp_mac_address(vname)
     return HttpResponse(json.dumps(data))
 
 @login_required
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index b7ba1ea..f9fa254 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -125,6 +125,7 @@ LIBVIRT_KEEPALIVE_COUNT = 5
 ALLOW_INSTANCE_MULTIPLE_OWNER = True
 NEW_USER_DEFAULT_INSTANCES = []
 CLONE_INSTANCE_DEFAULT_PREFIX = 'instance'
+CLONE_INSTANCE_AUTO_NAME = False
 LOGS_PER_PAGE = 100
 QUOTA_DEBUG = True
 ALLOW_EMPTY_PASSWORD = True

From 464e7bee39f0964900ead62831705caa8dd118f5 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 21 Jun 2018 14:53:35 +0200
Subject: [PATCH 02/10] add vdiconsole datasource endpoint. provides vdi url
 for remote-viewer.

add instance/access/vdi panel
---
 datasource/urls.py                |  2 ++
 datasource/views.py               | 24 ++++++++++++++++++++++++
 instances/templates/instance.html | 20 ++++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/datasource/urls.py b/datasource/urls.py
index 9183d41..ec02ad3 100644
--- a/datasource/urls.py
+++ b/datasource/urls.py
@@ -8,4 +8,6 @@ urlpatterns = [
         views.os_metadata_json, name='ds_openstack_metadata'),
     url(r'^openstack/(?P<version>[\w\-\.]+)/user_data$',
         views.os_userdata, name='ds_openstack_userdata'),
+    url(r'^vdi/(?P<vname>[\w\-\.]+)/$',
+        views.get_vdi_url, name='vdi_url'),
 ]
diff --git a/datasource/views.py b/datasource/views.py
index 9264717..d23d99a 100644
--- a/datasource/views.py
+++ b/datasource/views.py
@@ -1,6 +1,9 @@
 from django.shortcuts import render
 from django.http import HttpResponse, Http404
 from accounts.models import UserInstance, UserSSHKey
+from instances.models import Instance
+from vrtManager.instance import wvmInstance
+from libvirt import libvirtError
 import json
 import socket
 
@@ -62,3 +65,24 @@ def get_client_ip(request):
 def get_hostname_by_ip(ip):
     addrs = socket.gethostbyaddr(ip)
     return addrs[0]
+
+def get_vdi_url(request, vname):
+    instance = Instance.objects.get(name=vname)
+    compute = instance.compute
+    data = {}
+    try:
+        conn = wvmInstance(compute.hostname,
+                           compute.login,
+                           compute.password,
+                           compute.type,
+                           instance.name)
+
+        fqdn = get_hostname_by_ip(compute.hostname)
+        url = "{}://{}:{}".format(conn.get_console_type(), fqdn, conn.get_console_port())
+        response = url
+        return HttpResponse(response)
+    
+    except libvirtError as lib_err:
+        err = "Error getting vdi url for {}".format(vname)
+        raise Http404(err)
+
diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 061c394..13336b5 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -241,6 +241,13 @@
                                                 </a>
                                             </li>
                                             {% endif %}
+                                            {% ifequal status 1 %}
+                                            <li role="presentation">
+                                                <a href="#vdiconsole" aria-controls="vdiconsole" role="tab" data-toggle="tab">
+                                                    {% trans "VDI" %}
+                                                </a>
+                                            </li>
+                                            {% endifequal %}
                                         </ul>
                                         <!-- Tab panes -->
                                         <div class="tab-content">
@@ -297,6 +304,13 @@
                                                 <div class="clearfix"></div>
                                             </div>
                                             {% endif %}
+                                            {% ifequal status 1 %}
+                                            <div role="tabpanel" class="tab-pane tab-pane-bordered" id="vdiconsole">
+                                                    <p>{% trans "This action opens a remote viewer with a connection to the console of the instance." %}</p>
+                                                    <a href="#" class="btn btn-lg btn-success pull-right" id="vdi_url" >{% trans "VDI" %}</a>
+                                                <div class="clearfix"></div>
+                                            </div>
+                                            {% endifequal %}
                                         </div>
                                     </div>
                                 </div>
@@ -1305,6 +1319,12 @@
             $("#console_select_listen_address option[value='" + console_listen_address + "']").prop('selected', true);
         }
     });
+    $(document).ready(function () {
+        // set vdi url
+        $.get("/datasource/vdi/{{ vname }}/", function(data) {
+            $("#vdi_url").attr("href", data);
+        });
+    });
 {% if not request.user.is_superuser %}
     $('#select_clone_name').on('change', function () {
         update_clone_disk_name($(this).val());

From 5e8adec42444fd1d953ec7ef913e277fd7fdb592 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 21 Jun 2018 15:13:12 +0200
Subject: [PATCH 03/10] fix 920739c: instances/views/instance must initialize
 console_listen_address

---
 instances/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/instances/views.py b/instances/views.py
index f07eec5..2e8fb35 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -330,6 +330,7 @@ def instance(request, compute_id, vname):
         console_type = conn.get_console_type()
         console_port = conn.get_console_port()
         console_keymap = conn.get_console_keymap()
+        console_listen_address = conn.get_console_listen_addr()
         snapshots = sorted(conn.get_snapshot(), reverse=True, key=lambda k:k['date'])
         inst_xml = conn._XMLDesc(VIR_DOMAIN_XML_SECURE)
         has_managed_save_image = conn.get_managed_save_image()

From 19489cb08eeec1f2fcc9eddacf7df03eaa6ba174 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Fri, 22 Jun 2018 10:55:24 +0200
Subject: [PATCH 04/10] fix 4404d59: clone instance cannot set new vname

---
 instances/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instances/views.py b/instances/views.py
index 2e8fb35..fbec724 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -706,7 +706,7 @@ def instance(request, compute_id, vname):
                     for post in request.POST:
                         clone_data[post] = request.POST.get(post, '').strip()
                     
-                    if clone_instance_auto_name:
+                    if clone_instance_auto_name and not clone_data['name']:
                         auto_vname = clone_free_names[0]
                         clone_data['name'] = auto_vname
                         clone_data['clone-net-mac-0'] = _get_dhcp_mac_address(auto_vname)

From 9f7ec6222609250848940e6f30251541194a569f Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 26 Jul 2018 11:33:12 +0200
Subject: [PATCH 05/10] accounts: add public key check

---
 accounts/views.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/accounts/views.py b/accounts/views.py
index 00bd392..e7a0aa3 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -54,6 +54,9 @@ def profile(request):
                 if keypublic == key.keypublic:
                     msg = _("Public key already exist")
                     error_messages.append(msg)
+            if '\n' in keypublic or '\r' in keypublic:
+                msg = _("Invalid characters in public key")
+                error_messages.append(msg)
             if not error_messages:
                 addkeypublic = UserSSHKey(user_id=request.user.id, keyname=keyname, keypublic=keypublic)
                 addkeypublic.save()

From 13ffaae522160505b75fcfdaea662df19318fda4 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 26 Jul 2018 11:35:37 +0200
Subject: [PATCH 06/10] instance/clone: move random_mac logic into
 instances.views.random_mac_address url ^random_mac_address/

fix instance/clone: get random mac if dhcp not found
---
 instances/templates/instance.html | 17 ++++++++---------
 instances/urls.py                 |  2 ++
 instances/views.py                | 23 ++++++++++++++++++++---
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 13336b5..3dd9190 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1212,14 +1212,9 @@
 </script>
 <script>
     function random_mac(net) {
-        var hexDigits = "0123456789abcdef";
-        var macAddress="52:54:00:";
-        for (var i=0; i<3; i++) {
-            macAddress+=hexDigits.charAt(Math.round(Math.random()*16));
-            macAddress+=hexDigits.charAt(Math.round(Math.random()*16));
-            if (i != 2) macAddress+=":";
-        }
-        $('input[name="clone-net-mac-'+net+'"]').val(macAddress);
+        $.getJSON('/instance/random_mac_address/', function(data) {
+            $('input[name="clone-net-mac-'+net+'"]').val(data['mac']);
+        });
     };
 </script>
 <script>
@@ -1325,7 +1320,11 @@
             $("#vdi_url").attr("href", data);
         });
     });
-{% if not request.user.is_superuser %}
+{% if request.user.is_superuser %}
+    $(document).ready(function () {
+        random_mac(0);
+    });
+{% else %}
     $('#select_clone_name').on('change', function () {
         update_clone_disk_name($(this).val());
         guess_mac_address('#select_clone_name', 0);
diff --git a/instances/urls.py b/instances/urls.py
index dfba916..4b6cb05 100644
--- a/instances/urls.py
+++ b/instances/urls.py
@@ -8,6 +8,8 @@ urlpatterns = [
         views.inst_graph, name='inst_graph'),
     url(r'^status/(?P<compute_id>[0-9]+)/(?P<vname>[\w\-\.]+)/$',
         views.inst_status, name='inst_status'),
+    url(r'^random_mac_address/$',
+        views.random_mac_address, name='random_mac_address'),
     url(r'^guess_mac_address/(?P<vname>[\w\-\.]+)/$',
         views.guess_mac_address, name='guess_mac_address'),
     url(r'^guess_clone_name/$',
diff --git a/instances/views.py b/instances/views.py
index fbec724..3f35da4 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -5,7 +5,7 @@ import socket
 import crypt
 import re
 import string
-from random import choice
+import random
 from bisect import insort
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse
@@ -901,7 +901,7 @@ def inst_graph(request, compute_id, vname):
 
 def _get_dhcp_mac_address(vname):
     dhcp_file = '/srv/webvirtcloud/dhcpd.conf'
-    mac = '52:54:00:'
+    mac = ''
     if os.path.isfile(dhcp_file):
         with open(dhcp_file, 'r') as f:
             name_found = False
@@ -916,7 +916,24 @@ def _get_dhcp_mac_address(vname):
 @login_required
 def guess_mac_address(request, vname):
     data = { 'vname': vname }
-    data['mac'] = _get_dhcp_mac_address(vname)
+    mac = _get_dhcp_mac_address(vname)
+    if not mac:
+        mac = _get_random_mac_address()
+    data['mac'] = mac
+    return HttpResponse(json.dumps(data))
+
+def _get_random_mac_address():
+    mac = '52:54:00:%02x:%02x:%02x' % (
+        random.randint(0x00, 0xff),
+        random.randint(0x00, 0xff),
+        random.randint(0x00, 0xff)
+    )
+    return mac
+
+@login_required
+def random_mac_address(request):
+    data = {}
+    data['mac'] = _get_random_mac_address()
     return HttpResponse(json.dumps(data))
 
 @login_required

From 951498e8418cbb23ffdae24fca7787f0dea3f15c Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 26 Jul 2018 13:36:40 +0200
Subject: [PATCH 07/10] README fix ubuntu installation package +libxslt1-dev

conf/requirements.txt pytz is required by migrate
---
 README.md             | 2 +-
 conf/requirements.txt | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cb68cc2..57dbdc7 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ print(''.join([random.SystemRandom().choice(haystack) for _ in range(50)]))
 ### Install WebVirtCloud panel (Ubuntu)
 
 ```bash
-sudo apt-get -y install git python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev nginx supervisor libsasl2-modules gcc pkg-config python-guestfs
+sudo apt-get -y install git python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx supervisor libsasl2-modules gcc pkg-config python-guestfs
 git clone https://github.com/retspen/webvirtcloud
 cd webvirtcloud
 cp webvirtcloud/settings.py.template webvirtcloud/settings.py
diff --git a/conf/requirements.txt b/conf/requirements.txt
index c47d4dc..49903c0 100644
--- a/conf/requirements.txt
+++ b/conf/requirements.txt
@@ -2,4 +2,6 @@ Django==1.11.14
 websockify==0.8.0
 gunicorn==19.9.0
 lxml==4.2.3
-libvirt-python==4.4.0
\ No newline at end of file
+libvirt-python==4.4.0
+pytz
+

From 3b99c983d54104b87bbedf0c810e28ba7b55544f Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 2 Aug 2018 10:47:13 +0200
Subject: [PATCH 08/10] vrtManager/instance.py: get_media_device fix:
 media.xpath returns list

---
 vrtManager/instance.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vrtManager/instance.py b/vrtManager/instance.py
index 4dc3567..f54c8a9 100644
--- a/vrtManager/instance.py
+++ b/vrtManager/instance.py
@@ -274,9 +274,9 @@ class wvmInstance(wvmConnect):
                 device = media.xpath('@device')[0]
                 if device == 'cdrom':
                     try:
-                        dev = media.xpath('target/@dev')
+                        dev = media.xpath('target/@dev')[0]
                         try:
-                            src_fl = media.xpath('source/@file')
+                            src_fl = media.xpath('source/@file')[0]
                             vol = self.get_volume_by_path(src_fl)
                             volume = vol.name()
                             stg = vol.storagePoolLookupByVolume()

From c231feb575a6d96caadd6cf10b0efe52792b0ae5 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 2 Aug 2018 12:42:06 +0200
Subject: [PATCH 09/10] instance/options/is_template form input value must be
 True

---
 instances/templates/instance.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 3dd9190..7e942f9 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1028,7 +1028,7 @@
                                                         <div class="form-group">
                                                             <label class="col-sm-3 control-label">{% trans "Is template" %}</label>
                                                             <div class="col-sm-6">
-                                                                <input type="checkbox" name="is_template" value="true" id="is_template" {% if instance.is_template %}checked{% endif %} {% if not request.user.is_superuser %}disabled{% endif %}>
+                                                                <input type="checkbox" name="is_template" value="True" id="is_template" {% if instance.is_template %}checked{% endif %} {% if not request.user.is_superuser %}disabled{% endif %}>
                                                             </div>
                                                         </div>
                                                         {% ifequal status 5 %}

From 21ef6871cf57d9560f585ef8096d9147294a3a64 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Tue, 21 Aug 2018 10:29:04 +0200
Subject: [PATCH 10/10] instance: template displays "compute.name -
 compute.hostname" only if hostname and name differ

---
 instances/templates/instance.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 4ad5880..04e67da 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -36,7 +36,7 @@
                             {% endfor %}
                             <a href="{% url 'instance' compute.id vname %}" type="button" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-refresh"></span></a>
                             <em>on</em>
-                            <a href="{% url 'overview' compute.id %}"><span class="label label-primary">{{ compute.name}} - {{ compute.hostname }} </span></a>
+                            <a href="{% url 'overview' compute.id %}"><span class="label label-primary">{{ compute.name }}{% if compute.name != compute.hostname %} - {{ compute.hostname }}{% endif %} </span></a>
                         </div>
                     </div>
                     {% if user_quota_msg %}