From ff09d6ed60998e31f8baf0846b9bdd31282979ed Mon Sep 17 00:00:00 2001 From: tanaka takashi Date: Sat, 27 Jun 2026 15:07:55 +0900 Subject: CSPによるインラインJavascriptの実行ブロックの不具合を修正。 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ollama_web/static/i18n.js | 25 ++++++++++++++++++++++--- src/ollama_web/templates/index.html | 6 ++---- src/ollama_web/templates/login.html | 4 +--- 3 files changed, 25 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/ollama_web/static/i18n.js b/src/ollama_web/static/i18n.js index 985b452..7f8d013 100644 --- a/src/ollama_web/static/i18n.js +++ b/src/ollama_web/static/i18n.js @@ -1,17 +1,35 @@ /** Small i18n helper for the browser. * - * The server injects ``window.I18N`` as a nested message object. This module - * exposes ``t(key, fallback)`` to resolve dot-separated keys safely. + * The server stores the nested message object as JSON in a non-executable + * meta element. This module parses it and exposes ``t(key, fallback)`` to + * resolve dot-separated keys safely without requiring inline JavaScript. */ (function () { "use strict"; + const dataEl = document.querySelector('meta[name="ollama-web-i18n"]'); + let messages = {}; + + if (!dataEl) { + console.error('i18n data element "ollama-web-i18n" was not found'); + } else { + try { + const parsed = JSON.parse(dataEl.getAttribute("content") || ""); + if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) { + throw new TypeError("i18n data must be a JSON object"); + } + messages = parsed; + } catch (err) { + console.error("failed to parse i18n data", err); + } + } + function t(key, fallback) { if (typeof key !== "string") { return fallback !== undefined ? fallback : String(key); } const parts = key.split("."); - let current = window.I18N; + let current = messages; for (const part of parts) { if (current == null || typeof current !== "object" || !(part in current)) { return fallback !== undefined ? fallback : key; @@ -24,5 +42,6 @@ return fallback !== undefined ? fallback : key; } + window.I18N = messages; window.t = t; })(); diff --git a/src/ollama_web/templates/index.html b/src/ollama_web/templates/index.html index 11457e8..df877fa 100644 --- a/src/ollama_web/templates/index.html +++ b/src/ollama_web/templates/index.html @@ -11,9 +11,7 @@ - + @@ -89,4 +87,4 @@ - \ No newline at end of file + diff --git a/src/ollama_web/templates/login.html b/src/ollama_web/templates/login.html index 128c842..263afe7 100644 --- a/src/ollama_web/templates/login.html +++ b/src/ollama_web/templates/login.html @@ -5,9 +5,7 @@ ollama-web login - + -- cgit v1.2.3