Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensuring that private keys are retrieved correctly under python3. (#422)

This commit is contained in:
kevgliss 2016-09-07 12:34:50 -07:00 committed by GitHub
parent ca2944d566
commit 76cece7b90
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lemur/utils.py
View File

@ -7,7 +7,6 @@
""" """
import os import os
import sys import sys
import six
from flask import current_app from flask import current_app
from cryptography.fernet import Fernet, MultiFernet from cryptography.fernet import Fernet, MultiFernet
import sqlalchemy.types as types import sqlalchemy.types as types
@ -98,16 +97,13 @@ class Vault(types.TypeDecorator):
# keys that have been base64 encoded). # keys that have been base64 encoded).
self.keys = [Fernet(key) for key in get_keys()] self.keys = [Fernet(key) for key in get_keys()]
# we only support strings and they should be of type bytes for Fernet if not value:
if not isinstance(value, six.string_types):
return return
if sys.version_info >= (3, 0): # we only support strings and they should be of type bytes for Fernet
value = bytes(value, 'utf8') if sys.version_info[0] >= 3:
else:
value = bytes(value)
return MultiFernet(self.keys).encrypt(value) return MultiFernet(self.keys).encrypt(value)
return MultiFernet(self.keys).encrypt(bytes(value))
def process_result_value(self, value, dialect): def process_result_value(self, value, dialect):
""" """
@ -122,12 +118,9 @@ class Vault(types.TypeDecorator):
# if the value is not a string we aren't going to try to decrypt # if the value is not a string we aren't going to try to decrypt
# it. this is for the case where the column is null # it. this is for the case where the column is null
if not sys.version_info >= (3, 0):
if not isinstance(value, six.string_types):
return
return MultiFernet(self.keys).decrypt(value)
else:
if not value: if not value:
return return
if sys.version_info[0] >= 3:
return str(MultiFernet(self.keys).decrypt(value), 'utf8') return str(MultiFernet(self.keys).decrypt(value), 'utf8')
return MultiFernet(self.keys).decrypt(value)