mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-16 03:09:33 +01:00
fix(files): the review's fixes for the Files panel delete
The fixes #529's review asked for, each with a test. - No inline handler. The button quoted the path inside onclick="...decodeURIComponent('<path>')", and encodeURIComponent leaves ' alone, so a file named x'-alert(1)-'.txt ran script in Codeman's origin and it's.txt was a syntax error. It is now bound in the existing .file-tree-item loops from the row's escaped data-path. - Symbolic links are refused, never followed. validateSessionFilePath() returns the realpath, so deleting AGENTS.md -> CLAUDE.md deleted CLAUDE.md and left the link dangling. The path as named is lstat'ed, a link answers 400, and the inode is compared again before the unlink. - The edit route's confinement whole: validateLocalSessionFilePath() behind withGuardedOutsideWorktree(), so an absolute path in a followed outside worktree obeys the same rules, and the sensitive, blocked and .git checks run on both the realpath and the path as named. - Adopted sessions are refused like remote ones (the /tmp exception of the older file surfaces is not copied to a new one); Docker workspaces are allowed, as on the edit route. The workspace is probed bounded first (#516). Errors are thrown with their status. - Deleting from search results re-runs the search, the row buttons stay visible on touch screens, the confirm and toasts have zh-CN text, and no button is drawn for remote or adopted sessions. - Docs: CLAUDE.md, architecture-invariants, api-reference and the Working With Files wiki page. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dfe1af2e5f
commit
078bd74bd1
12 files changed
+776
-37
No files matched your search
@@ -1688,6 +1688,11 @@
|
||||
// The file name is user text: it passes through untranslated.
|
||||
[/^Downloaded (.+) to Downloads$/, (_m, name) => `已将 ${name} 下载到“下载”文件夹`],
|
||||
[/^Download of (.+) failed$/, (_m, name) => `下载 ${name} 失败`],
|
||||
// The Files panel's delete button (panels-ui.js): the path is user text, and the server's
|
||||
// reason passes through untranslated.
|
||||
[/^Delete the file ([\s\S]+)\? This cannot be undone\.$/, (_m, path) => `删除文件 ${path}?此操作无法撤销。`],
|
||||
[/^File deleted: ([\s\S]+)$/, (_m, path) => `已删除文件:${path}`],
|
||||
[/^Delete failed: ([\s\S]+)$/, (_m, why) => `删除失败:${why}`],
|
||||
// Group names are user text: they pass through untranslated.
|
||||
[/^Move to "(.+)"$/, (_m, group) => `移到“${group}”`],
|
||||
// Session names are user text too.
|
||||
|
||||
+42
-10
@@ -3777,6 +3777,7 @@ Object.assign(CodemanApp.prototype, {
|
||||
}
|
||||
|
||||
const html = [];
|
||||
const canDelete = this._fileBrowserCanDelete(owner);
|
||||
|
||||
const renderNode = (node, depth) => {
|
||||
const isDir = node.type === 'directory';
|
||||
@@ -3799,8 +3800,12 @@ Object.assign(CodemanApp.prototype, {
|
||||
const downloadBtn = !isDir
|
||||
? `<a class="file-tree-download" href="${escapeHtml(CodemanBase.url(`/api/sessions/${encodeURIComponent(owner)}/file-raw?path=${encodeURIComponent(node.path)}&download=true`))}" title="Download" onclick="event.stopPropagation()">⬇</a>`
|
||||
: '';
|
||||
const deleteBtn = !isDir
|
||||
? `<button class="file-tree-delete" title="Delete" aria-label="Delete ${escapeHtml(node.name)}" onclick="event.stopPropagation(); app.deleteFileFromBrowser(decodeURIComponent('${encodeURIComponent(owner)}'), decodeURIComponent('${encodeURIComponent(node.path)}'))">×</button>`
|
||||
// No inline handler: the path is a workspace file name, which an agent or a cloned repo
|
||||
// chose, and `encodeURIComponent` leaves `'` alone, so a quoted string in an onclick ran
|
||||
// whatever a file name like `x'-alert(1)-'.txt` held (#529's review). The click is bound
|
||||
// below from the row's already-escaped `data-path`.
|
||||
const deleteBtn = !isDir && canDelete
|
||||
? `<button type="button" class="file-tree-delete" title="Delete" aria-label="Delete ${escapeHtml(node.name)}">×</button>`
|
||||
: '';
|
||||
|
||||
html.push(`
|
||||
@@ -3846,9 +3851,21 @@ Object.assign(CodemanApp.prototype, {
|
||||
this.openFilePreview(path, owner);
|
||||
}
|
||||
});
|
||||
item.querySelector('.file-tree-delete')?.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
this.deleteFileFromBrowser(owner, item.dataset.path);
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
// The delete button is offered only where the route can act: never for a remote (SSH) session,
|
||||
// whose files live on another host, nor for an adopted one, whose folder is not a workspace of
|
||||
// ours (`session.remote` is undefined on an adopted session, so both are tested).
|
||||
_fileBrowserCanDelete(sessionId) {
|
||||
const session = this.sessions?.get?.(sessionId);
|
||||
return !session?.remote && !session?.adopt;
|
||||
},
|
||||
|
||||
toggleFileBrowserFolder(path) {
|
||||
if (this.fileBrowserExpandedDirs.has(path)) {
|
||||
this.fileBrowserExpandedDirs.delete(path);
|
||||
@@ -3974,6 +3991,7 @@ Object.assign(CodemanApp.prototype, {
|
||||
treeEl.innerHTML = `<div class="file-browser-empty">${escapeHtml('No matches')}</div>`;
|
||||
} else {
|
||||
const ownerPath = encodeURIComponent(ownerSessionId);
|
||||
const canDelete = this._fileBrowserCanDelete(ownerSessionId);
|
||||
treeEl.innerHTML = matches
|
||||
.map(match => {
|
||||
const isDir = match.type === 'directory';
|
||||
@@ -3985,8 +4003,9 @@ Object.assign(CodemanApp.prototype, {
|
||||
const downloadBtn = !isDir
|
||||
? `<a class="file-tree-download" href="${escapeHtml(CodemanBase.url(`/api/sessions/${ownerPath}/file-raw?path=${encodeURIComponent(match.path)}&download=true`))}" title="Download" onclick="event.stopPropagation()">⬇</a>`
|
||||
: '';
|
||||
const deleteBtn = !isDir
|
||||
? `<button class="file-tree-delete" title="Delete" aria-label="Delete ${escapeHtml(match.name)}" onclick="event.stopPropagation(); app.deleteFileFromBrowser(decodeURIComponent('${encodeURIComponent(ownerSessionId)}'), decodeURIComponent('${encodeURIComponent(match.path)}'))">×</button>`
|
||||
// Bound below from `data-path`, never an inline handler (see renderFileBrowserTree).
|
||||
const deleteBtn = !isDir && canDelete
|
||||
? `<button type="button" class="file-tree-delete" title="Delete" aria-label="Delete ${escapeHtml(match.name)}">×</button>`
|
||||
: '';
|
||||
return `
|
||||
<div class="file-tree-item" data-path="${escapeHtml(match.path)}" data-type="${escapeHtml(match.type)}" data-owner="${escapeHtml(ownerSessionId)}">
|
||||
@@ -4011,6 +4030,10 @@ Object.assign(CodemanApp.prototype, {
|
||||
this.openFilePreview(path, ownerSessionId);
|
||||
}
|
||||
});
|
||||
item.querySelector('.file-tree-delete')?.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
this.deleteFileFromBrowser(ownerSessionId, item.dataset.path);
|
||||
});
|
||||
});
|
||||
|
||||
const statusEl = this.$('fileBrowserStatus');
|
||||
@@ -4020,22 +4043,31 @@ Object.assign(CodemanApp.prototype, {
|
||||
}
|
||||
},
|
||||
|
||||
// The Files panel's delete button (DELETE .../files?path=): asks first, in the same native
|
||||
// dialog the panel's other destructive actions use, then reloads the listing. With a search in
|
||||
// the box the reload re-runs it, so the deleted row leaves the results too; a plain reload
|
||||
// would refresh the tree behind them and leave the row on screen.
|
||||
async deleteFileFromBrowser(sessionId, filePath) {
|
||||
if (!sessionId || !filePath) return;
|
||||
if (!window.confirm(`Delete ${filePath}?`)) return;
|
||||
if (!confirm(`Delete the file ${filePath}? This cannot be undone.`)) return;
|
||||
let result = null;
|
||||
try {
|
||||
const response = await fetch(
|
||||
`/api/sessions/${encodeURIComponent(sessionId)}/files?path=${encodeURIComponent(filePath)}`,
|
||||
{ method: 'DELETE' },
|
||||
);
|
||||
const result = await response.json().catch(() => null);
|
||||
if (!response.ok || !result?.success) throw new Error(result?.error || 'Delete failed');
|
||||
this.showToast(`Deleted: ${filePath}`, 'success');
|
||||
await this.loadFileBrowser(sessionId, { force: true });
|
||||
result = await response.json().catch(() => null);
|
||||
if (!response.ok || result?.success !== true) {
|
||||
throw new Error(result?.error || `HTTP ${response.status}`);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('File browser delete failed:', error);
|
||||
this.showToast(error?.message || 'Delete failed', 'error');
|
||||
this.showToast(`Delete failed: ${error?.message || 'network error'}`, 'error');
|
||||
return;
|
||||
}
|
||||
this.showToast(`File deleted: ${filePath}`, 'success');
|
||||
const state = this._ensureFileBrowserState();
|
||||
if (state.ownerSessionId === sessionId) await this._reloadFileBrowserKeepingQuery();
|
||||
},
|
||||
|
||||
_findFileBrowserDirectory(nodes, targetPath, ancestors = []) {
|
||||
|
||||
@@ -12404,6 +12404,14 @@ html:is([data-skin="paper-gray"], [data-skin="solarized-light"], [data-skin="cat
|
||||
.file-tree-delete:hover {
|
||||
color: #ef5350;
|
||||
}
|
||||
/* A touch screen has no hover, so the row's buttons stay visible there: otherwise the first tap
|
||||
on a row opens the preview and the buttons never show. */
|
||||
@media (hover: none) {
|
||||
.file-tree-download,
|
||||
.file-tree-delete {
|
||||
display: inline;
|
||||
}
|
||||
}
|
||||
|
||||
/* File tree indent levels */
|
||||
.file-tree-item[data-depth="0"] { padding-left: 0.5rem; }
|
||||
|
||||
Reference in new issue
Block a user