diff --git a/templates/base.html b/templates/base.html index 7fb3b75..709bc2b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -137,14 +137,15 @@ -
  • - - -

    - WireGuard -

    -     -
    • +
  • + + +

    + WireGuard +

    +     +
  • +
    +
    +
    +

    wg{{ instance.instance_id }}

    +

    {{ instance.name|default:"" }}

    + +     + + + {% trans 'Edit Instance' %} + + + {% trans 'Back to List' %} + +
    + +
    +
    +
    +
    +
    +

    {% trans 'Traffic Graph' %}

    +
    +
    + +
    +
    +
    +
    + RRD Graph +
    +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/templates/wireguard/server_list.html b/templates/wireguard/server_list.html new file mode 100644 index 0000000..b6ff9ad --- /dev/null +++ b/templates/wireguard/server_list.html @@ -0,0 +1,70 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
    +
    +

    {% trans 'WireGuard Instances' %}

    +
    + + {% trans 'Create Instance' %} + +
    +
    +
    + + + + + + + + + + + + + {% for instance in wireguard_instances %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    #{% trans 'Name' %}{% trans 'Listen Port' %}{% trans 'Address' %}{% trans 'Peers' %}
    + + wg{{ instance.instance_id }} + + + {{ instance }} + + {{ instance.listen_port }} + + {{ instance.address }}/{{ instance.netmask }} + + {{ instance.peer_set.count }} + + + + + + + + +
    + {% trans 'No WireGuard instances found.' %} +
    +
    + +
    +{% endblock %} \ No newline at end of file diff --git a/wireguard/views.py b/wireguard/views.py index 896d592..a91adcf 100644 --- a/wireguard/views.py +++ b/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) diff --git a/wireguard_webadmin/urls.py b/wireguard_webadmin/urls.py index cbc8bb5..dfb9291 100644 --- a/wireguard_webadmin/urls.py +++ b/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'),