From 7c1dbeac273dbcafe09227498a9004ce39eb9cf1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 15:20:01 +0000 Subject: [PATCH] Fix disable SSH option and remove Feature Manager language Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/3fc488d2-ef33-4d4f-aeb5-f2532c658aad Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com> --- app/sovran_systemsos_web/server.py | 2 +- app/sovran_systemsos_web/static/js/support.js | 75 ++++++++++++++++++- 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/app/sovran_systemsos_web/server.py b/app/sovran_systemsos_web/server.py index 37244d3..75f5bb2 100644 --- a/app/sovran_systemsos_web/server.py +++ b/app/sovran_systemsos_web/server.py @@ -2152,7 +2152,7 @@ async def api_support_enable(): if not sshd_on: raise HTTPException( status_code=400, - detail="SSH must be enabled first. Please enable SSH Remote Access in the Feature Manager, then try again.", + detail="SSH must be enabled first. Please enable SSH Remote Access, then try again.", ) ok = await loop.run_in_executor(None, _enable_support) diff --git a/app/sovran_systemsos_web/static/js/support.js b/app/sovran_systemsos_web/static/js/support.js index 9e0dc6c..25dcc4d 100644 --- a/app/sovran_systemsos_web/static/js/support.js +++ b/app/sovran_systemsos_web/static/js/support.js @@ -27,12 +27,12 @@ function renderSupportSshdOff() { '
', '
🔐SSH is Off
', '

SSH (remote login) is disabled by default on your Sovran Pro. Clicking the button below will enable SSH and trigger a system rebuild. Once complete, you can then grant support access.

', - '

When you end the support session, you can disable SSH again from the Feature Manager to return to the default secure state.

', + '

When you end the support session, you\'ll be able to disable SSH to return to the default secure state.

', '
', '
Steps:
    ', '
  1. Enable SSH (triggers a system rebuild — takes a few minutes)
    2. ', '
  2. Grant Sovran Systems temporary support access
    3. ', - '
  3. End the session when done — SSH can be disabled again from the Feature Manager
    4. ', + '
  4. End the session when done — you\'ll be prompted to disable SSH
    5. ', '
', '', '

This will trigger a NixOS rebuild. Your machine will remain operational during the rebuild.

', @@ -116,7 +116,7 @@ function renderSupportInactive() { '
  • All session events are logged for your audit
    • ', '', '', - '

    You can revoke access at any time. When finished, you can disable SSH from the Feature Manager to return to the default secure state.

    ', + '

    You can revoke access at any time. When you end the session, you\'ll be able to disable SSH to return to the default secure state.

    ', '', ].join(""); document.getElementById("btn-support-enable").addEventListener("click", enableSupport); @@ -207,8 +207,22 @@ function renderSupportRemoved(verified) { var msg = verified ? "The Sovran Systems SSH key has been completely removed from your machine. We no longer have any access." : "The key removal was requested but could not be fully verified. Please reboot to ensure it is gone."; var vclass = verified ? "verified-gone" : "verify-warning"; var vlabel = verified ? "✓ Removed — No access" : "⚠ Verify by rebooting"; - $supportBody.innerHTML = '
    ' + icon + '

    Support Session Ended

    ' + escHtml(msg) + '

    SSH Key Status:' + vlabel + '
    🔐Disable SSH When Done

    SSH is still enabled on your machine. For maximum security, disable it from the Feature Manager when you no longer need remote access.

    '; + $supportBody.innerHTML = [ + '
    ', + '
    ' + icon + '
    ', + '

    Support Session Ended

    ', + '

    ' + escHtml(msg) + '

    ', + '
    SSH Key Status:' + vlabel + '
    ', + '
    ', + '
    🔐Disable SSH When Done
    ', + '

    SSH is still enabled on your machine. Click below to turn it off and return to the default secure state.

    ', + '', + '
    ', + '', + '
    ', + ].join(""); document.getElementById("btn-support-done").addEventListener("click", closeSupportModal); + document.getElementById("btn-sshd-disable").addEventListener("click", disableSshd); } async function enableSupport() { @@ -238,6 +252,59 @@ async function disableSupport() { } } +async function disableSshd() { + var btn = document.getElementById("btn-sshd-disable"); + if (btn) { btn.disabled = true; btn.textContent = "Disabling SSH…"; } + try { + await apiFetch("/api/features/toggle", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ feature: "sshd", enabled: false }), + }); + $supportBody.innerHTML = [ + '
    ', + '
    ⚙️
    ', + '

    Disabling SSH…

    ', + '

    A system rebuild is in progress to turn off SSH. This may take a few minutes.

    ', + '

    Rebuilding system…

    ', + '
    ', + ].join(""); + pollForSshdDisabled(); + } catch (err) { + if (btn) { btn.disabled = false; btn.textContent = "Disable SSH"; } + alert("Failed to disable SSH. Please try again."); + } +} + +function pollForSshdDisabled() { + var attempts = 0; + var maxAttempts = 60; // 5 minutes (5s interval) + var interval = setInterval(async function() { + attempts++; + try { + var status = await apiFetch("/api/support/status"); + var el = document.getElementById("sshd-disable-status"); + if (!status.sshd_enabled) { + clearInterval(interval); + $supportBody.innerHTML = [ + '
    ', + '
    🔐
    ', + '

    SSH is Off

    ', + '

    SSH has been disabled. Your machine is back to its default secure state.

    ', + '', + '
    ', + ].join(""); + document.getElementById("btn-support-done").addEventListener("click", closeSupportModal); + } else if (attempts >= maxAttempts) { + clearInterval(interval); + if (el) el.textContent = "Rebuild is taking longer than expected. Please close this dialog and try again."; + } else { + if (el) el.textContent = "Rebuilding system… (" + attempts * 5 + "s)"; + } + } catch (_) {} + }, 5000); +} + async function walletUnlock() { var btn = document.getElementById("btn-wallet-unlock"); var sel = document.getElementById("wallet-unlock-duration");