From 084079f446570ba43114857ea1a54df896201419 Mon Sep 17 00:00:00 2001 From: Kanthi Date: Sat, 22 Jan 2022 18:09:51 -0500 Subject: [PATCH 1/2] Set X-Frame-Options header to DENY only if X_FRAME_ENABLED is set to true. (#19491) --- airflow/www/extensions/init_security.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/airflow/www/extensions/init_security.py b/airflow/www/extensions/init_security.py index 544deebeb3af4..2481a9605143e 100644 --- a/airflow/www/extensions/init_security.py +++ b/airflow/www/extensions/init_security.py @@ -35,7 +35,8 @@ def init_xframe_protection(app): return def apply_caching(response): - response.headers["X-Frame-Options"] = "DENY" + if not x_frame_enabled: + response.headers["X-Frame-Options"] = "DENY" return response app.after_request(apply_caching) From c5ffe0c2dac14b940b600acaccda3b387ca14a28 Mon Sep 17 00:00:00 2001 From: Ayush Chauhan <10010065+ayushchauhan0811@users.noreply.github.com> Date: Sun, 23 Jan 2022 06:27:05 +0530 Subject: [PATCH 2/2] fix: cloudwatch logs fetch logic (#20814) --- airflow/providers/amazon/aws/hooks/logs.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/airflow/providers/amazon/aws/hooks/logs.py b/airflow/providers/amazon/aws/hooks/logs.py index 05e49f1f9f181..1c5e5e62fb709 100644 --- a/airflow/providers/amazon/aws/hooks/logs.py +++ b/airflow/providers/amazon/aws/hooks/logs.py @@ -66,9 +66,7 @@ def get_log_events( | 'ingestionTime' (int): The time in milliseconds the event was ingested. """ next_token = None - - event_count = 1 - while event_count > 0: + while True: if next_token is not None: token_arg: Optional[Dict[str, str]] = {'nextToken': next_token} else: @@ -94,7 +92,7 @@ def get_log_events( yield from events - if 'nextForwardToken' in response: + if next_token != response['nextForwardToken']: next_token = response['nextForwardToken'] else: return