From 861ca553dfc614c7b3cf46089d619e8f7121f9c4 Mon Sep 17 00:00:00 2001 From: Soumik Majumder <33070011+100mik@users.noreply.github.com> Date: Tue, 23 Aug 2022 08:32:16 +0530 Subject: [PATCH] Add autoescape parameter to jinja environments (#15770) Signed-off-by: Soumik Majumder Signed-off-by: Soumik Majumder --- make/photon/prepare/migrations/version_1_10_0/__init__.py | 5 +++-- make/photon/prepare/migrations/version_1_9_0/__init__.py | 5 +++-- make/photon/prepare/migrations/version_2_0_0/__init__.py | 5 +++-- make/photon/prepare/migrations/version_2_1_0/__init__.py | 5 +++-- make/photon/prepare/migrations/version_2_2_0/__init__.py | 5 +++-- make/photon/prepare/migrations/version_2_3_0/__init__.py | 5 +++-- make/photon/prepare/migrations/version_2_4_0/__init__.py | 5 +++-- make/photon/prepare/utils/jinja.py | 4 ++-- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/make/photon/prepare/migrations/version_1_10_0/__init__.py b/make/photon/prepare/migrations/version_1_10_0/__init__.py index 84b89c0a1..045f0d326 100644 --- a/make/photon/prepare/migrations/version_1_10_0/__init__.py +++ b/make/photon/prepare/migrations/version_1_10_0/__init__.py @@ -1,5 +1,5 @@ import os -from jinja2 import Environment, FileSystemLoader, StrictUndefined +from jinja2 import Environment, FileSystemLoader, StrictUndefined, select_autoescape from utils.migration import read_conf revision = '1.10.0' @@ -13,7 +13,8 @@ def migrate(input_cfg, output_cfg): loader=FileSystemLoader(current_dir), undefined=StrictUndefined, trim_blocks=True, - lstrip_blocks=True + lstrip_blocks=True, + autoescape = select_autoescape() ).get_template('harbor.yml.jinja') with open(output_cfg, 'w') as f: diff --git a/make/photon/prepare/migrations/version_1_9_0/__init__.py b/make/photon/prepare/migrations/version_1_9_0/__init__.py index 1e9cdd61f..9d43db27f 100644 --- a/make/photon/prepare/migrations/version_1_9_0/__init__.py +++ b/make/photon/prepare/migrations/version_1_9_0/__init__.py @@ -1,5 +1,5 @@ import os -from jinja2 import Environment, FileSystemLoader, StrictUndefined +from jinja2 import Environment, FileSystemLoader, StrictUndefined, select_autoescape from utils.migration import read_conf revision = '1.9.0' @@ -13,7 +13,8 @@ def migrate(input_cfg, output_cfg): loader=FileSystemLoader(current_dir), undefined=StrictUndefined, trim_blocks=True, - lstrip_blocks=True + lstrip_blocks=True, + autoescape = select_autoescape() ).get_template('harbor.yml.jinja') with open(output_cfg, 'w') as f: diff --git a/make/photon/prepare/migrations/version_2_0_0/__init__.py b/make/photon/prepare/migrations/version_2_0_0/__init__.py index 9dd4c135d..aba64b417 100644 --- a/make/photon/prepare/migrations/version_2_0_0/__init__.py +++ b/make/photon/prepare/migrations/version_2_0_0/__init__.py @@ -1,5 +1,5 @@ import os -from jinja2 import Environment, FileSystemLoader, StrictUndefined +from jinja2 import Environment, FileSystemLoader, StrictUndefined, select_autoescape from utils.migration import read_conf revision = '2.0.0' @@ -13,7 +13,8 @@ def migrate(input_cfg, output_cfg): loader=FileSystemLoader(current_dir), undefined=StrictUndefined, trim_blocks=True, - lstrip_blocks=True + lstrip_blocks=True, + autoescape = select_autoescape() ).get_template('harbor.yml.jinja') with open(output_cfg, 'w') as f: diff --git a/make/photon/prepare/migrations/version_2_1_0/__init__.py b/make/photon/prepare/migrations/version_2_1_0/__init__.py index bb7e6b15c..5f67f9ead 100644 --- a/make/photon/prepare/migrations/version_2_1_0/__init__.py +++ b/make/photon/prepare/migrations/version_2_1_0/__init__.py @@ -1,5 +1,5 @@ import os -from jinja2 import Environment, FileSystemLoader, StrictUndefined +from jinja2 import Environment, FileSystemLoader, StrictUndefined, select_autoescape from utils.migration import read_conf revision = '2.1.0' @@ -18,7 +18,8 @@ def migrate(input_cfg, output_cfg): loader=FileSystemLoader(current_dir), undefined=StrictUndefined, trim_blocks=True, - lstrip_blocks=True + lstrip_blocks=True, + autoescape = select_autoescape() ).get_template('harbor.yml.jinja') config_dict = read_conf(input_cfg) diff --git a/make/photon/prepare/migrations/version_2_2_0/__init__.py b/make/photon/prepare/migrations/version_2_2_0/__init__.py index 6a3ef56e4..b10756a8c 100644 --- a/make/photon/prepare/migrations/version_2_2_0/__init__.py +++ b/make/photon/prepare/migrations/version_2_2_0/__init__.py @@ -1,5 +1,5 @@ import os -from jinja2 import Environment, FileSystemLoader, StrictUndefined +from jinja2 import Environment, FileSystemLoader, StrictUndefined, select_autoescape from utils.migration import read_conf revision = '2.2.0' @@ -11,7 +11,8 @@ def migrate(input_cfg, output_cfg): loader=FileSystemLoader(current_dir), undefined=StrictUndefined, trim_blocks=True, - lstrip_blocks=True + lstrip_blocks=True, + autoescape = select_autoescape() ).get_template('harbor.yml.jinja') config_dict = read_conf(input_cfg) diff --git a/make/photon/prepare/migrations/version_2_3_0/__init__.py b/make/photon/prepare/migrations/version_2_3_0/__init__.py index bc1fca19c..1ca5e2879 100644 --- a/make/photon/prepare/migrations/version_2_3_0/__init__.py +++ b/make/photon/prepare/migrations/version_2_3_0/__init__.py @@ -1,5 +1,5 @@ import os -from jinja2 import Environment, FileSystemLoader, StrictUndefined +from jinja2 import Environment, FileSystemLoader, StrictUndefined, select_autoescape from utils.migration import read_conf revision = '2.3.0' @@ -20,7 +20,8 @@ def migrate(input_cfg, output_cfg): loader=FileSystemLoader(current_dir), undefined=StrictUndefined, trim_blocks=True, - lstrip_blocks=True + lstrip_blocks=True, + autoescape = select_autoescape() ).get_template('harbor.yml.jinja') config_dict = read_conf(input_cfg) diff --git a/make/photon/prepare/migrations/version_2_4_0/__init__.py b/make/photon/prepare/migrations/version_2_4_0/__init__.py index 380c65b31..b946ef4ee 100644 --- a/make/photon/prepare/migrations/version_2_4_0/__init__.py +++ b/make/photon/prepare/migrations/version_2_4_0/__init__.py @@ -1,5 +1,5 @@ import os -from jinja2 import Environment, FileSystemLoader, StrictUndefined +from jinja2 import Environment, FileSystemLoader, StrictUndefined, select_autoescape from utils.migration import read_conf revision = '2.4.0' @@ -11,7 +11,8 @@ def migrate(input_cfg, output_cfg): loader=FileSystemLoader(current_dir), undefined=StrictUndefined, trim_blocks=True, - lstrip_blocks=True + lstrip_blocks=True, + autoescape = select_autoescape() ).get_template('harbor.yml.jinja') config_dict = read_conf(input_cfg) diff --git a/make/photon/prepare/utils/jinja.py b/make/photon/prepare/utils/jinja.py index 0a65382f7..824e76874 100644 --- a/make/photon/prepare/utils/jinja.py +++ b/make/photon/prepare/utils/jinja.py @@ -1,9 +1,9 @@ import json -from jinja2 import Environment, FileSystemLoader +from jinja2 import Environment, FileSystemLoader, select_autoescape from .misc import mark_file -jinja_env = Environment(loader=FileSystemLoader('/'), trim_blocks=True, lstrip_blocks=True) +jinja_env = Environment(loader=FileSystemLoader('/'), trim_blocks=True, lstrip_blocks=True, autoescape = select_autoescape()) def to_json(value): return json.dumps(value)