Add server list and detail views for WireGuard instances

templates/base.html

@@ -137,14 +137,15 @@
                         </a>
                     </li>
 
-                    <li class="nav-item">
-                        <a href="/server/manage/" class="nav-link {% if '/server/' in request.path %}active{% endif %}">
-                            <i class="fas fa-cogs nav-icon"></i>
-                            <p>
-                                WireGuard
-                            </p>
-                        </a>
-                    </li>
+                        <li class="nav-item">
+                            <a href="{% url 'wireguard_server_list' %}"
+                                class="nav-link {% if '/server/' in request.path %}active{% endif %}">
+                                <i class="fas fa-cogs nav-icon"></i>
+                                <p>
+                                    WireGuard
+                                </p>
+                            </a>
+                        </li>
 
                     <li class="nav-item">
                         <a href="/routing-templates/list/"

templates/wireguard/server_detail.html

@@ -0,0 +1,71 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<div class="row">
+    <div class="col-md-6">
+        <div class="card card-primary card-outline">
+            <div class="card-body box-profile">
+                <h3 class="profile-username text-center">wg{{ instance.instance_id }}</h3>
+                <p class="text-muted text-center">{{ instance.name|default:"" }}</p>
+
+                <ul class="list-group list-group-unbordered mb-3">
+                    <li class="list-group-item">
+                        <b>{% trans 'Public Key' %}</b>
+                        <a class="float-right" title="{{ instance.public_key }}">
+                            {{ instance.public_key|truncatechars:16 }}
+                        </a>
+                    </li>
+                    <li class="list-group-item">
+                        <b>{% trans 'Listen Port' %}</b>
+                        <a class="float-right">{{ instance.listen_port }}</a>
+                    </li>
+                    <li class="list-group-item">
+                        <b>{% trans 'Address' %}</b>
+                        <a class="float-right">{{ instance.address }}/{{ instance.netmask }}</a>
+                    </li>
+                    <li class="list-group-item">
+                        <b>{% trans 'Hostname' %}</b>
+                        <a class="float-right">{{ instance.hostname }}</a>
+                    </li>
+                    <li class="list-group-item">
+                        <b>{% trans 'Peers' %}</b>
+                        <a class="float-right">{{ instance.peer_set.count }}</a>
+                    </li>
+                </ul>
+
+                <a href="{% url 'wireguard_manage_instance' %}?uuid={{ instance.uuid }}"
+                   class="btn btn-primary btn-block">
+                    <b>{% trans 'Edit Instance' %}</b>
+                </a>
+                <a href="{% url 'wireguard_server_list' %}" class="btn btn-default btn-block">
+                    <b>{% trans 'Back to List' %}</b>
+                </a>
+            </div>
+            <!-- /.card-body -->
+        </div>
+    </div>
+    <div class="col-md-6">
+        <div class="card card-primary card-outline">
+            <div class="card-header">
+                <h3 class="card-title">{% trans 'Traffic Graph' %}</h3>
+                <div class="card-tools">
+                    <form method="get" class="form-inline">
+                        <select name="period" class="form-control form-control-sm" onchange="this.form.submit()">
+                            <option value="6h" {% if request.GET.period == '6h' %}selected{% endif %}>6h</option>
+                            <option value="1d" {% if request.GET.period == '1d' %}selected{% endif %}>1d</option>
+                            <option value="7d" {% if request.GET.period == '7d' %}selected{% endif %}>7d</option>
+                            <option value="30d" {% if request.GET.period == '30d' %}selected{% endif %}>1m</option>
+                            <option value="365d" {% if request.GET.period == '365d' %}selected{% endif %}>1y</option>
+                        </select>
+                    </form>
+                </div>
+            </div>
+            <div class="card-body">
+                <img src="/rrd/graph/?instance={{ instance.uuid }}&period={{ request.GET.period|default:'6h' }}"
+                    class="img-fluid" alt="RRD Graph">
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/wireguard/server_list.html

@@ -0,0 +1,70 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+    <div class="card card-primary card-outline">
+        <div class="card-header">
+            <h3 class="card-title">{% trans 'WireGuard Instances' %}</h3>
+            <div class="card-tools">
+                <a href="{% url 'wireguard_manage_instance' %}?action=create" class="btn btn-primary btn-sm">
+                    <i class="fas fa-plus"></i> {% trans 'Create Instance' %}
+                </a>
+            </div>
+        </div>
+        <div class="card-body p-0">
+            <table class="table table-striped projects">
+                <thead>
+                <tr>
+                    <th class="min-width">#</th>
+                    <th>{% trans 'Name' %}</th>
+                    <th>{% trans 'Listen Port' %}</th>
+                    <th>{% trans 'Address' %}</th>
+                    <th class="min-width">{% trans 'Peers' %}</th>
+                    <th class="min-width"></th>
+                </tr>
+                </thead>
+                <tbody>
+                {% for instance in wireguard_instances %}
+                    <tr>
+                        <td class="min-width">
+                            <a href="{% url 'wireguard_server_detail' %}?uuid={{ instance.uuid }}">
+                                wg{{ instance.instance_id }}
+                            </a>
+                        </td>
+                        <td>
+                            {{ instance }}
+                        </td>
+                        <td>
+                            {{ instance.listen_port }}
+                        </td>
+                        <td>
+                            {{ instance.address }}/{{ instance.netmask }}
+                        </td>
+                        <td class="min-width">
+                            {{ instance.peer_set.count }}
+                        </td>
+                        <td class="min-width">
+                            <a class="btn btn-outline-primary btn-sm"
+                               href="{% url 'wireguard_server_detail' %}?uuid={{ instance.uuid }}">
+                                <i class="fas fa-folder"></i>
+
+                            </a>
+                            <a class="btn btn-outline-info btn-sm"
+                               href="{% url 'wireguard_manage_instance' %}?uuid={{ instance.uuid }}">
+                                <i class="fas fa-pencil-alt"></i>
+                            </a>
+                        </td>
+                    </tr>
+                {% empty %}
+                    <tr>
+                        <td colspan="6" class="text-center">
+                            {% trans 'No WireGuard instances found.' %}
+                        </td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        <!-- /.card-body -->
+    </div>
+{% endblock %}

wireguard/views.py

@@ -205,3 +205,20 @@ def view_apply_db_patches(request):
 
 
 
+@login_required
+def view_server_list(request):
+    if not UserAcl.objects.filter(user=request.user).filter(user_level__gte=40).exists():
+        return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
+    wireguard_instances = WireGuardInstance.objects.all().order_by('instance_id')
+    context = {'page_title': _('WireGuard Instances'), 'wireguard_instances': wireguard_instances}
+    return render(request, 'wireguard/server_list.html', context)
+
+
+@login_required
+def view_server_detail(request):
+    if not UserAcl.objects.filter(user=request.user).filter(user_level__gte=40).exists():
+        return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
+    uuid = request.GET.get('uuid')
+    instance = get_object_or_404(WireGuardInstance, uuid=uuid)
+    context = {'page_title': f'wg{instance.instance_id}', 'instance': instance}
+    return render(request, 'wireguard/server_detail.html', context)

wireguard_webadmin/urls.py

@@ -36,7 +36,8 @@ from user_manager.views import view_manage_user, view_peer_group_list, view_peer
 from vpn_invite.views import view_email_settings, view_vpn_invite_list, view_vpn_invite_settings
 from vpn_invite_public.views import view_public_vpn_invite
 from wgrrd.views import view_rrd_graph
-from wireguard.views import view_apply_db_patches, view_wireguard_manage_instance, view_wireguard_status
+from wireguard.views import view_apply_db_patches, view_wireguard_manage_instance, view_wireguard_status, \
+    view_server_list, view_server_detail
 from wireguard_peer.views import view_manage_ip_address, view_wireguard_peer_list, view_wireguard_peer_manage, \
     view_wireguard_peer_sort, view_apply_route_template
 from wireguard_tools.views import download_config_or_qrcode, export_wireguard_configs, restart_wireguard_interfaces
@@ -67,6 +68,8 @@ urlpatterns = [
     path('tools/download_peer_config/', download_config_or_qrcode, name='download_config_or_qrcode'),
     path('tools/restart_wireguard/', restart_wireguard_interfaces, name='restart_wireguard_interfaces'),
     path('server/manage/', view_wireguard_manage_instance, name='wireguard_manage_instance'),
+    path('server/list/', view_server_list, name='wireguard_server_list'),
+    path('server/detail/', view_server_detail, name='wireguard_server_detail'),
     path('accounts/create_first_user/', view_create_first_user, name='create_first_user'),
     path('accounts/login/', view_login, name='login'),
     path('accounts/logout/', view_logout, name='logout'),