Skip to content

adds a new option to ungenerated_certs to use http in the callback url #1565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jarv merged 2 commits into from
Nov 4, 2013
Merged

adds a new option to ungenerated_certs to use http in the callback url #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff8c58f
adds a new option to ungenerated_certs to use http in the callback url
jarv Nov 1, 2013
f0b074b
also adding insecure option to regenerate_user command
jarv Nov 1, 2013
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
7 changes: 7 additions & 0 deletions lms/djangoapps/certificates/management/commands/regenerate_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ class Command(BaseCommand):
dest='noop',
default=False,
help="Don't grade or add certificate requests to the queue"),
make_option('--insecure',
action='store_true',
dest='insecure',
default=False,
help="Don't use https for the callback url to the LMS, useful in http test environments"),
make_option('-c', '--course',
metavar='COURSE_ID',
dest='course',
Expand Down Expand Up @@ -52,6 +57,8 @@ def handle(self, *args, **options):
if not options['noop']:
# Add the certificate request to the queue
xq = XQueueCertInterface()
if options['insecure']:
xq.use_https = False
ret = xq.regen_cert(student, course_id, course=course)
print '{0} - {1}'.format(student, ret)
else:
Expand Down
7 changes: 7 additions & 0 deletions lms/djangoapps/certificates/management/commands/ungenerated_certs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ class Command(BaseCommand):
dest='noop',
default=False,
help="Don't add certificate requests to the queue"),
make_option('--insecure',
action='store_true',
dest='insecure',
default=False,
help="Don't use https for the callback url to the LMS, useful in http test environments"),
make_option('-c', '--course',
metavar='COURSE_ID',
dest='course',
Expand Down Expand Up @@ -83,6 +88,8 @@ def handle(self, *args, **options):
"groups").order_by('username')

xq = XQueueCertInterface()
if options['insecure']:
xq.use_https = False
total = enrolled_students.count()
count = 0
start = datetime.datetime.now(UTC)
Expand Down
10 changes: 8 additions & 2 deletions lms/djangoapps/certificates/queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def __init__(self, request=None):
)
self.whitelist = CertificateWhitelist.objects.all()
self.restricted = UserProfile.objects.filter(allow_certificate=False)
self.use_https = True

def regen_cert(self, student, course_id, course=None):
"""(Re-)Make certificate for a particular student in a particular course
Expand Down Expand Up @@ -216,9 +217,14 @@ def add_cert(self, student, course_id, course=None):

def _send_to_xqueue(self, contents, key):

if self.use_https:
proto = "https"
else:
proto = "http"

xheader = make_xheader(
'https://{0}/update_certificate?{1}'.format(
settings.SITE_NAME, key), key, settings.CERT_QUEUE)
'{0}://{1}/update_certificate?{2}'.format(
proto, settings.SITE_NAME, key), key, settings.CERT_QUEUE)

(error, msg) = self.xqueue_interface.send_to_queue(
header=xheader, body=json.dumps(contents))
Expand Down