Skip to content

🔒 [security fix] Mitigate XSS via Unescaped Set/Song Rendering #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julesklord wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🔒 [security fix] Mitigate XSS via Unescaped Set/Song Rendering #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ function updateModelSelector() {
localStorage.setItem('fmg-ai-model', selectedModel);
}
modelSelect.innerHTML = providerModels.map(m =>
`<option value="${m.id}" ${m.id === selectedModel ? 'selected' : ''}>${m.name}</option>`
`<option value="${esc(m.id)}" ${m.id === selectedModel ? 'selected' : ''}>${esc(m.name)}</option>`
).join('');
}

Expand Down Expand Up @@ -529,9 +529,9 @@ function renderSets(){
card.className='set-card';
card.innerHTML=`
<div class="set-hdr">
<span class="set-hdr-title">Set ${si+1}</span>
<span class="set-hdr-meta">${songs.length} songs · ~${durMin(songs)} min</span>
<div class="ebar"><div class="ebar-fill" style="width:${ep}%"></div></div>
<span class="set-hdr-title">Set ${esc(si+1)}</span>
<span class="set-hdr-meta">${esc(songs.length)} songs · ~${esc(durMin(songs))} min</span>
<div class="ebar"><div class="ebar-fill" style="width:${esc(ep)}%"></div></div>
</div>
<div id="ss-${esc(si)}">${songs.map((s,i)=>sRow(s,i,si)).join('')}</div>
<div class="add-row">
Expand All @@ -552,7 +552,7 @@ function sRow(s,i,si){
const noteIndicator = s.note ? '<span style="color:var(--gold);font-size:11px;">✎</span>' : '';
return `<div class="song-row" draggable="true" data-id="${esc(s.id)}" data-si="${esc(si)}">
<span class="dh">⠿</span>
<span class="snum">${i+1}</span>
<span class="snum">${esc(i+1)}</span>
<div class="sinfo">
<div class="stitle">${mpIcon}${esc(s.title)}</div>
<div class="sartist">${esc(s.artist)}</div>
Expand Down Expand Up @@ -781,7 +781,7 @@ function renderShows(){
return `<div class="show-card">
<div class="show-card-info">
<div class="show-card-title">${esc(n.title)}</div>
<div class="show-card-meta">${date ? esc(date)+' · ' : ''}${setCount} sets · ${songCount} songs</div>
<div class="show-card-meta">${date ? esc(date)+' · ' : ''}${esc(setCount)} sets · ${esc(songCount)} songs</div>
</div>
<div class="show-card-actions">
<button class="btn-xs" onclick="loadNight(${esc(n.id)})">Load</button>
Expand Down Expand Up @@ -814,7 +814,7 @@ function renderPool(){
document.getElementById('pool-tbody').innerHTML=s.map((x,i)=>{
const gClass=esc(x.genre==='R&B'?'RnB':x.genre);
return `<tr>
<td style="color:var(--text3);font-family:var(--font-mono);font-size:10px;">${i+1}</td>
<td style="color:var(--text3);font-family:var(--font-mono);font-size:10px;">${esc(i+1)}</td>
<td class="pt">${esc(x.title)}</td><td class="pa">${esc(x.artist)}</td>
<td><span class="sbadge b${gClass}">${esc(x.genre)}</span></td>
<td class="pk">${esc(x.key)}</td><td class="pb">${esc(x.bpm)}</td><td class="pe">${esc(x.effort||2)}</td><td class="pp">${esc(x.prog)}</td>
Expand Down Expand Up @@ -1128,13 +1128,13 @@ function renderExport(){
const title=document.getElementById('night-title').value||'Setlist';
const date=new Date().toLocaleDateString('en-US',{weekday:'long',year:'numeric',month:'long',day:'numeric'});
const iNames=instrs.map(i=>INSTR_DISPLAY_NAMES[i]||i).join(', ');
let html=`<div class="exp-night">${esc(title)}</div><div class="exp-meta">${esc(date)} &nbsp;·&nbsp; ${esc(iNames)} &nbsp;·&nbsp; ${numSets} sets</div>`;
let html=`<div class="exp-night">${esc(title)}</div><div class="exp-meta">${esc(date)} &nbsp;·&nbsp; ${esc(iNames)} &nbsp;·&nbsp; ${esc(numSets)} sets</div>`;
sets.forEach((songs,si)=>{
html+=`<div class="exp-set"><div class="exp-set-title">Set ${si+1} — ${songs.length} songs · ~${durMin(songs)} min</div>
html+=`<div class="exp-set"><div class="exp-set-title">Set ${esc(si+1)} — ${esc(songs.length)} songs · ~${esc(durMin(songs))} min</div>
${songs.map((s,i)=>{
const mp = mustPlay.has(s.id) ? '<span style="color:var(--gold);margin-right:3px;font-size:9px;">⚑</span>' : '';
const note = s.note ? `<div class="exp-note">${esc(s.note)}</div>` : '';
return `<div class="exp-row"><span class="en">${i+1}</span><span class="et">${mp}${esc(s.title)}</span><span class="ea">${esc(s.artist)}</span><span class="ek">${esc(s.key)}</span><span class="eb">${esc(s.bpm)}</span></div>${note}`;
return `<div class="exp-row"><span class="en">${esc(i+1)}</span><span class="et">${mp}${esc(s.title)}</span><span class="ea">${esc(s.artist)}</span><span class="ek">${esc(s.key)}</span><span class="eb">${esc(s.bpm)}</span></div>${note}`;
}).join('')}
</div>`;
});
Expand All @@ -1146,11 +1146,11 @@ function doExportHTML(){
const iNames=instrs.map(i=>INSTR_DISPLAY_NAMES[i]||i).join(', ');
let rows='';
sets.forEach((songs,si)=>{
rows+=`<div class="st">Set ${si+1} — ${songs.length} songs · ~${durMin(songs)} min</div>`;
rows+=`<div class="st">Set ${esc(si+1)} — ${esc(songs.length)} songs · ~${esc(durMin(songs))} min</div>`;
songs.forEach((s,idx)=>{
const note = s.note ? `<div class="note">${esc(s.note)}</div>` : '';
const mp = mustPlay.has(s.id) ? '<span class="mp">⚑</span>' : '';
rows+=`<div class="r"><span class="n">${idx+1}</span><span class="t">${mp}${esc(s.title)}</span><span class="a">${esc(s.artist)}</span><span class="k">${esc(s.key)}</span><span class="bpm">${esc(s.bpm)}</span></div>${note}`;
rows+=`<div class="r"><span class="n">${esc(idx+1)}</span><span class="t">${mp}${esc(s.title)}</span><span class="a">${esc(s.artist)}</span><span class="k">${esc(s.key)}</span><span class="bpm">${esc(s.bpm)}</span></div>${note}`;
});
});
const c=`<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>${esc(title)} — FMG</title>
Expand Down Expand Up @@ -1191,12 +1191,12 @@ function doExportPDF(){
if(!w){toast('Pop-up blocked — allow pop-ups for PDF');return;}
let rows='';
sets.forEach((songs,si)=>{
rows+=`<div class="st">Set ${si+1} &nbsp;·&nbsp; ${songs.length} songs &nbsp;·&nbsp; ~${durMin(songs)} min</div>`;
rows+=`<div class="st">Set ${esc(si+1)} &nbsp;·&nbsp; ${esc(songs.length)} songs &nbsp;·&nbsp; ~${esc(durMin(songs))} min</div>`;
songs.forEach((s,idx)=>{
const note = s.note ? `<div class="note">${esc(s.note)}</div>` : '';
const mp = mustPlay.has(s.id) ? '<span class="mp">⚑</span> ' : '';
rows+=`<div class="r">
<span class="n">${idx+1}</span>
<span class="n">${esc(idx+1)}</span>
<span class="t">${mp}${esc(s.title)}</span>
<span class="a">${esc(s.artist)}</span>
<span class="k">${esc(s.key)}</span>
Expand Down
Loading