diff --git a/mailing/templates/mailing/_message_list.html b/mailing/templates/mailing/_message_list.html
new file mode 100644
index 0000000..f79d128
--- /dev/null
+++ b/mailing/templates/mailing/_message_list.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+
+{% for message in messages %}
+
+
+ {{ message.created }} | {{ message.author_display }}
+
+
+ {{ message.content|linebreaksbr }}
+
+
+{% empty %}
+
{% trans "No messages." %}
+{% endfor %}
diff --git a/mailing/tests.py b/mailing/tests.py
new file mode 100644
index 0000000..5b67ee3
--- /dev/null
+++ b/mailing/tests.py
@@ -0,0 +1,93 @@
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
+from django.core.urlresolvers import reverse
+from django.test import TestCase, override_settings
+from django.core import mail
+from django.conf import settings
+
+from .models import Message, MessageThread, MessageCorrespondent
+
+
+#class MailingTests(TestCase):
+# def setUp(self):
+# a, b, c, d = (User.objects.create_user(guy, email='%s@example.org' % guy, password=guy) for guy in 'abcd')
+# d.is_superuser = True
+# d.save()
+# pa, _ = Participation.objects.get_or_create(user=a, site=Site.objects.first())
+# conversation, _ = ConversationWithParticipant.objects.get_or_create(participation=pa)
+# Message.objects.create(content='allo', conversation=conversation, author=b)
+# Message.objects.create(content='aluil', conversation=conversation, author=a)
+# site = Site.objects.first()
+# Talk.objects.get_or_create(site=site, proposer=a, title='a talk', description='yay', event=Event.objects.get(site=site, name='other'))
+#
+# def test_models(self):
+# talk, participant, message = (model.objects.first() for model in
+# (ConversationAboutTalk, ConversationWithParticipant, Message))
+# self.assertEqual(str(talk), 'Conversation about a talk')
+# self.assertEqual(str(participant), 'Conversation with a')
+# self.assertEqual(str(message), 'Message from b')
+# self.assertEqual(message.get_absolute_url(), '/conversations/with/a/')
+# self.assertEqual(talk.get_absolute_url(), '/talk/details/a-talk')
+#
+# def test_views(self):
+# url = ConversationWithParticipant.objects.first().get_absolute_url()
+# self.assertEqual(self.client.get(url).status_code, 302)
+# self.client.login(username='c', password='c')
+# self.assertEqual(self.client.get(url).status_code, 403)
+# self.assertEqual(self.client.get(reverse('list-correspondents')).status_code, 403) # c is not staff
+# self.assertEqual(self.client.get(reverse('inbox')).status_code, 200)
+# self.client.post(reverse('inbox'), {'content': 'coucou'})
+# self.client.login(username='d', password='d')
+# self.client.post(url, {'content': 'im superuser'})
+# self.assertEqual(Message.objects.last().content, 'im superuser')
+# self.client.login(username='d', password='d')
+# self.assertEqual(self.client.get(reverse('list-correspondents')).status_code, 200)
+#
+#
+#@override_settings(DEFAULT_FROM_EMAIL='noreply@example.org',
+# REPLY_EMAIL='reply@example.org',
+# REPLY_KEY='secret')
+#class EmailTests(TestCase):
+# def setUp(self):
+# for guy in 'abcd':
+# setattr(self, guy, User.objects.create_user(guy, email='%s@example.org' % guy, password=guy))
+# a_p = Participation(user=self.a, site=Site.objects.first())
+# a_p.orga = True
+# a_p.save()
+# t = Topic(name='Topic 1', site=Site.objects.first())
+# t.save()
+# t.reviewers.add(self.b)
+#
+#
+# def test_talk_notification(self):
+# self.client.login(username='c', password='c')
+# # Check that login create participation
+# self.assertTrue(Participation.objects.filter(user=self.c, site=Site.objects.first()).exists())
+# # Propose new talk
+# topic = Topic.objects.get(name='Topic 1')
+# response = self.client.post(reverse('add-talk'), {
+# 'title': 'Talk 1',
+# 'description': 'This is the first talk',
+# 'topics': (topic.pk,),
+# 'event': 1,
+# 'speakers': (self.c.pk, self.d.pk),
+# }, follow=True)
+# self.assertEqual(response.status_code, 200)
+# self.assertContains(response, 'Talk proposed') # check messages notification
+# talk = Talk.objects.get(site=Site.objects.first(), title='Talk 1')
+# conv = ConversationAboutTalk.objects.get(talk=talk)
+# # Orga and reviewer should have been subscribed to the conversation about the talk
+# self.assertEqual(set([self.a, self.b]), set(conv.subscribers.all()))
+# # Both should have received an email notification
+# self.assertEqual(len(mail.outbox), 2)
+# for m in mail.outbox:
+# self.assertEqual(m.from_email, '%s <%s>' % (self.c.profile, settings.DEFAULT_FROM_EMAIL))
+# self.assertTrue('Talk: %s' % talk.title)
+# self.assertTrue(len(m.to), 1)
+# self.assertTrue(m.to[0] in [ self.a.email, self.b.email ])
+# # Both should have been subscribed to conversations with each speakers
+# for user in [self.c, self.d]:
+# # Participation should have been created as the user is a speaker
+# p = Participation.objects.get(user=user, site=Site.objects.first())
+# conv = ConversationWithParticipant.objects.get(participation=p)
+# self.assertEqual(set([self.a, self.b]), set(conv.subscribers.all()))
diff --git a/mailing/utils.py b/mailing/utils.py
new file mode 100644
index 0000000..a56e1f6
--- /dev/null
+++ b/mailing/utils.py
@@ -0,0 +1,122 @@
+from django.conf import settings
+
+import imaplib
+import ssl
+import logging
+from email import policy
+from email.parser import BytesParser
+import chardet
+import re
+
+from .models import MessageThread, MessageCorrespondent, Message, hexdigest_sha256
+
+
+class NoTokenFoundException(Exception):
+ pass
+
+class InvalidTokenException(Exception):
+ pass
+
+class InvalidKeyException(Exception):
+ pass
+
+
+def fetch_imap_box(user, password, host, port=993, inbox='INBOX', trash='Trash'):
+ logging.basicConfig(level=logging.DEBUG)
+ context = ssl.create_default_context()
+ success, failure = 0, 0
+ with imaplib.IMAP4_SSL(host=host, port=port, ssl_context=context) as M:
+ typ, data = M.login(user, password)
+ if typ != 'OK':
+ raise Exception(data[0].decode('utf-8'))
+ typ, data = M.enable('UTF8=ACCEPT')
+ if typ != 'OK':
+ raise Exception(data[0].decode('utf-8'))
+ if trash is not None:
+ # Vérification de l’existence de la poubelle
+ typ, data = M.select(mailbox=trash)
+ if typ != 'OK':
+ raise Exception(data[0].decode('utf-8'))
+ typ, data = M.select(mailbox=inbox)
+ if typ != 'OK':
+ raise Exception(data[0].decode('utf-8'))
+ typ, data = M.uid('search', None, 'UNSEEN')
+ if typ != 'OK':
+ raise Exception(data[0].decode('utf-8'))
+ for num in data[0].split():
+ typ, data = M.uid('fetch', num, '(RFC822)')
+ if typ != 'OK':
+ failure += 1
+ logging.warning(data[0].decode('utf-8'))
+ continue
+ raw_email = data[0][1]
+ try:
+ process_email(raw_email)
+ except Exception as e:
+ failure += 1
+ logging.exception("An error occured during mail processing")
+ if type(e) == NoTokenFoundException:
+ tag = 'NoTokenFound'
+ if type(e) == InvalidTokenException:
+ tag = 'InvalidToken'
+ if type(e) == InvalidKeyException:
+ tag = 'InvalidKey'
+ else:
+ tag = 'UnknowError'
+ typ, data = M.uid('store', num, '+FLAGS', tag)
+ if typ != 'OK':
+ logging.warning(data[0].decode('utf-8'))
+ continue
+ if trash is not None:
+ typ, data = M.uid('copy', num, trash)
+ if typ != 'OK':
+ failure += 1
+ logging.warning(data[0].decode('utf-8'))
+ continue
+ typ, data = M.uid('store', num, '+FLAGS', '\Deleted')
+ if typ != 'OK':
+ failure += 1
+ logging.warning(data[0].decode('utf-8'))
+ continue
+ success += 1
+ typ, data = M.expunge()
+ if typ != 'OK':
+ failure += 1
+ raise Exception(data[0].decode('utf-8'))
+ if failure:
+ total = success + failure
+ logging.info("Total: %d, success: %d, failure: %d" % (total, success, failure))
+
+
+def process_email(raw_email):
+ msg = BytesParser(policy=policy.default).parsebytes(raw_email)
+ body = msg.get_body(preferencelist=['plain'])
+ content = body.get_payload(decode=True)
+
+ charset = body.get_content_charset()
+ if not charset:
+ charset = chardet.detect(content)['encoding']
+ content = content.decode(charset)
+
+ regex = re.compile('^[^+@]+\+(?P
[a-zA-Z0-9]{80})@[^@]+$')
+
+ for addr in msg.get('To', '').split(','):
+ m = regex.match(addr.strip())
+ if m:
+ break
+
+ if not m:
+ raise NoTokenFoundException
+
+ token = m.group('token')
+ key = token[64:]
+ try:
+ thread = MessageThread.objects.get(token=token[:32])
+ sender = MessageCorrespondent.objects.get(token=token[32:64])
+ except models.DoesNotExist:
+ raise InvalidTokenException
+
+ if key != hexdigest_sha256(settings.SECRET_KEY, thread.token, sender.token)[:16]:
+ raise InvalidKeyException
+
+ Message.objects.create(thread=thread, from_email=sender.email, content=content)
diff --git a/planning/forms.py b/planning/forms.py
index 3f4c12f..95443d0 100644
--- a/planning/forms.py
+++ b/planning/forms.py
@@ -4,16 +4,17 @@ from .models import Room
class RoomForm(forms.ModelForm):
+ class Meta:
+ model = Room
+ fields = ['name', 'label', 'capacity']
+
def __init__(self, *args, **kwargs):
self.site = kwargs.pop('site')
super().__init__(*args, **kwargs)
- class Meta:
- model = Room
- fields = ['name', 'label', 'capacity', 'sound']
-
def clean_name(self):
name = self.cleaned_data['name']
- if self.instance and name != self.instance.name and Room.objects.filter(site=self.site, name=name).exists():
+ if (not self.instance or self.instance.name != name) \
+ and Room.objects.filter(site=self.site, name=name).exists():
raise self.instance.unique_error_message(self._meta.model, ['name'])
return name
diff --git a/planning/migrations/0002_room_sound.py b/planning/migrations/0002_room_sound.py
deleted file mode 100644
index c6106dd..0000000
--- a/planning/migrations/0002_room_sound.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2017-05-26 11:18
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('planning', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='room',
- name='sound',
- field=models.BooleanField(default=False),
- ),
- ]
diff --git a/planning/models.py b/planning/models.py
index 4cebb46..4454805 100644
--- a/planning/models.py
+++ b/planning/models.py
@@ -14,7 +14,6 @@ class Room(models.Model):
name = models.CharField(max_length=256, blank=True, default="")
label = models.CharField(max_length=256, blank=True, default="")
capacity = models.IntegerField(default=0)
- sound = models.BooleanField(default=False)
class Meta:
unique_together = ['site', 'name']
diff --git a/ponyconf/backends.py b/ponyconf/backends.py
new file mode 100644
index 0000000..29d3dea
--- /dev/null
+++ b/ponyconf/backends.py
@@ -0,0 +1,16 @@
+from django.contrib.auth import get_user_model
+from django.contrib.auth.backends import ModelBackend
+
+
+class EmailBackend(ModelBackend):
+ def authenticate(self, request, username=None, password=None, **kwargs):
+ if not username:
+ return None
+ UserModel = get_user_model()
+ try:
+ user = UserModel._default_manager.get(email__iexact=username)
+ except UserModel.DoesNotExist:
+ UserModel().set_password(password) # https://code.djangoproject.com/ticket/20760
+ else:
+ if user.check_password(password) and self.user_can_authenticate(user):
+ return user
diff --git a/ponyconf/settings.py b/ponyconf/settings.py
index f2fa409..7f34d22 100644
--- a/ponyconf/settings.py
+++ b/ponyconf/settings.py
@@ -37,19 +37,18 @@ INSTALLED_APPS = [
'django.contrib.sites',
# our apps
- 'accounts',
+ #'accounts',
'ponyconf',
- 'proposals',
- 'conversations',
- 'planning',
- 'volunteers',
+ 'cfp',
+ 'mailing',
+ #'planning',
+ #'volunteers',
# external apps
'djangobower',
'bootstrap3',
- 'registration',
'django_select2',
- 'avatar',
+ 'crispy_forms',
# build-in apps
'django.contrib.admin',
@@ -60,7 +59,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
]
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
@@ -70,6 +69,8 @@ MIDDLEWARE_CLASSES = [
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
+ 'cfp.middleware.ConferenceMiddleware',
]
ROOT_URLCONF = 'ponyconf.urls'
@@ -86,8 +87,8 @@ TEMPLATES = [
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
- 'ponyconf.context_processors.site',
- 'proposals.context_processors.conference',
+ #'ponyconf.context_processors.site',
+ 'cfp.context_processors.conference',
],
},
},
@@ -204,10 +205,16 @@ BOOTSTRAP3 = {
SELECT2_JS = 'select2/dist/js/select2.min.js'
SELECT2_CSS = 'select2/dist/css/select2.min.css'
+SELECT2_I18N_PATH = 'select2/dist/js/i18n'
-AUTHENTICATION_BACKENDS = ['yeouia.backends.YummyEmailOrUsernameInsensitiveAuth']
+AUTHENTICATION_BACKENDS = [
+ 'django.contrib.auth.backends.ModelBackend',
+ 'ponyconf.backends.EmailBackend',
+]
LOGOUT_REDIRECT_URL = 'home'
+CRISPY_TEMPLATE_PACK='bootstrap3'
+
# django-registration
ACCOUNT_ACTIVATION_DAYS = 7
INCLUDE_REGISTER_URL = True
@@ -215,5 +222,17 @@ INCLUDE_REGISTER_URL = True
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
- }
+ },
+ 'select2': {
+ 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+ 'LOCATION': 'select2',
+ },
}
+
+SELECT2_CACHE_BACKEND = 'select2'
+
+SERVER_EMAIL = 'ponyconf@example.com'
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 25
+
diff --git a/ponyconf/static/css/ponyconf.css b/ponyconf/static/css/ponyconf.css
index 6aa60ca..c1e4afc 100644
--- a/ponyconf/static/css/ponyconf.css
+++ b/ponyconf/static/css/ponyconf.css
@@ -1,3 +1,9 @@
.subnav {
padding-bottom: 20px;
}
+
+span.asteriskField {
+ color: red;
+ font-size: 15px;
+}
+
diff --git a/ponyconf/templates/_base.html b/ponyconf/templates/_base.html
index fa47fb3..091d020 100644
--- a/ponyconf/templates/_base.html
+++ b/ponyconf/templates/_base.html
@@ -8,7 +8,7 @@
{% comment %}{% block title %}{{ site.name }}{% endblock %}
+ {% block title %}{{ conference.name }}{% endblock %}
{% bootstrap_css %}