diff --git a/.env b/.env index aff7b04..35b39b6 100644 --- a/.env +++ b/.env @@ -1,9 +1,11 @@ +MASTER_PASSWORD=pipperepettenuse + DB_NAME=wallet DB_USER=postgres DB_PASSWORD=BatManu#171017 DB_HOST=10.211.114.101 DB_PORT=5432 -MASTER_PASSWORD=pipperepettenuse + MQTT_HOST=10.211.114.214 MQTT_PORT=1883 MQTT_KEEPALIVE=60 @@ -11,3 +13,6 @@ MQTT_USER=alex MQTT_PASSWORD=batt1l0 MQTT_DS_TOPIC="$CONTROL/dynamic-security/v1" MQTT_DS_RESP_TOPIC="$CONTROL/dynamic-security/v1/response" + +GMAIL_USER=alessandro.battilani@gmail.com +GMAIL_PASSWORD=batmanu#171017 \ No newline at end of file diff --git a/avatars/ape1.jpg b/avatars/ape1.jpg new file mode 100644 index 0000000..4f4e4b9 Binary files /dev/null and b/avatars/ape1.jpg differ diff --git a/avatars/ape2_hSVw8me.jpg b/avatars/ape2_hSVw8me.jpg new file mode 100644 index 0000000..1a697f7 Binary files /dev/null and b/avatars/ape2_hSVw8me.jpg differ diff --git a/templates/account/login.html b/templates/account/login.html index 8128cd2..266b413 100644 --- a/templates/account/login.html +++ b/templates/account/login.html @@ -7,7 +7,7 @@ {% block content %}

{% trans "Sign In" %}

- If you have not created an account yet, then please + {% trans "If you have not created an account yet, then please" %} - + @@ -23,10 +23,11 @@ - {% include 'includes/messages.html' %} {% include 'includes/header.html' %} + {% include 'includes/messages.html' %} + {% block layout %} {% endblock %} diff --git a/templates/includes/header.html b/templates/includes/header.html index 495ac1a..9cde5a9 100644 --- a/templates/includes/header.html +++ b/templates/includes/header.html @@ -1,8 +1,8 @@ {% load static %} -

+
- ASE + ASE MQTT User Management
@@ -14,13 +14,17 @@
  • diff --git a/templates/includes/messages.html b/templates/includes/messages.html index d723194..b8c08b4 100644 --- a/templates/includes/messages.html +++ b/templates/includes/messages.html @@ -3,7 +3,7 @@
    {% for message in messages %}
    +
    diff --git a/templates/wallet_api/add_user.html b/templates/wallet_api/add_user.html index c29aed6..ad80d5a 100644 --- a/templates/wallet_api/add_user.html +++ b/templates/wallet_api/add_user.html @@ -1,18 +1,5 @@ {% extends 'layouts/blank.html' %} {% block content %} - -{% if messages %} -
    - {% for message in messages %} -
    - {{ message }} -
    - {% endfor %} -
    -{% endif %} - - -

    Add User

    {% csrf_token %} diff --git a/templates/wallet_api/create_user.html b/templates/wallet_api/create_user.html index 061bca1..626cd50 100644 --- a/templates/wallet_api/create_user.html +++ b/templates/wallet_api/create_user.html @@ -1,16 +1,5 @@ {% extends 'layouts/blank.html' %} {% block content %} - - {% if messages %} -
    - {% for message in messages %} -
    - {{ message }} -
    - {% endfor %} -
    - {% endif %} -

    Add User

    {% csrf_token %} diff --git a/templates/wallet_api/list_users.html b/templates/wallet_api/list_users.html index 58092c7..64e56e4 100644 --- a/templates/wallet_api/list_users.html +++ b/templates/wallet_api/list_users.html @@ -1,20 +1,12 @@ {% extends 'layouts/blank.html' %} {% block content %} - -{% if messages %} -
    - {% for message in messages %} -
    - {{ message }} -
    - {% endfor %} -
    -{% endif %} -

    List Mosquitto Users

    - - - +{% if ase_adm_group %} + + + + +{% endif %} @@ -29,20 +21,35 @@ {% for user in users %} - diff --git a/wallet/settings.py b/wallet/settings.py index c88935e..6181e75 100644 --- a/wallet/settings.py +++ b/wallet/settings.py @@ -156,4 +156,14 @@ ACCOUNT_SIGNUP_REDIRECT_URL = "{% url 'account_signup' %}?next={% url 'profile-o EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' ACCOUNT_AUTHENTICATION_METHOD = 'email' -ACCOUNT_EMAIL_REQUIRED = True \ No newline at end of file +ACCOUNT_EMAIL_REQUIRED = True + +''' +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_HOST = 'smtp.gmail.com' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = 'tuo_indirizzo@gmail.com' +EMAIL_HOST_PASSWORD = 'tua_password_gmail' +DEFAULT_FROM_EMAIL = 'tuo_indirizzo@gmail.com' +''' \ No newline at end of file diff --git a/wallet_api/apps.py b/wallet_api/apps.py index 6a28526..ec47c87 100644 --- a/wallet_api/apps.py +++ b/wallet_api/apps.py @@ -1,6 +1,8 @@ from django.apps import AppConfig - class WalletApiConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'wallet_api' + + def ready(self): + import wallet_api.signals diff --git a/wallet_api/signals.py b/wallet_api/signals.py new file mode 100644 index 0000000..a8526ee --- /dev/null +++ b/wallet_api/signals.py @@ -0,0 +1,10 @@ +from django.db.models.signals import post_migrate +from django.dispatch import receiver +from dotenv import dotenv_values +from .utils import authenticate + +@receiver(post_migrate) +def init_master_passwored(sender, **kwargs): + if sender.name == 'wallet_api': + config = dotenv_values(".env") + authenticate(config['MASTER_PASSWORD']) \ No newline at end of file diff --git a/wallet_api/urls.py b/wallet_api/urls.py index ac070fb..801dfad 100644 --- a/wallet_api/urls.py +++ b/wallet_api/urls.py @@ -3,7 +3,6 @@ from . import views urlpatterns = [ path('', views.home_view, name="home"), - path('add/', views.add_password_api, name='add_user'), path('get/', views.get_password_api, name='get_password'), path('list/', views.list_sites_api, name='list_sites'), path('publish', views.publish_message, name='publish'), diff --git a/wallet_api/views.py b/wallet_api/views.py index d5072ad..2e24440 100644 --- a/wallet_api/views.py +++ b/wallet_api/views.py @@ -1,8 +1,8 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib import messages from django.http import JsonResponse, HttpResponse - from django.views.decorators.csrf import csrf_exempt +from django.contrib.auth.decorators import login_required, permission_required import json import paho.mqtt.client as mqtt @@ -16,10 +16,11 @@ from .mqtt_service import MosquittoDynamicSecurity config = dotenv_values(".env") -authenticate(config['MASTER_PASSWORD']) +# authenticate(config['MASTER_PASSWORD']) def home_view(request): - return render(request, 'home.html') + return redirect('list_users') # Reindirizza alla lista degli utenti + #return render(request, 'home.html') @csrf_exempt def publish_message(request): @@ -33,26 +34,82 @@ def publish_message(request): protocol=mqtt.MQTTv5) return JsonResponse({'request_data': request_data}) +@login_required def list_users(request): users = PasswordEntry.objects.all() - return render(request, 'wallet_api/list_users.html', {'users': users}) + return render(request, 'wallet_api/list_users.html', {'users': users, 'ase_adm_group': request.user.groups.filter(name='ase_admin').exists()}) +@login_required def create_user(request): - if request.method == 'POST': - site = request.POST.get('site') - username = request.POST.get('username') - client_id = request.POST.get('clientId') - topic = request.POST.get('topic') - password = request.POST.get('password') + if request.user.groups.filter(name='ase_admin').exists(): + if request.method == 'POST': + site = request.POST.get('site') + username = request.POST.get('username') + client_id = request.POST.get('clientId') + topic = request.POST.get('topic') + password = request.POST.get('password') + # Comando per creare un utente + command = { + "commands": + [ + { + "command": "createClient", + "username": username, + "password": password + } + ] + } + + # Invia il comando a Mosquitto + mqtt_service = MosquittoDynamicSecurity() + response = mqtt_service.send_command(command) + if "error" not in response["responses"][0]: + + key = derive_key(config['MASTER_PASSWORD']) + encrypted_password = encrypt_password(password, key) + + PasswordEntry.objects.create( + site=site, + username=username, + password=encrypted_password, + client_id=client_id, + topic=topic, + status='enabled' + ) + + messages.success(request, 'Utente creato con successo!') # Messaggio di successo + return redirect('list_users') # Reindirizza alla lista degli utenti + else: + messages.warning(request, f'Errore durante la creazione dell\'utente: {response["responses"][0]["error"]}') # Messaggio di errore + return render(request, 'wallet_api/create_user.html', {'response': response}) # Rimani sulla stessa vista + + # Se la richiesta non è POST, mostra il form di creazione utente + return render(request, 'wallet_api/create_user.html') + else: + messages.success(request, 'Non hai i permessi per creare utenti MQTT!') # Messaggio di successo + return redirect('list_users') # Reindirizza alla lista degli utenti + +@login_required +def edit_user(request, slug): + if request.user.groups.filter(name='ase_admin').exists(): + user = PasswordEntry.objects.filter(slug=slug).first() + return render(request, 'wallet_api/edit_user.html', {'user': user}) + else: + messages.success(request, 'Non hai i permessi per creare utenti MQTT!') # Messaggio di successo + return redirect('list_users') # Reindirizza alla lista degli utenti + +@login_required +def disable_user(request, slug): + if request.user.groups.filter(name='ase_admin').exists(): + user = PasswordEntry.objects.filter(slug=slug).values('id','username') # Comando per creare un utente command = { "commands": [ { - "command": "createClient", - "username": username, - "password": password + "command": "disableClient", + "username": user.first()["username"] } ] } @@ -62,90 +119,49 @@ def create_user(request): response = mqtt_service.send_command(command) if "error" not in response["responses"][0]: - key = derive_key(config['MASTER_PASSWORD']) - encrypted_password = encrypt_password(password, key) + PasswordEntry.objects.filter(id=int(user.first()["id"])).update(status='disabled') - PasswordEntry.objects.create( - site=site, - username=username, - password=encrypted_password, - client_id=client_id, - topic=topic, - status='enabled' - ) - - messages.success(request, 'Utente creato con successo!') # Messaggio di successo + messages.success(request, 'Utente disabilitato con successo!') # Messaggio di successo + if request.htmx: + return render(request, 'partials/enable_user.html') return redirect('list_users') # Reindirizza alla lista degli utenti else: - messages.warning(request, f'Errore durante la creazione dell\'utente: {response["responses"][0]["error"]}') # Messaggio di errore - return render(request, 'wallet_api/create_user.html', {'response': response}) # Rimani sulla stessa vista - - # Se la richiesta non è POST, mostra il form di creazione utente - return render(request, 'wallet_api/create_user.html') - -def edit_user(request, slug): - user = PasswordEntry.objects.filter(slug=slug).first() - return render(request, 'wallet_api/edit_user.html', {'user': user}) - -def disable_user(request, slug): - user = PasswordEntry.objects.filter(slug=slug).values('id','username') - print(user.first()) - # Comando per creare un utente - command = { - "commands": - [ - { - "command": "disableClient", - "username": user.first()["username"] - } - ] - } - - # Invia il comando a Mosquitto - mqtt_service = MosquittoDynamicSecurity() - response = mqtt_service.send_command(command) - if "error" not in response["responses"][0]: - - PasswordEntry.objects.update( - status='disabled' - ) - - messages.success(request, 'Utente disabilitato con successo!') # Messaggio di successo - if request.htmx: - return render(request, 'partials/enable_user.html') - return redirect('list_users') # Reindirizza alla lista degli utenti + messages.warning(request, f'Errore durante la disabilitazione dell\'utente: {response["responses"][0]["error"]}') # Messaggio di errore + return redirect('list_users') # Reindirizza alla lista degli utenti else: - messages.warning(request, f'Errore durante la disabilitazione dell\'utente: {response["responses"][0]["error"]}') # Messaggio di errore + messages.success(request, 'Non hai i permessi per disabilitare utenti MQTT!') # Messaggio di successo return redirect('list_users') # Reindirizza alla lista degli utenti +@login_required def enable_user(request, slug): - user = PasswordEntry.objects.filter(slug=slug).values('id','username') - print(user.first()) - # Comando per creare un utente - command = { - "commands": - [ - { - "command": "enableClient", - "username": user.first()["username"] - } - ] - } + if request.user.groups.filter(name='ase_admin').exists(): + user = PasswordEntry.objects.filter(slug=slug).values('id','username') + # Comando per creare un utente + command = { + "commands": + [ + { + "command": "enableClient", + "username": user.first()["username"] + } + ] + } - # Invia il comando a Mosquitto - mqtt_service = MosquittoDynamicSecurity() - response = mqtt_service.send_command(command) - if "error" not in response["responses"][0]: + # Invia il comando a Mosquitto + mqtt_service = MosquittoDynamicSecurity() + response = mqtt_service.send_command(command) + if "error" not in response["responses"][0]: - PasswordEntry.objects.update( - status='enabled' - ) + PasswordEntry.objects.filter(id=int(user.first()["id"])).update(status='enabled') - messages.success(request, 'Utente abilitato con successo!') # Messaggio di successo + messages.success(request, 'Utente abilitato con successo!') # Messaggio di successo - return redirect('list_users') # Reindirizza alla lista degli utenti + return redirect('list_users') # Reindirizza alla lista degli utenti + else: + messages.warning(request, f'Errore durante la abilitazione dell\'utente: {response["responses"][0]["error"]}') # Messaggio di errore + return redirect('list_users') # Reindirizza alla lista degli utenti else: - messages.warning(request, f'Errore durante la abilitazione dell\'utente: {response["responses"][0]["error"]}') # Messaggio di errore + messages.success(request, 'Non hai i permessi per disabilitare utenti MQTT!') # Messaggio di successo return redirect('list_users') # Reindirizza alla lista degli utenti def view_role(request, role): @@ -174,6 +190,7 @@ def get_password_api(request): }) except PasswordEntry.DoesNotExist: return JsonResponse({"error": "Sito non trovato"}, status=404) + return JsonResponse({"error": "Richiesta non valida"}, status=400) @csrf_exempt def list_sites_api(request): @@ -186,29 +203,4 @@ def list_sites_api(request): sites = PasswordEntry.objects.values_list('site', flat=True) return JsonResponse({"sites": list(sites)}) - -@csrf_exempt -def add_password_api(request): - if request.method == 'POST': - data = json.loads(request.body) - master_password = data.get('master_password') - site = data.get('site') - username = data.get('username') - password = data.get('password') - client_id = data.get('client_id') - topic = data.get('topic') - - if not authenticate(master_password): - return JsonResponse({"error": "Master password errata"}, status=403) - - key = derive_key(master_password) - encrypted_password = encrypt_password(password, key) - - PasswordEntry.objects.create( - site=site, - username=username, - password=encrypted_password, - client_id=client_id, - topic=topic - ) - return JsonResponse({"message": "Password aggiunta con successo"}) + return JsonResponse({"error": "Richiesta non valida"}, status=400)
    {{user.site}} - {{user.username}} + {% if ase_adm_group %} + + {% endif %} + {{user.username}} {{user.client_id}} {{user.topic}} {% if user.status == "enabled" %} - - + + {% else %} - - + + {% endif %}