[AIRFLOW-2938] Handle improperly formatted extra field in connection …

…gracefully (#3785)
apache · Aug 23, 2018 · fc10f7e · fc10f7e
1 parent c9fec7a
commit fc10f7e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/airflow/hooks/http_hook.py b/airflow/hooks/http_hook.py
@@ -70,7 +70,11 @@ def get_conn(self, headers=None):
         if conn.login:
             session.auth = (conn.login, conn.password)
         if conn.extra:
-            session.headers.update(conn.extra_dejson)
+            try:
+                session.headers.update(conn.extra_dejson)
+            except TypeError:
+                self.log.warn('Connection to {} has invalid extra field.'.format(
+                    conn.host))
         if headers:
             session.headers.update(headers)
 

diff --git a/airflow/www_rbac/views.py b/airflow/www_rbac/views.py
@@ -1922,6 +1922,11 @@ def prefill_form(self, form, pk):
         except Exception:
             d = {}
 
+        if not hasattr(d, 'get'):
+            logging.warning('extra field for {} is not iterable'.format(
+                form.data.get('conn_id', '<unknown>')))
+            return
+
         for field in self.extra_fields:
             value = d.get(field, '')
             if value: