Encryption tweaks

TiDeane · Aug 28, 2015 · 7dfbde1 · 7dfbde1
1 parent 4b20b3d
commit 7dfbde1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/airflow/models.py b/airflow/models.py
@@ -38,9 +38,11 @@
 DAGS_FOLDER = os.path.expanduser(conf.get('core', 'DAGS_FOLDER'))
 XCOM_RETURN_KEY = 'return_value'
 
+ENCRYPTION_ON = False
 try:
     from cryptography.fernet import Fernet
     FERNET = Fernet(conf.get('core', 'FERNET_KEY'))
+    ENCRYPTION_ON = True
 except:
     pass
 
@@ -328,6 +330,9 @@ def __init__(
 
     def get_password(self):
         if self._password and self.is_encrypted:
+            if not ENCRYPTION_ON:
+                raise AirflowException(
+                    "Can't decrypt, configuration is missing")
             return FERNET.decrypt(bytes(self._password, 'utf-8'))
         else:
             return self._password

diff --git a/airflow/www/app.py b/airflow/www/app.py
@@ -1641,7 +1641,7 @@ class ConnectionModelView(wwwutils.SuperUserMixin, AirflowModelView):
     verbose_name = "Connection"
     verbose_name_plural = "Connections"
     column_default_sort = ('conn_id', False)
-    column_list = ('conn_id', 'conn_type', 'host', 'port')
+    column_list = ('conn_id', 'conn_type', 'host', 'port', 'is_encrypted')
     form_overrides = dict(_password=VisiblePasswordField)
     form_widget_args = {
         'is_encrypted': {'disabled': True},