Switch to relying on the configuration key in the configuration file

This commit is contained in:
kevgliss
2015-08-08 16:12:29 -07:00
parent 3ebbbd21e7
commit 32ef793c4d
3 changed files with 26 additions and 16 deletions

View File

@ -5,19 +5,17 @@
:license: Apache, see LICENSE for more details.
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
"""
import os
import datetime
from flask import current_app
from cryptography import x509
from cryptography.hazmat.backends import default_backend
from flask import current_app
from sqlalchemy.orm import relationship
from sqlalchemy import event, Integer, ForeignKey, String, DateTime, PassiveDefault, func, Column, Text, Boolean
from sqlalchemy_utils import EncryptedType
from lemur.utils import get_key
from lemur.database import db
from lemur.plugins.base import plugins
@ -211,7 +209,7 @@ class Certificate(db.Model):
id = Column(Integer, primary_key=True)
owner = Column(String(128))
body = Column(Text())
private_key = Column(EncryptedType(String, os.environ.get('LEMUR_ENCRYPTION_KEY')))
private_key = Column(EncryptedType(String, get_key))
status = Column(String(128))
deleted = Column(Boolean, index=True)
name = Column(String(128))