Commit 919b4338 by Brian Wilson

Encrypt the session id before writing to tracking logs.

parent 721732bf
import hmac
import hashlib
import json import json
import re import re
import logging import logging
...@@ -111,12 +113,26 @@ class TrackMiddleware(object): ...@@ -111,12 +113,26 @@ class TrackMiddleware(object):
) )
def get_session_key(self, request): def get_session_key(self, request):
"""Gets the Django session key from the request or an empty string if it isn't found""" """ Gets and encrypts the Django session key from the request or an empty string if it isn't found."""
try: try:
return request.session.session_key return self.encrypt_session_key(request.session.session_key)
except AttributeError: except AttributeError:
return '' return ''
def encrypt_session_key(self, session_key):
"""Encrypts a Django session key to another 32-character hex value."""
if not session_key:
return ''
# Follow the model of django.utils.crypto.salted_hmac() and
# django.contrib.sessions.backends.base._hash(), but use MD5
# so that the result has the same length (32) as the original
# session_key.
key_salt = "common.djangoapps.track" + self.__class__.__name__
key = hashlib.sha1(key_salt + settings.SECRET_KEY).digest()
encrypted_session_key = hmac.new(key, msg=session_key).hexdigest()
return encrypted_session_key
def get_user_primary_key(self, request): def get_user_primary_key(self, request):
"""Gets the primary key of the logged in Django user""" """Gets the primary key of the logged in Django user"""
try: try:
......
...@@ -117,10 +117,10 @@ class TrackMiddlewareTestCase(TestCase): ...@@ -117,10 +117,10 @@ class TrackMiddlewareTestCase(TestCase):
SessionMiddleware().process_request(request) SessionMiddleware().process_request(request)
request.session.save() request.session.save()
session_key = request.session.session_key session_key = request.session.session_key
expected_session_key = self.track_middleware.encrypt_session_key(session_key)
context = self.get_context_for_request(request) context = self.get_context_for_request(request)
self.assert_dict_subset(context, { self.assert_dict_subset(context, {
'session': session_key, 'session': expected_session_key,
}) })
def test_request_headers(self): def test_request_headers(self):
......
...@@ -41,18 +41,13 @@ def user_track(request): ...@@ -41,18 +41,13 @@ def user_track(request):
except: except:
username = "anonymous" username = "anonymous"
try:
scookie = request.META['HTTP_COOKIE'] # Get cookies
scookie = ";".join([c.split('=')[1] for c in scookie.split(";") if "sessionid" in c]).strip() # Extract session ID
except:
scookie = ""
page = request.REQUEST['page'] page = request.REQUEST['page']
with eventtracker.get_tracker().context('edx.course.browser', contexts.course_context_from_url(page)): with eventtracker.get_tracker().context('edx.course.browser', contexts.course_context_from_url(page)):
context = eventtracker.get_tracker().resolve_context()
event = { event = {
"username": username, "username": username,
"session": scookie, "session": context.get('session', ''),
"ip": _get_request_header(request, 'REMOTE_ADDR'), "ip": _get_request_header(request, 'REMOTE_ADDR'),
"event_source": "browser", "event_source": "browser",
"event_type": request.REQUEST['event_type'], "event_type": request.REQUEST['event_type'],
...@@ -61,7 +56,7 @@ def user_track(request): ...@@ -61,7 +56,7 @@ def user_track(request):
"page": page, "page": page,
"time": datetime.datetime.utcnow(), "time": datetime.datetime.utcnow(),
"host": _get_request_header(request, 'SERVER_NAME'), "host": _get_request_header(request, 'SERVER_NAME'),
"context": eventtracker.get_tracker().resolve_context(), "context": context,
} }
log_event(event) log_event(event)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment