External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5910 from wenottingham/fipsing-the-bird

Browse Source 
Use sha1 with hmac.new instead of md5
This commit is contained in:
Bill Nottingham
2017-03-30 11:00:30 -04:00
committed by GitHub
parent 94a7cf0858 a15b67f76b
commit 7dda6106d1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/ad_hoc_commands.py
View File

@@ -3,6 +3,7 @@
# Python
import datetime
import hashlib
import hmac
import logging
from urlparse import urljoin
@@ -152,7 +153,7 @@ class AdHocCommand(UnifiedJob, JobNotificationMixin):
def task_auth_token(self):
'''Return temporary auth token used for task requests via API.'''
if self.status == 'running':
h = hmac.new(settings.SECRET_KEY, self.created.isoformat())
h = hmac.new(settings.SECRET_KEY, self.created.isoformat(), digestmod=hashlib.sha1)
return '%d-%s' % (self.pk, h.hexdigest())
@property

3
awx/main/models/jobs.py
View File

@@ -3,6 +3,7 @@
# Python
import datetime
import hashlib
import hmac
import logging
import time
@@ -480,7 +481,7 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin):
def task_auth_token(self):
'''Return temporary auth token used for task requests via API.'''
if self.status == 'running':
h = hmac.new(settings.SECRET_KEY, self.created.isoformat())
h = hmac.new(settings.SECRET_KEY, self.created.isoformat(), digestmod=hashlib.sha1)
return '%d-%s' % (self.pk, h.hexdigest())
@property