Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 1405eac

Browse files
committed
Do not render the template using jinja since there is nothing templated.
1 parent 6e8889d commit 1405eac

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

synapse/config/sso.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15+
import os
1516
from typing import Any, Dict
1617

1718
import pkg_resources
@@ -36,6 +37,12 @@ def read_config(self, config, **kwargs):
3637
template_dir = pkg_resources.resource_filename("synapse", "res/templates",)
3738

3839
self.sso_redirect_confirm_template_dir = template_dir
40+
self.sso_account_deactivated_template = self.read_file(
41+
os.path.join(
42+
self.sso_redirect_confirm_template_dir, "sso_account_deactivated.html"
43+
),
44+
"sso_account_deactivated_template",
45+
)
3946

4047
self.sso_client_whitelist = sso_config.get("client_whitelist") or []
4148

synapse/handlers/auth.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,9 @@ def __init__(self, hs):
161161
self._sso_auth_confirm_template = load_jinja2_templates(
162162
hs.config.sso_redirect_confirm_template_dir, ["sso_auth_confirm.html"],
163163
)[0]
164-
self._sso_account_deactivated_template = load_jinja2_templates(
165-
hs.config.sso_redirect_confirm_template_dir,
166-
["sso_account_deactivated.html"],
167-
)[0]
164+
self._sso_account_deactivated_template = (
165+
hs.config.sso_account_deactivated_template
166+
)
168167

169168
self._server_name = hs.config.server_name
170169

@@ -1118,7 +1117,7 @@ async def complete_sso_login(
11181117
# flow.
11191118
deactivated = await self.store.get_user_deactivated_status(registered_user_id)
11201119
if deactivated:
1121-
html = self._sso_account_deactivated_template.render().encode("utf-8")
1120+
html = self._sso_account_deactivated_template.encode("utf-8")
11221121

11231122
request.setResponseCode(403)
11241123
request.setHeader(b"Content-Type", b"text/html; charset=utf-8")

0 commit comments

Comments
 (0)