fix: stray } in message row HTML + JS-escape login locale strings
Agent review findings from PR #179: 1. static/ui.js line 542: extra } in ternary produced malformed HTML in message bubble div (''}} instead of ''}). Caused a literal } character to appear in the DOM. 2. api/routes.py: LOGIN_INVALID_PW and LOGIN_CONN_FAILED were inserted into JS string context without JS-string escaping. Added backslash escaping for ' and \ characters. Currently safe because locale values are hardcoded, but this prevents breakage if custom locale strings contain single quotes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -166,8 +166,8 @@ def handle_get(handler, parsed) -> bool:
|
|||||||
.replace('{{LOGIN_SUBTITLE}}', _html.escape(_login_strings['subtitle']))
|
.replace('{{LOGIN_SUBTITLE}}', _html.escape(_login_strings['subtitle']))
|
||||||
.replace('{{LOGIN_PLACEHOLDER}}', _html.escape(_login_strings['placeholder']))
|
.replace('{{LOGIN_PLACEHOLDER}}', _html.escape(_login_strings['placeholder']))
|
||||||
.replace('{{LOGIN_BTN}}', _html.escape(_login_strings['btn']))
|
.replace('{{LOGIN_BTN}}', _html.escape(_login_strings['btn']))
|
||||||
.replace('{{LOGIN_INVALID_PW}}', _login_strings['invalid_pw']) # JS string, escape carefully
|
.replace('{{LOGIN_INVALID_PW}}', _login_strings['invalid_pw'].replace('\\','\\\\').replace("'","\\'"))
|
||||||
.replace('{{LOGIN_CONN_FAILED}}', _login_strings['conn_failed'])
|
.replace('{{LOGIN_CONN_FAILED}}', _login_strings['conn_failed'].replace('\\','\\\\').replace("'","\\'"))
|
||||||
)
|
)
|
||||||
return t(handler, _page, content_type='text/html; charset=utf-8')
|
return t(handler, _page, content_type='text/html; charset=utf-8')
|
||||||
|
|
||||||
|
|||||||
@@ -539,7 +539,7 @@ function renderMessages(){
|
|||||||
const tsVal=m._ts||m.timestamp;
|
const tsVal=m._ts||m.timestamp;
|
||||||
const tsTitle=tsVal?new Date(tsVal*1000).toLocaleString():'';
|
const tsTitle=tsVal?new Date(tsVal*1000).toLocaleString():'';
|
||||||
const _bn=window._botName||'Hermes';
|
const _bn=window._botName||'Hermes';
|
||||||
row.innerHTML=`<div class="msg-role ${m.role}" ${tsTitle?`title="${esc(tsTitle)}"`:''}}><div class="role-icon ${m.role}">${isUser?'Y':esc(_bn.charAt(0).toUpperCase())}</div><span style="font-size:12px">${isUser?t('you'):esc(_bn)}</span>${tsTitle?`<span class="msg-time">${new Date(tsVal*1000).toLocaleTimeString([],{hour:'2-digit',minute:'2-digit'})}</span>`:''}<span class="msg-actions">${editBtn}<button class="msg-copy-btn msg-action-btn" title="${t('copy')}" onclick="copyMsg(this)">📋</button>${retryBtn}</span></div>${filesHtml}<div class="msg-body">${bodyHtml}</div>`;
|
row.innerHTML=`<div class="msg-role ${m.role}" ${tsTitle?`title="${esc(tsTitle)}"`:''}><div class="role-icon ${m.role}">${isUser?'Y':esc(_bn.charAt(0).toUpperCase())}</div><span style="font-size:12px">${isUser?t('you'):esc(_bn)}</span>${tsTitle?`<span class="msg-time">${new Date(tsVal*1000).toLocaleTimeString([],{hour:'2-digit',minute:'2-digit'})}</span>`:''}<span class="msg-actions">${editBtn}<button class="msg-copy-btn msg-action-btn" title="${t('copy')}" onclick="copyMsg(this)">📋</button>${retryBtn}</span></div>${filesHtml}<div class="msg-body">${bodyHtml}</div>`;
|
||||||
row.dataset.rawText = String(content).trim();
|
row.dataset.rawText = String(content).trim();
|
||||||
inner.appendChild(row);
|
inner.appendChild(row);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user