NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Base64 decoding tweaks

Browse Source
This commit is contained in:
Jeremy Stretch 2017-03-29 13:39:59 -04:00
parent 58e4bf1cc3
commit 6542b8b198
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/secrets/api/views.py
View File

@ -184,9 +184,7 @@ class GetSessionKeyViewSet(ViewSet):
key = sk.key key = sk.key
# Encode the key using base64. (b64decode() returns a bytestring under Python 3.) # Encode the key using base64. (b64decode() returns a bytestring under Python 3.)
encoded_key = base64.b64encode(key) encoded_key = base64.b64encode(key).decode()
if not isinstance(encoded_key, str):
encoded_key = encoded_key.decode()
# Craft the response # Craft the response
response = Response({ response = Response({

6
netbox/secrets/tests/test_api.py
View File

@ -247,6 +247,8 @@ class GetSessionKeyTest(HttpStatusMixin, APITestCase):
def test_get_session_key(self): def test_get_session_key(self):
encoded_session_key = base64.b64encode(self.session_key.key).decode()
url = reverse('secrets-api:get-session-key-list') url = reverse('secrets-api:get-session-key-list')
data = { data = {
'private_key': PRIVATE_KEY, 'private_key': PRIVATE_KEY,
@ -255,11 +257,11 @@ class GetSessionKeyTest(HttpStatusMixin, APITestCase):
self.assertHttpStatus(response, status.HTTP_200_OK) self.assertHttpStatus(response, status.HTTP_200_OK)
self.assertIsNotNone(response.data.get('session_key')) self.assertIsNotNone(response.data.get('session_key'))
self.assertNotEqual(response.data.get('session_key'), self.session_key.key) self.assertNotEqual(response.data.get('session_key'), encoded_session_key)
def test_get_session_key_preserved(self): def test_get_session_key_preserved(self):
encoded_session_key = base64.b64encode(self.session_key.key) encoded_session_key = base64.b64encode(self.session_key.key).decode()
url = reverse('secrets-api:get-session-key-list') + '?preserve_key=True' url = reverse('secrets-api:get-session-key-list') + '?preserve_key=True'
data = { data = {