External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

remove use of http_session, not needed with auth_token

Browse Source
This commit is contained in:
Wayne Witzel III
2017-02-01 12:24:56 -05:00
parent eada4ce83f
commit 70f8dfe8fe
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/main/consumers.py
View File

@@ -3,7 +3,7 @@ import logging
import urllib import urllib
from channels import Group from channels import Group
from channels.sessions import channel_session, http_session from channels.sessions import channel_session
from channels.handler import AsgiRequest from channels.handler import AsgiRequest
from django.core.serializers.json import DjangoJSONEncoder from django.core.serializers.json import DjangoJSONEncoder
@@ -21,24 +21,23 @@ def discard_groups(message):
Group(group).discard(message.reply_channel) Group(group).discard(message.reply_channel)
@http_session
@channel_session @channel_session
def ws_connect(message): def ws_connect(message):
connect_text = {'accept':False, 'user':None} connect_text = {'accept':False, 'user':None}
if message.http_session: message.content['method'] = 'FAKE'
request = AsgiRequest(message) request = AsgiRequest(message)
token = request.COOKIES.get('token', None) token = request.COOKIES.get('token', None)
if token is not None: if token is not None:
token = urllib.unquote(token).strip('"') token = urllib.unquote(token).strip('"')
try: try:
auth_token = AuthToken.objects.get(key=token) auth_token = AuthToken.objects.get(key=token)
if auth_token.in_valid_tokens: if auth_token.in_valid_tokens:
message.channel_session['user_id'] = auth_token.user_id message.channel_session['user_id'] = auth_token.user_id
connect_text['accept'] = True connect_text['accept'] = True
connect_text['user'] = auth_token.user_id connect_text['user'] = auth_token.user_id
except AuthToken.DoesNotExist: except AuthToken.DoesNotExist:
logger.error("auth_token provided was invalid.") logger.error("auth_token provided was invalid.")
message.reply_channel.send({"text": json.dumps(connect_text)}) message.reply_channel.send({"text": json.dumps(connect_text)})