From 1e18c4043e4593849ebd982340ea26f04f02a363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Sun, 9 Apr 2017 15:47:16 +0200
Subject: [PATCH 1/2] Use last channels & co versions

- Use last official releases of channels, asgiref, daphne and
  asgi-redis packages.
- Customization of JsonWebsocketConsumer is now in kfet app through a
  custom class (and so, doesn't require anymore a forked version of channels).
- Clean kfet consumers code.
---
 kfet/consumers.py | 27 +++++++++++----------------
 requirements.txt  |  8 ++++----
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/kfet/consumers.py b/kfet/consumers.py
index dcd69bdf..6e9dc6ca 100644
--- a/kfet/consumers.py
+++ b/kfet/consumers.py
@@ -1,26 +1,21 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
+from django.core.serializers.json import json, DjangoJSONEncoder
 
-from channels import Group
 from channels.generic.websockets import JsonWebsocketConsumer
 
-class KPsul(JsonWebsocketConsumer):
 
-    # Set to True if you want them, else leave out
-    strict_ordering = False
-    slight_ordering = False
+class DjangoJsonWebsocketConsumer(JsonWebsocketConsumer):
+    """Custom Json Websocket Consumer.
 
-    def connection_groups(self, **kwargs):
-        return ['kfet.kpsul']
+    Encode to JSON with DjangoJSONEncoder.
 
-    def connect(self, message, **kwargs):
-        pass
+    """
 
-    def receive(self, content, **kwargs):
-        pass
+    @classmethod
+    def encode_json(cls, content):
+        return json.dumps(content, cls=DjangoJSONEncoder)
 
-    def disconnect(self, message, **kwargs):
-        pass
+
+class KPsul(DjangoJsonWebsocketConsumer):
+    groups = ['kfet.kpsul']
diff --git a/requirements.txt b/requirements.txt
index ce081588..990fba3a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,13 +11,13 @@ six==1.10.0
 unicodecsv==0.14.1
 icalendar==3.10
 django-bootstrap-form==3.2.1
-asgiref==0.14.0
-daphne==0.14.3
-asgi-redis==0.14.0
+asgiref==1.1.1
+daphne==1.2.0
+asgi-redis==1.3.0
 statistics==1.0.3.5
 future==0.15.2
 django-widget-tweaks==1.4.1
 git+https://git.eleves.ens.fr/cof-geek/django_custommail.git#egg=django_custommail
 ldap3
-git+https://github.com/Aureplop/channels.git#egg=channels
+channels==1.1.3
 python-dateutil

From 029d59e615adba19c61f2cd2be72a6f2d71cc23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Sun, 9 Apr 2017 16:10:27 +0200
Subject: [PATCH 2/2] Enable authentication on KPsul websocket.

- PermConsumerMixin allows checking permissions on connection to a
  consumer.
- KPsul consumer uses this mixin to check if connecting user has the
  permission `kfet.is_team`.

Fixes #67.
---
 kfet/consumers.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/kfet/consumers.py b/kfet/consumers.py
index 6e9dc6ca..ee096368 100644
--- a/kfet/consumers.py
+++ b/kfet/consumers.py
@@ -17,5 +17,25 @@ class DjangoJsonWebsocketConsumer(JsonWebsocketConsumer):
         return json.dumps(content, cls=DjangoJSONEncoder)
 
 
-class KPsul(DjangoJsonWebsocketConsumer):
+class PermConsumerMixin(object):
+    """Add support to check permissions on Consumers.
+
+    Attributes:
+        perms_connect (list): Required permissions to connect to this
+            consumer.
+
+    """
+    http_user = True  # Enable message.user
+    perms_connect = []
+
+    def connect(self, message, **kwargs):
+        """Check permissions on connection."""
+        if message.user.has_perms(self.perms_connect):
+            super().connect(message, **kwargs)
+        else:
+            self.close()
+
+
+class KPsul(PermConsumerMixin, DjangoJsonWebsocketConsumer):
     groups = ['kfet.kpsul']
+    perms_connect = ['kfet.is_team']