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

Merge pull request #1642 from rooftopcellist/session_parity

Browse Source 
add auth cookies
This commit is contained in:
Christian Adams
2018-05-02 11:47:59 -04:00
committed by GitHub
parent f6600872b0 dead84da1a
commit 0e4b0e86bf
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/api/generics.py
View File

@@ -6,6 +6,7 @@ import inspect
import logging import logging
import time import time
import six import six
import urllib
# Django # Django
from django.conf import settings from django.conf import settings
@@ -29,6 +30,7 @@ from rest_framework.response import Response
from rest_framework import status from rest_framework import status
from rest_framework import views from rest_framework import views
from rest_framework.permissions import AllowAny from rest_framework.permissions import AllowAny
from rest_framework.renderers import JSONRenderer
# cryptography # cryptography
from cryptography.fernet import InvalidToken from cryptography.fernet import InvalidToken
@@ -39,7 +41,7 @@ from awx.main.models import * # noqa
from awx.main.access import access_registry from awx.main.access import access_registry
from awx.main.utils import * # noqa from awx.main.utils import * # noqa
from awx.main.utils.db import get_all_field_names from awx.main.utils.db import get_all_field_names
from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer, UserSerializer
from awx.api.versioning import URLPathVersioning, get_request_version from awx.api.versioning import URLPathVersioning, get_request_version
from awx.api.metadata import SublistAttachDetatchMetadata, Metadata from awx.api.metadata import SublistAttachDetatchMetadata, Metadata
@@ -70,6 +72,13 @@ class LoggedLoginView(auth_views.LoginView):
if current_user and getattr(current_user, 'pk', None) and current_user != original_user: if current_user and getattr(current_user, 'pk', None) and current_user != original_user:
logger.info("User {} logged in.".format(current_user.username)) logger.info("User {} logged in.".format(current_user.username))
if request.user.is_authenticated: if request.user.is_authenticated:
logger.info(smart_text(u"User {} logged in".format(self.request.user.username)))
ret.set_cookie('userLoggedIn', 'true')
current_user = UserSerializer(self.request.user)
current_user = JSONRenderer().render(current_user.data)
current_user = urllib.quote('%s' % current_user, '')
ret.set_cookie('current_user', current_user)
return ret return ret
else: else:
ret.status_code = 401 ret.status_code = 401
@@ -82,6 +91,7 @@ class LoggedLogoutView(auth_views.LogoutView):
original_user = getattr(request, 'user', None) original_user = getattr(request, 'user', None)
ret = super(LoggedLogoutView, self).dispatch(request, *args, **kwargs) ret = super(LoggedLogoutView, self).dispatch(request, *args, **kwargs)
current_user = getattr(request, 'user', None) current_user = getattr(request, 'user', None)
ret.set_cookie('userLoggedIn', 'false')
if (not current_user or not getattr(current_user, 'pk', True)) \ if (not current_user or not getattr(current_user, 'pk', True)) \
and current_user != original_user: and current_user != original_user:
logger.info("User {} logged out.".format(original_user.username)) logger.info("User {} logged out.".format(original_user.username))