retspen · catborise · Oct 14, 2020 · Oct 14, 2020 · Oct 16, 2020 · Oct 16, 2020
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -50,17 +50,25 @@ jobs:
 
     - name: Install Required packages
       run: |
-        sudo apt-get install -y libvirt-dev python3-lxml zlib1g-dev libxslt1-dev
+        sudo apt-get install -y python3-virtualenv libvirt-dev python3-lxml zlib1g-dev libxslt1-dev
+
+    - name: Create & Activate VENV
+      run: |
+        python3 -m venv venv
+        source venv/bin/activate
+
     - name: Install dependencies
       run: |
         python3 -m pip install --upgrade pip
+        pip3 install wheel
         if [ -f dev/requirements.txt ]; then pip3 install -r dev/requirements.txt; else pip3 install -r conf/requirements.txt; fi
     ################################
     # Run Linter against code base #
     ################################
     - name: Lint Code Base
       uses: docker://github/super-linter:latest
       env:
+        FILTER_REGEX_EXCLUDE: .*(static|scss|venv|locale)/.*
         DEFAULT_BRANCH: master
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         VALIDATE_ANSIBLE: false

diff --git a/Dockerfile b/Dockerfile
@@ -9,52 +9,53 @@ CMD ["/sbin/my_init"]
 
 RUN echo 'APT::Get::Clean=always;' >> /etc/apt/apt.conf.d/99AutomaticClean
 
-RUN apt-get update -qqy
-RUN DEBIAN_FRONTEND=noninteractive apt-get -qyy install \
-	-o APT::Install-Suggests=false \
+RUN apt-get update -qqy \
+    && DEBIAN_FRONTEND=noninteractive apt-get -qyy install \
+	--no-install-recommends \
 	git \
-	python3-virtualenv \
+	python3-venv \
 	python3-dev \
 	python3-lxml \
-	virtualenv \
 	libvirt-dev \
 	zlib1g-dev \
 	nginx \
-	libsasl2-modules
+	pkg-config \
+	gcc \
+	libsasl2-modules \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-ADD . /srv/webvirtcloud
+COPY . /srv/webvirtcloud
 RUN chown -R www-data:www-data /srv/webvirtcloud
 
 # Setup webvirtcloud
-RUN cd /srv/webvirtcloud && \
-	virtualenv --python=python3 venv && \
+WORKDIR /srv/webvirtcloud
+RUN python3 -m venv venv && \
 	. venv/bin/activate && \
 	pip3 install -U pip && \
+	pip3 install wheel && \
 	pip3 install -r conf/requirements.txt && \
 	chown -R www-data:www-data /srv/webvirtcloud
 
-RUN cd /srv/webvirtcloud && . venv/bin/activate && \
-	python3 manage.py migrate && \
+RUN . venv/bin/activate && \
+    python3 manage.py migrate && \
 	chown -R www-data:www-data /srv/webvirtcloud
 
 # Setup Nginx
-RUN echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \
+RUN printf "\n%s" "daemon off;" >> /etc/nginx/nginx.conf && \
 	rm /etc/nginx/sites-enabled/default && \
 	chown -R www-data:www-data /var/lib/nginx
 
-ADD conf/nginx/webvirtcloud.conf /etc/nginx/conf.d/
+COPY conf/nginx/webvirtcloud.conf /etc/nginx/conf.d/
 
 # Register services to runit
 RUN	mkdir /etc/service/nginx && \
 	mkdir /etc/service/nginx-log-forwarder && \
 	mkdir /etc/service/webvirtcloud && \
 	mkdir /etc/service/novnc
-ADD conf/runit/nginx			/etc/service/nginx/run
-ADD conf/runit/nginx-log-forwarder	/etc/service/nginx-log-forwarder/run
-ADD conf/runit/novncd.sh		/etc/service/novnc/run
-ADD conf/runit/webvirtcloud.sh		/etc/service/webvirtcloud/run
+COPY conf/runit/nginx				/etc/service/nginx/run
+COPY conf/runit/nginx-log-forwarder	/etc/service/nginx-log-forwarder/run
+COPY conf/runit/novncd.sh			/etc/service/novnc/run
+COPY conf/runit/webvirtcloud.sh		/etc/service/webvirtcloud/run
 
 # Define mountable directories.
 #VOLUME []

diff --git a/accounts/forms.py b/accounts/forms.py
@@ -1,6 +1,6 @@
 from appsettings.settings import app_settings
 from django.contrib.auth import get_user_model
-from django.forms import ModelForm, ValidationError
+from django.forms import EmailField, Form, ModelForm, ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from .models import UserInstance, UserSSHKey
@@ -69,3 +69,7 @@ def save(self, commit=True):
     class Meta:
         model = UserSSHKey
         fields = ('keyname', 'keypublic')
+
+
+class EmailOTPForm(Form):
+    email = EmailField(label=_('Email'))
diff --git a/accounts/templates/account.html b/accounts/templates/account.html
@@ -8,7 +8,15 @@
 {% block page_heading %}{% trans "User Profile" %}: {{ user }}{% endblock page_heading %}
 
 {% block page_heading_extra %}
-<a href="{% url 'accounts:user_instance_create' user.id %}" class="btn btn-success">
+{% if otp_enabled %}
+<a href="{% url 'accounts:admin_email_otp' user.id %}" class="btn btn-secondary" title="{% trans "Email OTP QR code" %}">
+    {% icon 'qrcode' %}
+</a>
+{% endif %}
+<a href="{% url 'admin:user_update' user.id %}?next={% url 'accounts:account' user.id %}" class="btn btn-primary" title="{% trans "Edit user" %}">
+    {% icon 'pencil' %}
+</a>
+<a href="{% url 'accounts:user_instance_create' user.id %}" class="btn btn-success" title="{% trans "Create user instance" %}">
     {% icon 'plus' %}
 </a>
 {% endblock page_heading_extra %}
@@ -21,11 +29,6 @@
         <li class="nav-item">
             <a class="nav-link" data-toggle="tab" href="#public-keys">{% trans "Public Keys" %}</a>
         </li>
-        {% if totp_url %}
-        <li class="nav-item">
-            <a class="nav-link" data-toggle="tab" href="#otp">{% trans "OTP QR Code" %}</a>
-        </li>
-        {% endif %}
     </ul>
 
     <div class="tab-content">
@@ -82,12 +85,5 @@
                 </tbody>
             </table>
         </div>
-        {% if totp_url %}
-        <div class="tab-pane fade" id="otp">
-            <div class="text-center">
-                {% qr_from_text totp_url image_format="png" %}
-            </div>
-        </div>
-        {% endif %}
     </div>
 {% endblock content %}
diff --git a/accounts/templates/accounts/email/otp.html b/accounts/templates/accounts/email/otp.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+{% load qr_code %}
+{% blocktrans %}
+Scan this QR code to get OTP for account '{{ user }}'
+{% endblocktrans %}
+<br>
+{% qr_from_text totp_url %}
diff --git a/accounts/templates/accounts/email_otp_form.html b/accounts/templates/accounts/email_otp_form.html
@@ -0,0 +1,32 @@
+{% extends "base.html" %}
+{% load bootstrap4 %}
+{% load icons %}
+{% load i18n %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block page_heading %}{{ title }}{% endblock page_heading %}
+
+{% block content %}
+<div class="alert alert-info">
+    {% blocktrans %}
+    Enter email address OTP QR code will be sent to.
+    {% endblocktrans %}
+</div>
+<div class="card">
+    <div class="card-body">
+        <form id="create-update" action="" method="post">
+            {% csrf_token %}
+            {% bootstrap_form form layout='horizontal' %}
+        </form>
+    </div>
+    <div class="card-footer">
+        <div class="form-group mb-0 float-right">
+            <a class="btn btn-primary" href="javascript:history.back()">{% icon 'arrow-left' %} {% trans "Cancel" %}</a>
+            <button type="submit" form="create-update" class="btn btn-success">
+                {% icon 'envelope-o' %} {% trans "Send" %}
+            </button>
+        </div>
+    </div>
+</div>
+{% endblock content %}
diff --git a/accounts/templates/accounts/otp_login.html b/accounts/templates/accounts/otp_login.html
@@ -1,62 +1,30 @@
+{% extends 'base.html' %}
 {% load i18n %}
 {% load static %}
 {% load bootstrap4 %}
-<!DOCTYPE html>
-<html lang="en">
 
-<head>
-
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="WebVirtMgr panel for manage virtual machine">
-    <meta name="author" content="anatoliy.guskov@gmail.com">
-
-    <title>{% trans "WebVirtCloud" %}  - {% trans "Sign In" %}</title>
-
-    <!-- Bootstrap Core CSS -->
-    <link href="{% static "css/wvc-main.min.css" %}" rel="stylesheet" id="wvc_css">
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-        <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
-</head>
-
-<body>
-    <div class="container">
-        <div>
-            <div class="page-header text-center">
-                <a class="" href="/"><h1>WebVirtCloud</h1></a>
-            </div>
-            <div class="row">
-                <div class="col-6 offset-3" role="main">
-                    <div class="card">
-                        <div class="card-body">
-                            {% if form.errors %}
-                                {% bootstrap_form_errors form %}
-                            {% endif %}
-                            <form class="form-signin" method="post" role="form" aria-label="Login form">
-                                {% csrf_token %}
-                                {% bootstrap_field form.username layout='horizontal' %}
-                                {% bootstrap_field form.password layout='horizontal' %}
-                                {% bootstrap_field form.otp_token layout='horizontal' %}
-                                <button class="btn btn-lg btn-success btn-block" type="submit">{% trans "Sign In" %}</button>
-                            </form>
-                        </div>
-                    </div>
-                </div>
+{% block title %}WebVirtCloud{% endblock title %}
+
+{% block page_heading %}WebVirtCloud{% endblock page_heading %}
+
+{% block content %}
+<div class="row">
+    <div class="col-6 offset-3" role="main">
+        <div class="card">
+            <div class="card-body">
+                {% if form.errors %}
+                    {% bootstrap_form_errors form %}
+                {% endif %}
+                <form class="form-signin" method="post" role="form" aria-label="Login form">
+                    {% csrf_token %}
+                    {% bootstrap_field form.username layout='horizontal' %}
+                    {% bootstrap_field form.password layout='horizontal' %}
+                    {% bootstrap_field form.otp_token layout='horizontal' %}
+                    <a href="{% url 'accounts:email_otp' %}" class="float-right mb-2">{% trans "I do not have/lost my OTP!" %}</a>
+                    <button class="btn btn-lg btn-success btn-block" type="submit">{% trans "Sign In" %}</button>
+                </form>
             </div>
         </div>
     </div>
-
-    <!-- jQuery -->
-    <script src="{% static "js/jquery.js" %}"></script>
-    <!-- Bootstrap Core JavaScript -->
-    <script src="{% static "js/bootstrap.bundle.min.js" %}"></script>
-</body>
-
-</html>
+</div>
+{% endblock content %}
diff --git a/accounts/templates/base_auth.html b/accounts/templates/base_auth.html
diff --git a/accounts/templates/login.html b/accounts/templates/login.html
@@ -1,25 +1,30 @@
-{% extends "base_auth.html" %}
+{% extends "base.html" %}
 {% load i18n %}
+{% load static %}
+
 {% block title %}{% trans "WebVirtCloud" %}  - {% trans "Sign In" %}{% endblock %}
+
+{% block style %}
+<link href="{% static "css/signin.css" %}" rel="stylesheet">
+{% endblock style %}
+
 {% block content %}
-    <div>
-        <div class="page-header">
-            <a class="" href="/"><h1>WebVirtCloud</h1></a>
+<div class="page-header">
+    <a class="" href="/"><h1>WebVirtCloud</h1></a>
+</div>
+<div class="col-12" role="main">
+    {% if form.errors %}
+        <div class="alert alert-danger">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            {% trans "Incorrect username or password." %}
         </div>
-        <div class="col-12" role="main">
-            {% if form.errors %}
-                <div class="alert alert-danger">
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                    {% trans "Incorrect username or password." %}
-                </div>
-            {% endif %}
-            <form class="form-signin" method="post" role="form" aria-label="Login form">{% csrf_token %}
-                <h2 class="form-signin-heading">{% trans "Sign In" %}</h2>
-                <input type="text" class="form-control" name="username" placeholder="{% trans "Login" %}" autocapitalize="none" autocorrect="off" autofocus>
-                <input type="password" class="form-control" name="password" placeholder="{% trans "Password" %}">
-                <input type="hidden" name="next" value="{{ next }}">
-                <button class="btn btn-lg btn-success btn-block" type="submit">{% trans "Sign In" %}</button>
-            </form>
-        </div>
-    </div>
+    {% endif %}
+    <form class="form-signin" method="post" role="form" aria-label="Login form">{% csrf_token %}
+        <h2 class="form-signin-heading">{% trans "Sign In" %}</h2>
+        <input type="text" class="form-control" name="username" placeholder="{% trans "Login" %}" autocapitalize="none" autocorrect="off" autofocus>
+        <input type="password" class="form-control" name="password" placeholder="{% trans "Password" %}">
+        <input type="hidden" name="next" value="{{ next }}">
+        <button class="btn btn-lg btn-success btn-block" type="submit">{% trans "Sign In" %}</button>
+    </form>
+</div>
 {% endblock %}