From 99802bc143354f5c0cae51607b714daba5c92c7e Mon Sep 17 00:00:00 2001
From: HarHarLinks <kim.brose@rwth-aachen.de>
Date: Sun, 30 Jan 2022 17:44:22 +0100
Subject: [PATCH] escape hookshot variables using to_json

---
 .../templates/config.yml.j2                    | 18 +++++++++---------
 .../templates/registration.yml.j2              |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/roles/matrix-bridge-hookshot/templates/config.yml.j2 b/roles/matrix-bridge-hookshot/templates/config.yml.j2
index 8be3b1d6d..ce979b06d 100644
--- a/roles/matrix-bridge-hookshot/templates/config.yml.j2
+++ b/roles/matrix-bridge-hookshot/templates/config.yml.j2
@@ -19,13 +19,13 @@ github:
   webhook:
     # Webhook settings for the GitHub app.
     #
-    secret: {{ matrix_hookshot_github_secret }}
+    secret: {{ matrix_hookshot_github_secret|to_json }}
 {% if matrix_hookshot_github_oauth_enabled %}
   oauth:
     # (Optional) Settings for allowing users to sign in via OAuth.
     #
     client_id: {{ matrix_hookshot_github_oauth_id }}
-    client_secret: {{ matrix_hookshot_github_oauth_secret }}
+    client_secret: {{ matrix_hookshot_github_oauth_secret|to_json }}
     redirect_uri: {{ matrix_hookshot_github_oauth_uri }}
 {% endif %}
   defaultOptions:
@@ -45,18 +45,18 @@ gitlab:
   instances:
     {{ matrix_hookshot_gitlab_instances }}
   webhook:
-    secret: {{ matrix_hookshot_gitlab_secret }}
+    secret: {{ matrix_hookshot_gitlab_secret|to_json }}
 {% endif %}
 {% if matrix_hookshot_jira_enabled %}
 jira:
   # (Optional) Configure this to enable Jira support
   #
   webhook:
-    secret: {{ matrix_hookshot_jira_secret }}
+    secret: {{ matrix_hookshot_jira_secret|to_json }}
 {% if matrix_hookshot_jira_oauth_enabled %}
   oauth:
-    client_id: {{ matrix_hookshot_jira_oauth_id }}
-    client_secret: {{ matrix_hookshot_jira_oauth_secret }}
+    client_id: {{ matrix_hookshot_jira_oauth_id|to_json }}
+    client_secret: {{ matrix_hookshot_jira_oauth_secret|to_json }}
     redirect_uri: {{ matrix_hookshot_jira_oauth_uri }}
 {% endif %}
 {% endif %}
@@ -67,7 +67,7 @@ generic:
   enabled: {{ matrix_hookshot_generic_enabled }}
   urlPrefix: {{ matrix_hookshot_generic_urlprefix }}
   allowJsTransformationFunctions: {{ matrix_hookshot_generic_allow_js_transformation_functions }}
-  userIdPrefix: {{ matrix_hookshot_generic_user_id_prefix }}
+  userIdPrefix: {{ matrix_hookshot_generic_user_id_prefix|to_json }}
 {% endif %}
 {% if matrix_hookshot_figma_enabled %}
 figma:
@@ -80,7 +80,7 @@ figma:
 provisioning:
   # (Optional) Provisioning API for integration managers
   #
-  secret: {{ matrix_hookshot_provisioning_secret }}
+  secret: {{ matrix_hookshot_provisioning_secret|to_json }}
 {% endif %}
 passFile:
   # A passkey used to encrypt tokens stored inside the bridge.
@@ -90,7 +90,7 @@ passFile:
 bot:
   # (Optional) Define profile information for the bot user
   #
-  displayname: {{ matrix_hookshot_bot_displayname }}
+  displayname: {{ matrix_hookshot_bot_displayname|to_json }}
   avatar: {{ matrix_hookshot_bot_avatar }}
 metrics:
   # (Optional) Prometheus metrics support
diff --git a/roles/matrix-bridge-hookshot/templates/registration.yml.j2 b/roles/matrix-bridge-hookshot/templates/registration.yml.j2
index e86426c80..ced3bd77e 100644
--- a/roles/matrix-bridge-hookshot/templates/registration.yml.j2
+++ b/roles/matrix-bridge-hookshot/templates/registration.yml.j2
@@ -1,7 +1,7 @@
 #jinja2: lstrip_blocks: "True"
 id: matrix-hookshot # This can be anything, but must be unique within your homeserver
-as_token: {{ matrix_hookshot_appservice_token }} # This again can be a random string
-hs_token: {{ matrix_hookshot_homeserver_token }} # ..as can this
+as_token: {{ matrix_hookshot_appservice_token|to_json }} # This again can be a random string
+hs_token: {{ matrix_hookshot_homeserver_token|to_json }} # ..as can this
 namespaces:
   rooms: []
   users: