rework authentication to respect all possible backends using DRF auth_token

This commit is contained in:
Wayne Witzel III
2017-02-01 00:20:13 -05:00
parent 36c06020b4
commit 9e7ae673b6

View File

@@ -1,12 +1,16 @@
import json import json
import logging import logging
import urllib
from channels import Group from channels import Group
from channels.sessions import channel_session from channels.sessions import channel_session, http_session
from channels.auth import channel_session_user, http_session_user, transfer_user from channels.handler import AsgiRequest
from django.core.serializers.json import DjangoJSONEncoder from django.core.serializers.json import DjangoJSONEncoder
from django.contrib.auth.models import User
from awx.main.models.organization import AuthToken
logger = logging.getLogger('awx.main.consumers') logger = logging.getLogger('awx.main.consumers')
@@ -17,35 +21,43 @@ def discard_groups(message):
Group(group).discard(message.reply_channel) Group(group).discard(message.reply_channel)
@http_session_user @http_session
@channel_session @channel_session
def ws_connect(message): def ws_connect(message):
connect_text = {'accept':False, 'user':None}
if message.http_session: if message.http_session:
# our backend is not set on the http_session so we need to update the session before request = AsgiRequest(message)
# calling transfer_user. This is why we are doing this manually instead of using the token = request.COOKIES.get('token', None)
# all-in-one helper decorator. if token is not None:
message.http_session.update({'_auth_user_backend':'django.contrib.auth.backends.ModelBackend'}) token = urllib.unquote(token).strip('"')
transfer_user(message.http_session, message.channel_session) try:
message.reply_channel.send({"text": json.dumps({"accept": True, "user": message.user.id})}) auth_token = AuthToken.objects.get(key=token)
else: if auth_token.in_valid_tokens:
message.reply_channel.send({"text": json.dumps({"accept": False, "user": None})}) message.channel_session['user_id'] = auth_token.user_id
connect_text['accept'] = True
connect_text['user'] = auth_token.user_id
except AuthToken.DoesNotExist:
logger.error("auth_token provided was invalid.")
message.reply_channel.send({"text": json.dumps(connect_text)})
@channel_session_user @channel_session
def ws_disconnect(message): def ws_disconnect(message):
discard_groups(message) discard_groups(message)
@channel_session_user @channel_session
def ws_receive(message): def ws_receive(message):
from awx.main.access import consumer_access from awx.main.access import consumer_access
user = message.user user_id = message.channel_session.get('user_id', None)
if user.id is None: if user_id is None:
logger.error("No valid user found for websocket.") logger.error("No valid user found for websocket.")
message.reply_channel.send({"text": json.dumps({"error": "no valid user"})}) message.reply_channel.send({"text": json.dumps({"error": "no valid user"})})
return None return None
user = User.objects.get(pk=user_id)
raw_data = message.content['text'] raw_data = message.content['text']
data = json.loads(raw_data) data = json.loads(raw_data)