diff --git a/backend/backend/settings.py b/backend/backend/settings.py deleted file mode 100644 index da4f4ef..0000000 --- a/backend/backend/settings.py +++ /dev/null @@ -1,155 +0,0 @@ -""" -Django settings for backend project. - -Generated by 'django-admin startproject' using Django 3.1.3. - -For more information on this file, see -https://docs.djangoproject.com/en/3.1/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.1/ref/settings/ -""" - -from pathlib import Path - -# Build paths inside the project like this: BASE_DIR / 'subdir'. -import config.secret -import config.sql -import config.ldap - -BASE_DIR = Path(__file__).resolve().parent.parent - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = config.secret.key - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - -import ldap -from django_auth_ldap.config import LDAPSearch - -AUTH_LDAP_SERVER_URI = config.ldap.uri -AUTH_LDAP_BIND_DN = config.ldap.bind_dn -AUTH_LDAP_BIND_PASSWORD = config.ldap.bind_pass -AUTH_LDAP_USER_SEARCH = LDAPSearch( - config.ldap.search_dn, ldap.SCOPE_SUBTREE, config.ldap.search_filter -) - -AUTHENTICATION_BACKENDS = [ - "django_auth_ldap.backend.LDAPBackend", - "django.contrib.auth.backends.ModelBackend", -] - -LOGIN_REDIRECT_URL = '/' - -# Application definition - -INSTALLED_APPS = [ - 'multimail.apps.MultimailConfig', - 'bootstrap4', - 'django_static_fontawesome', - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -ROOT_URLCONF = 'backend.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR / 'multimail/templates'] - , - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'backend.wsgi.application' - -# Database -# https://docs.djangoproject.com/en/3.1/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - }, - 'mail': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'mail.sqlite3', - }, - 'ldap': { - 'ENGINE': 'ldapdb.backends.ldap', - 'NAME': config.ldap.uri, - 'USER': config.ldap.bind_dn, - 'PASSWORD': config.ldap.bind_pass, - }, - #'mysql': { - # 'NAME': 'user_data', - # 'ENGINE': 'django.db.backends.mysql', - # 'USER': 'mysql_user', - # 'PASSWORD': 'priv4te' - #} -} - -# Password validation -# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - -# Internationalization -# https://docs.djangoproject.com/en/3.1/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.1/howto/static-files/ - -STATIC_URL = '/static/' diff --git a/backend/backend/urls.py b/backend/backend/urls.py index 0cfddce..77d54eb 100644 --- a/backend/backend/urls.py +++ b/backend/backend/urls.py @@ -17,6 +17,6 @@ from django.contrib import admin from django.urls import include, path urlpatterns = [ - path('', include('multimail.urls')), + path('multimail/', include('multimail.urls')), path('admin/', admin.site.urls), ] diff --git a/backend/multimail/actions.py b/backend/multimail/actions.py index 75b92f0..8bc52c8 100644 --- a/backend/multimail/actions.py +++ b/backend/multimail/actions.py @@ -1,48 +1,29 @@ -from django.http import HttpResponseRedirect, Http404 +from django.http import HttpResponseRedirect +from django.shortcuts import get_object_or_404, render from django.urls import reverse +from django.views import generic +from django.utils import timezone from django.contrib.auth.decorators import login_required -from django.contrib.auth import logout as auth_logout +from django.contrib.auth.mixins import LoginRequiredMixin -from .models import Domain, Mailbox, Alias -from .owner import user_from_request +from .models import Choice, Question, Domain @login_required(login_url='/login/') -def delete_domain(request, domain_id): +def vote(request, question_id): + question = get_object_or_404(Question, pk=question_id) try: - user = user_from_request(request) - domain = Domain.objects.filter(admin__admin=user['name'], admin__source=user['source']).get(pk=domain_id) - except: - raise Http404 - # TODO this might fail due to foreign key constraint - domain.delete() - return HttpResponseRedirect(reverse('multimail:domains')) - - -@login_required(login_url='/login/') -def delete_mailbox(request, mailbox_id): - try: - user = user_from_request(request) - domains = [o.domain for o in Domain.objects.filter(admin__admin=user['name'], admin__source=user['source'])] - mailbox = Mailbox.objects.filter(domain__in=domains).get(pk=mailbox_id) - except: - raise Http404 - mailbox.delete() - return HttpResponseRedirect(reverse('multimail:mailboxes')) - - -@login_required(login_url='/login/') -def delete_alias(request, alias_id): - try: - user = user_from_request(request) - domains = [o.domain for o in Domain.objects.filter(admin__admin=user['name'], admin__source=user['source'])] - alias = Alias.objects.filter(source_domain__in=domains).get(pk=alias_id) - except: - raise Http404 - alias.delete() - return HttpResponseRedirect(reverse('multimail:aliases')) - - -def logout(request): - auth_logout(request) - return HttpResponseRedirect(reverse('multimail:login')) + selected_choice = question.choice_set.get(pk=request.POST['choice']) + except (KeyError, Choice.DoesNotExist): + # Redisplay the question voting form. + return render(request, 'multimail/detail.html', { + 'question': question, + 'error_message': "You didn't select a choice.", + }) + else: + selected_choice.votes += 1 + selected_choice.save() + # Always return an HttpResponseRedirect after successfully dealing + # with POST data. This prevents data from being posted twice if a + # user hits the Back button. + return HttpResponseRedirect(reverse('multimail:results', args=(question.id,))) diff --git a/backend/multimail/admin.py b/backend/multimail/admin.py index 482fb66..b64b403 100644 --- a/backend/multimail/admin.py +++ b/backend/multimail/admin.py @@ -1,26 +1,32 @@ from django.contrib import admin -from .models import TLSPolicy, Domain, DomainOwner +from .models import Choice, Question +from .models import Alias, Domain, Mailbox, TLSPolicy -class AdminInline(admin.TabularInline): - model = DomainOwner +class ChoiceInline(admin.TabularInline): + model = Choice extra = 1 -class DomainAdmin(admin.ModelAdmin): - list_display = [('domain'), ('admins')] - inlines = [AdminInline] - - def admins(self, obj): - return "[" + ", ".join([x.source + ":" + x.admin for x in obj.admin.all()]) + "]" +class QuestionAdmin(admin.ModelAdmin): + fieldsets = [ + (None, {'fields': ['question_text']}), + ('Date information', {'fields': ['pub_date'], 'classes': ['collapse']}), + ] + list_display = ('question_text', 'pub_date', 'was_published_recently') + inlines = [ChoiceInline] -admin.site.register(Domain, DomainAdmin) +admin.site.register(Question, QuestionAdmin) class TLSPolicyAdmin(admin.ModelAdmin): - list_display = [('domain'), ('policy'), ('params')] + list_display = ('domain', 'policy', 'params') admin.site.register(TLSPolicy, TLSPolicyAdmin) + +admin.site.register(Alias) +admin.site.register(Domain) +admin.site.register(Mailbox) diff --git a/backend/multimail/forms.py b/backend/multimail/forms.py deleted file mode 100644 index 98570f2..0000000 --- a/backend/multimail/forms.py +++ /dev/null @@ -1,133 +0,0 @@ -from django.contrib.auth.decorators import login_required -from django.forms import ModelForm -from django.http import HttpResponseRedirect, Http404 -from django.shortcuts import render - -from multimail.models import Domain, Mailbox, Alias -from multimail.owner import user_from_request - - -class DomainForm(ModelForm): - class Meta: - model = Domain - fields = '__all__' - #fields = ['domain'] - - -class MailboxForm(ModelForm): - class Meta: - model = Mailbox - fields = '__all__' - - -class AliasForm(ModelForm): - class Meta: - model = Alias - fields = '__all__' - - -@login_required(login_url='/login/') -def edit_domain(request, domain_id): - try: - user = user_from_request(request) - domain = Domain.objects.filter(admin__admin=user['name'], admin__source=user['source']).get(pk=domain_id) - except: - raise Http404 - if request.method == 'POST': - form = DomainForm(request.POST, instance=domain) - if form.is_valid(): - form.save() - return HttpResponseRedirect('/domains/') - - else: - form = DomainForm(instance=domain) - - return render(request, 'multimail/edit_domain.html', {'form': form}) - - -@login_required(login_url='/login/') -def new_domain(request): - user = user_from_request(request) - if request.method == 'POST': - form = DomainForm(request.POST) - if form.is_valid(): - domain = form.save() - domain.admin.create(admin=user['name'], source=user['source']) - return HttpResponseRedirect('/domains/') - - else: - form = DomainForm() - - return render(request, 'multimail/edit_domain.html', {'form': form}) - - -@login_required(login_url='/login/') -def edit_mailbox(request, mailbox_id): - try: - user = user_from_request(request) - domains = [o.domain for o in Domain.objects.filter(admin__admin=user['name'], admin__source=user['source'])] - mailbox = Mailbox.objects.filter(domain__in=domains).get(pk=mailbox_id) - except: - raise Http404 - if request.method == 'POST': - form = MailboxForm(request.POST, instance=mailbox) - if form.is_valid(): - form.save() - return HttpResponseRedirect('/mailboxes/') - - else: - form = MailboxForm(instance=mailbox) - - return render(request, 'multimail/edit_mailbox.html', {'form': form}) - - -@login_required(login_url='/login/') -def new_mailbox(request): - if request.method == 'POST': - user = user_from_request(request) - domains = [o.domain for o in Domain.objects.filter(admin__admin=user['name'], admin__source=user['source'])] - form = MailboxForm(request.POST) - if form.is_valid() and form.domain in domains: - form.save() - return HttpResponseRedirect('/mailboxes/') - - else: - form = MailboxForm() - - return render(request, 'multimail/edit_mailbox.html', {'form': form}) - - -@login_required(login_url='/login/') -def edit_alias(request, alias_id): - try: - user = user_from_request(request) - domains = [o.domain for o in Domain.objects.filter(admin__admin=user['name'], admin__source=user['source'])] - alias = Alias.objects.filter(source_domain__in=domains).get(pk=alias_id) - except: - raise Http404 - if request.method == 'POST': - form = AliasForm(request.POST, instance=alias) - if form.is_valid(): - form.save() - return HttpResponseRedirect('/aliases/') - - else: - form = AliasForm(instance=alias) - - return render(request, 'multimail/edit_alias.html', {'form': form}) - - -@login_required(login_url='/login/') -def new_alias(request): - if request.method == 'POST': - user = user_from_request(request) - domains = [o.domain for o in Domain.objects.filter(admin__admin=user['name'], admin__source=user['source'])] - form = AliasForm(request.POST) - if form.is_valid() and form.source_domain in domains: - form.save() - return HttpResponseRedirect('/aliases/') - - else: - form = AliasForm() - - return render(request, 'multimail/edit_alias.html', {'form': form}) diff --git a/backend/multimail/migrations/0001_initial.py b/backend/multimail/migrations/0001_initial.py index 39b76a2..2528c2e 100644 --- a/backend/multimail/migrations/0001_initial.py +++ b/backend/multimail/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.3 on 2020-11-07 16:49 +# Generated by Django 3.1.3 on 2020-11-02 18:55 from django.db import migrations, models import django.db.models.deletion @@ -13,67 +13,20 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='Alias', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('source_username', models.CharField(max_length=64)), - ('source_domain', models.CharField(max_length=255)), - ('destination_username', models.CharField(max_length=64)), - ('destination_domain', models.CharField(max_length=255)), - ('enabled', models.IntegerField(blank=True, null=True)), - ], - options={ - 'db_table': 'aliases', - 'managed': False, - }, - ), - migrations.CreateModel( - name='Domain', + name='Question', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('domain', models.CharField(max_length=255)), + ('question_text', models.CharField(max_length=200)), + ('pub_date', models.DateTimeField(verbose_name='date published')), ], - options={ - 'db_table': 'domains', - 'managed': False, - }, ), migrations.CreateModel( - name='Mailbox', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('username', models.CharField(max_length=64)), - ('domain', models.CharField(max_length=255)), - ('password', models.CharField(max_length=255)), - ('quota', models.IntegerField(blank=True, null=True)), - ('enabled', models.IntegerField(blank=True, null=True)), - ('sendonly', models.IntegerField(blank=True, null=True)), - ], - options={ - 'db_table': 'mailboxes', - 'managed': False, - }, - ), - migrations.CreateModel( - name='TLSPolicy', + name='Choice', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('domain', models.CharField(max_length=255)), - ('policy', models.TextField()), - ('params', models.CharField(blank=True, max_length=255, null=True)), - ], - options={ - 'db_table': 'tlspolicies', - 'managed': False, - }, - ), - migrations.CreateModel( - name='DomainOwner', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('admin', models.CharField(max_length=200)), - ('source', models.CharField(choices=[('system', 'system'), ('ldap', 'ldap'), ('mail', 'mail')], default=0, max_length=8)), - ('domain', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='admin', to='multimail.domain')), + ('choice_text', models.CharField(max_length=200)), + ('votes', models.IntegerField(default=0)), + ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='multimail.question')), ], ), ] diff --git a/backend/multimail/migrations/0002_aliases_domains_mailboxes_tlspolicies.py b/backend/multimail/migrations/0002_aliases_domains_mailboxes_tlspolicies.py new file mode 100644 index 0000000..b0a0ffb --- /dev/null +++ b/backend/multimail/migrations/0002_aliases_domains_mailboxes_tlspolicies.py @@ -0,0 +1,68 @@ +# Generated by Django 3.1.3 on 2020-11-02 21:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('multimail', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Aliases', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('source_username', models.CharField(max_length=64)), + ('source_domain', models.CharField(max_length=255)), + ('destination_username', models.CharField(max_length=64)), + ('destination_domain', models.CharField(max_length=255)), + ('enabled', models.IntegerField(blank=True, null=True)), + ], + options={ + 'db_table': 'aliases', + 'managed': False, + }, + ), + migrations.CreateModel( + name='Domains', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('domain', models.CharField(max_length=255)), + ], + options={ + 'db_table': 'domains', + 'managed': False, + }, + ), + migrations.CreateModel( + name='Mailboxes', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('username', models.CharField(max_length=64)), + ('domain', models.CharField(max_length=255)), + ('password', models.CharField(max_length=255)), + ('quota', models.IntegerField(blank=True, null=True)), + ('enabled', models.IntegerField(blank=True, null=True)), + ('sendonly', models.IntegerField(blank=True, null=True)), + ], + options={ + 'db_table': 'mailboxes', + 'managed': False, + }, + ), + migrations.CreateModel( + name='Tlspolicies', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('domain', models.CharField(max_length=255)), + ('policy', models.TextField()), + ('params', models.CharField(blank=True, max_length=255, null=True)), + ], + options={ + 'db_table': 'tlspolicies', + 'managed': False, + }, + ), + ] diff --git a/backend/multimail/models.py b/backend/multimail/models.py index 6813fc2..1bedeea 100644 --- a/backend/multimail/models.py +++ b/backend/multimail/models.py @@ -3,6 +3,27 @@ from django.db import models from django.utils import timezone +class Question(models.Model): + question_text = models.CharField(max_length=200) + pub_date = models.DateTimeField('date published') + + def __str__(self): + return self.question_text + + def was_published_recently(self): + now = timezone.now() + return now - datetime.timedelta(days=1) <= self.pub_date <= now + + +class Choice(models.Model): + question = models.ForeignKey(Question, on_delete=models.CASCADE) + choice_text = models.CharField(max_length=200) + votes = models.IntegerField(default=0) + + def __str__(self): + return self.choice_text + + class Alias(models.Model): id = models.AutoField(primary_key=True) source_username = models.CharField(max_length=64) @@ -46,12 +67,3 @@ class TLSPolicy(models.Model): class Meta: managed = False db_table = 'tlspolicies' - - -class DomainOwner(models.Model): - domain = models.ForeignKey(Domain, on_delete=models.CASCADE, related_name='admin') - admin = models.CharField(max_length=200) - source = models.CharField(max_length=8, choices=[('system','system'), ('ldap', 'ldap'), ('mail', 'mail')], default=0) - - def __str__(self): - return self.admin diff --git a/backend/multimail/owner.py b/backend/multimail/owner.py deleted file mode 100644 index e2ddcef..0000000 --- a/backend/multimail/owner.py +++ /dev/null @@ -1,7 +0,0 @@ - -def user_from_request(request): - if hasattr(request.user, 'ldap_user'): - # print(request.user.ldap_user.attrs.data) - return {'name': request.user.username, 'source': 'ldap'} - else: - return {'name': request.user.username, 'source': 'system'} \ No newline at end of file diff --git a/backend/multimail/templates/multimail/aliases.html b/backend/multimail/templates/multimail/aliases.html deleted file mode 100644 index 7797fe3..0000000 --- a/backend/multimail/templates/multimail/aliases.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends 'multimail/base.html' %} - -{% block content %} -

Aliases

- - {% if alias_list %} - - - - - - - - - - - {% for alias in alias_list %} - - - - - - {% endfor %} - - - - - - - - - -
SourceDestinationActions
{{ alias.source_username }}@{{ alias.source_domain }} - {{ alias.destination_username }}@{{ alias.destination_domain }}Delete
- Add -
- {% else %} -

You haven't set up any aliases yet.

- {% endif %} - -{% endblock %} \ No newline at end of file diff --git a/backend/multimail/templates/multimail/base.html b/backend/multimail/templates/multimail/base.html index 593a09b..5f57bba 100644 --- a/backend/multimail/templates/multimail/base.html +++ b/backend/multimail/templates/multimail/base.html @@ -16,7 +16,6 @@ - @@ -30,7 +29,7 @@
Domains Mailboxes - Aliases + Aliases
@@ -39,7 +38,7 @@