Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions lms/djangoapps/courseware/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
from django.contrib.auth.models import User
from django.test.client import RequestFactory
from django.conf import settings
from django.core.urlresolvers import reverse

from student.models import CourseEnrollment
from student.tests.factories import AdminFactory
from xmodule.modulestore.django import modulestore

import courseware.views as views
Expand Down Expand Up @@ -148,3 +150,26 @@ def test_chat_settings(self):
# generate/store a real password.
self.assertEquals(chat_settings['password'], "johndoe@%s" % domain)

def test_submission_history_xss(self):
# log into a staff account
admin = AdminFactory()

self.client.login(username=admin.username, password='test')

# try it with an existing user and a malicious location
url = reverse('submission_history', kwargs={
'course_id': self.course_id,
'student_username': 'dummy',
'location': '<script>alert("hello");</script>'
})
response = self.client.get(url)
self.assertFalse('<script>' in response.content)

# try it with a malicious user and a non-existent location
url = reverse('submission_history', kwargs={
'course_id': self.course_id,
'student_username': '<script>alert("hello");</script>',
'location': 'dummy'
})
response = self.client.get(url)
self.assertFalse('<script>' in response.content)
12 changes: 5 additions & 7 deletions lms/djangoapps/courseware/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from mitxmako.shortcuts import render_to_response, render_to_string
from django_future.csrf import ensure_csrf_cookie
from django.views.decorators.cache import cache_control
from markupsafe import escape

from courseware import grades
from courseware.access import has_access
Expand Down Expand Up @@ -752,19 +753,16 @@ def submission_history(request, course_id, student_username, location):
module_state_key=location,
student_id=student.id)
except User.DoesNotExist:
return HttpResponse("User {0} does not exist.".format(student_username))
return HttpResponse(escape("User {0} does not exist.".format(student_username)))
except StudentModule.DoesNotExist:
return HttpResponse("{0} has never accessed problem {1}"
.format(student_username, location))
return HttpResponse(escape("{0} has never accessed problem {1}".format(student_username, location)))

history_entries = StudentModuleHistory.objects \
.filter(student_module=student_module).order_by('-id')
history_entries = StudentModuleHistory.objects.filter(student_module=student_module).order_by('-id')

# If no history records exist, let's force a save to get history started.
if not history_entries:
student_module.save()
history_entries = StudentModuleHistory.objects \
.filter(student_module=student_module).order_by('-id')
history_entries = StudentModuleHistory.objects.filter(student_module=student_module).order_by('-id')

context = {
'history_entries': history_entries,
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/courseware/submission_history.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% import json %>
<h3>${username} > ${course_id} > ${location}</h3>
<h3>${username | h} > ${course_id | h} > ${location | h}</h3>

% for i, entry in enumerate(history_entries):
<hr/>
Expand Down