hermes
5ff6a06e82
Diagnosed two independent faults reported from the running editor.
1. Terminal plugin (market) did not work as shipped.
Root cause: it is a port of Fluidbyte/Codiad-Terminal and calls Common::execute(),
which Atheos REMOVED (renamed to raw_execute with a different return shape).
plugin calls : Common::execute(...) -> MISSING
available : Common::raw_execute(...) -> ["code"=>int, "output"=>array]
Fixed to raw_execute + implode of the output array. Verified against the real
method: pwd/echo return correctly, and after chdir it reports the blog repo path,
so the terminal opens in the right directory.
Two further upstream defects found and deliberately NOT fixed, but documented so
nobody trusts them: the block-list is dead code (`explode(",", BLOCKED === true)`
passes a boolean, so ssh/telnet are never blocked), and `strtolower($command ===
"exit")` means typing exit does not clear the auth flag.
Security note recorded: this plugin is a browser shell as the php-fpm user, gated
by a hardcoded in-app constant (PASSWORD="terminal"). It is not a secret. Strongest
argument yet for keeping the container LAN-only.
2. Settings -> Macro dialog returned HTTP 500.
Root cause: Atheos's own components/macro/dialog.php:35 does implode(", ",
$macro["fTypes"]) which requires an ARRAY, but class.macro.php::save() writes the
STRING "N/A" for folder macros. So ANY folder-type macro makes that dialog fatal:
PHP Fatal error: Uncaught TypeError: implode(): Argument #2 ($array) must be of
type ?array, string given in .../components/macro/dialog.php:35
Our writer macros are all folder-scoped, so adding them exposed it.
Fixed by correcting the DATA (fTypes ""N/A"" -> "[]") rather than patching Atheos's
code, so the fix survives an Atheos update. Verified implode() now succeeds for all
8 macros. The trade-off and the proper upstream fix are both documented.
Also records the diagnostic order for any future plugin problem, and the rule of
thumb: a Codiad-era plugin's Common:: calls are probably stale.
Adds:
docs/known-issues.md both faults, root causes, fixes, verification
patches/Terminal-terminal.php.patched the patched plugin file
files/macros.db.php regenerated with the corrected fTypes
78 lines
3.1 KiB
PHP
78 lines
3.1 KiB
PHP
<?php/*|[
|
|
{
|
|
"uuid": "macro-947e-4763-b7b6f2",
|
|
"title": "Execute",
|
|
"type": "file",
|
|
"fTypes": [
|
|
"sh"
|
|
],
|
|
"command": "%PATH%",
|
|
"icon": "fas fa-magic",
|
|
"owner": "ATHEOS"
|
|
},
|
|
{
|
|
"uuid": "macro-53a0-4ebb-56e800",
|
|
"title": "Execute",
|
|
"type": "file",
|
|
"fTypes": [
|
|
"php"
|
|
],
|
|
"command": "cd %FOLDER% && php %BASENAME%",
|
|
"icon": "fas fa-magic",
|
|
"owner": "ATHEOS"
|
|
},
|
|
{
|
|
"uuid": "macro-writer-0001-start",
|
|
"title": "1. Start/Join Writer Branch",
|
|
"type": "folder",
|
|
"fTypes": [],
|
|
"command": "cd %PATH% && (git checkout atheos-writer 2>/dev/null || git checkout -b atheos-writer) && git push -u origin atheos-writer",
|
|
"icon": "fas fa-code-branch",
|
|
"owner": "armistace"
|
|
},
|
|
{
|
|
"uuid": "macro-writer-0002-commit",
|
|
"title": "2. Commit + Push Writer Branch",
|
|
"type": "folder",
|
|
"fTypes": [],
|
|
"command": "cd %PATH% && (git config --get user.email >/dev/null || { echo 'ERROR: no git identity set. Run over SSH: git config --global user.name \"Your Name\" && git config --global user.email \"you@example.com\" (RUNBOOK STEP 1)'; exit 1; }) && git add -A && (git diff --cached --quiet || git commit -m \"writer: $(date +%F_%H%M)\") && git push origin atheos-writer",
|
|
"icon": "fas fa-cloud-upload-alt",
|
|
"owner": "armistace"
|
|
},
|
|
{
|
|
"uuid": "macro-writer-0003-reset",
|
|
"title": "3. DESTRUCTIVE: Reset Writer Branch to Master",
|
|
"type": "folder",
|
|
"fTypes": [],
|
|
"command": "cd %PATH% && git fetch origin && git reset --hard origin/master && git push --force-with-lease origin atheos-writer",
|
|
"icon": "fas fa-exclamation-triangle",
|
|
"owner": "armistace"
|
|
},
|
|
{
|
|
"uuid": "macro-writer-0004-status",
|
|
"title": "4. Status + Recent Log",
|
|
"type": "folder",
|
|
"fTypes": [],
|
|
"command": "cd %PATH% && git status --short --branch && echo '--- recent commits:' && git log --oneline -8 && echo '--- local branches:' && git branch",
|
|
"icon": "fas fa-info-circle",
|
|
"owner": "armistace"
|
|
},
|
|
{
|
|
"uuid": "macro-writer-0005-refresh",
|
|
"title": "5. Refresh Master (ff-only)",
|
|
"type": "folder",
|
|
"fTypes": [],
|
|
"command": "cd %PATH% && git checkout master && git pull --ff-only && git checkout atheos-writer",
|
|
"icon": "fas fa-sync-alt",
|
|
"owner": "armistace"
|
|
},
|
|
{
|
|
"uuid": "macro-writer-0006-pullmaster",
|
|
"title": "6. Merge Master Into Writer Branch",
|
|
"type": "folder",
|
|
"fTypes": [],
|
|
"command": "cd %PATH% && (git config --get user.email >/dev/null || { echo 'ERROR: no git identity set. Run over SSH: git config --global user.name \"Your Name\" && git config --global user.email \"you@example.com\" (RUNBOOK STEP 1)'; exit 1; }) && git fetch origin && git merge origin/master -m \"merge master into atheos-writer\" && git push origin atheos-writer",
|
|
"icon": "fas fa-code-merge",
|
|
"owner": "armistace"
|
|
}
|
|
]|*/?>
|