11 Commits

9 changed files with 152 additions and 66 deletions
+1
View File
@@ -2,3 +2,4 @@ __pycache__/
.env .env
frontend/node_modules/ frontend/node_modules/
static/dist/ static/dist/
venv/
+3 -4
View File
@@ -1743,13 +1743,12 @@ def update_api_key(kid: int):
@app.route("/api/api-keys/<int:kid>", methods=["DELETE"]) @app.route("/api/api-keys/<int:kid>", methods=["DELETE"])
@require_login @require_login
def revoke_api_key(kid: int): def delete_api_key(kid: int):
with db_cursor() as (_, cur): with db_cursor() as (_, cur):
cur.execute( cur.execute(
""" """
UPDATE api_keys DELETE FROM api_keys
SET revoked_at = CURRENT_TIMESTAMP WHERE id = %s
WHERE id = %s AND revoked_at IS NULL
""", """,
(kid,), (kid,),
) )
+1 -1
View File
@@ -16,7 +16,7 @@
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500&family=IBM+Plex+Sans:wght@400;500;600&display=swap" href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500&family=IBM+Plex+Sans:wght@400;500;600&display=swap"
rel="stylesheet" rel="stylesheet"
/> />
<title>JDB-NET SSH</title> <title>SSH</title>
</head> </head>
<body class="bg-surface text-slate-200 antialiased"> <body class="bg-surface text-slate-200 antialiased">
<div id="app"></div> <div id="app"></div>
+96 -32
View File
@@ -33,8 +33,42 @@ const breadcrumb = ref<{ id: number; label: string }[]>([]);
const searchActive = ref(false); const searchActive = ref(false);
const currentFolderId = ref<number | null>(null); const currentFolderId = ref<number | null>(null);
const searchQuery = ref(""); const searchQuery = ref("");
const tabs = ref<TabItem[]>([]); const tabs = ref<{ id: string; hostId: number; label: string }[]>([]);
const activeTabId = ref<string | null>(null); const activePanes = ref<string[]>([]);
const draggedTabId = ref<string | null>(null);
function onTabDragStart(id: string) {
draggedTabId.value = id;
}
function onTabDrop(targetId: string) {
if (!draggedTabId.value || draggedTabId.value === targetId) return;
const from = tabs.value.findIndex((t) => t.id === draggedTabId.value);
const to = tabs.value.findIndex((t) => t.id === targetId);
if (from === -1 || to === -1) return;
const [t] = tabs.value.splice(from, 1);
tabs.value.splice(to, 0, t);
draggedTabId.value = null;
}
function onTabDragEnd() {
draggedTabId.value = null;
}
function onSplitDrop() {
if (!draggedTabId.value || activePanes.value.includes(draggedTabId.value)) {
draggedTabId.value = null;
return;
}
if (activePanes.value.length >= 2) {
activePanes.value = [activePanes.value[0], draggedTabId.value];
} else if (activePanes.value.length === 1) {
activePanes.value.push(draggedTabId.value);
} else {
activePanes.value = [draggedTabId.value];
}
draggedTabId.value = null;
}
const loadErr = ref(""); const loadErr = ref("");
const hostSortOrder = ref<"name" | "last_connected">("name"); const hostSortOrder = ref<"name" | "last_connected">("name");
/** Narrow viewports: slide-over hosts panel; md+ sidebar stays visible */ /** Narrow viewports: slide-over hosts panel; md+ sidebar stays visible */
@@ -49,6 +83,10 @@ const showFolderForm = ref(false);
const showEditHost = ref(false); const showEditHost = ref(false);
const showAuditLog = ref(false); const showAuditLog = ref(false);
const showApiKeys = ref(false); const showApiKeys = ref(false);
const showSftpPanel = ref(false);
function toggleSftp() {
showSftpPanel.value = !showSftpPanel.value;
}
const auditLoading = ref(false); const auditLoading = ref(false);
const auditErr = ref(""); const auditErr = ref("");
const auditRows = ref<ConnectionAuditRow[]>([]); const auditRows = ref<ConnectionAuditRow[]>([]);
@@ -233,7 +271,8 @@ async function onLoggedIn() {
async function logout() { async function logout() {
await api.logout(); await api.logout();
tabs.value = []; tabs.value = [];
activeTabId.value = null; activePanes.value = [];
allHosts.value = [];
loggedIn.value = false; loggedIn.value = false;
} }
@@ -366,14 +405,14 @@ async function submitApiKey() {
} }
} }
async function revokeApiKey(id: number, label: string) { async function deleteApiKey(id: number, label: string) {
if (!confirm(`Revoke API key "${label}"? This cannot be undone.`)) return; if (!confirm(`Delete API key "${label}"? This cannot be undone.`)) return;
apiKeysErr.value = ""; apiKeysErr.value = "";
try { try {
await api.revokeApiKey(id); await api.deleteApiKey(id);
await refreshApiKeys(); await refreshApiKeys();
} catch (e) { } catch (e) {
apiKeysErr.value = e instanceof Error ? e.message : "Failed to revoke API key"; apiKeysErr.value = e instanceof Error ? e.message : "Failed to delete API key";
} }
} }
@@ -399,7 +438,7 @@ function fmtScopes(scopes: string[]): string {
function openTab(h: HostRow) { function openTab(h: HostRow) {
const id = crypto.randomUUID(); const id = crypto.randomUUID();
tabs.value.push({ id, hostId: h.id, label: h.label }); tabs.value.push({ id, hostId: h.id, label: h.label });
activeTabId.value = id; activePanes.value = [id];
if (window.matchMedia("(max-width: 767px)").matches) { if (window.matchMedia("(max-width: 767px)").matches) {
sidebarOpen.value = false; sidebarOpen.value = false;
} }
@@ -411,8 +450,9 @@ function toggleSidebar() {
function closeTab(id: string) { function closeTab(id: string) {
tabs.value = tabs.value.filter((t) => t.id !== id); tabs.value = tabs.value.filter((t) => t.id !== id);
if (activeTabId.value === id) { activePanes.value = activePanes.value.filter((p) => p !== id);
activeTabId.value = tabs.value.length ? tabs.value[tabs.value.length - 1].id : null; if (activePanes.value.length === 0 && tabs.value.length) {
activePanes.value = [tabs.value[tabs.value.length - 1].id];
} }
} }
@@ -637,10 +677,9 @@ async function deleteHostRow(id: number) {
await api.deleteHost(id); await api.deleteHost(id);
allHosts.value = allHosts.value.filter((h) => h.id !== id); allHosts.value = allHosts.value.filter((h) => h.id !== id);
tabs.value = tabs.value.filter((t) => t.hostId !== id); tabs.value = tabs.value.filter((t) => t.hostId !== id);
if (!tabs.value.some((t) => t.id === activeTabId.value)) { activePanes.value = activePanes.value.filter(p => tabs.value.some(t => t.id === p));
activeTabId.value = tabs.value.length if (activePanes.value.length === 0 && tabs.value.length) {
? tabs.value[tabs.value.length - 1].id activePanes.value = [tabs.value[tabs.value.length - 1].id];
: null;
} }
await refreshBrowse(); await refreshBrowse();
} }
@@ -692,27 +731,37 @@ async function deleteIdentityRow(id: number) {
/> />
</svg> </svg>
</button> </button>
<div class="flex items-center gap-2 truncate">
<span class="truncate text-sm font-semibold text-white">SSH</span>
<a <a
href="https://git.jdbnet.co.uk/jamie/ssh" href="https://git.jdbnet.co.uk/jamie/ssh"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
class="flex items-center gap-2 truncate" class="truncate text-xs text-slate-400 hover:text-slate-300"
> >
<span class="truncate text-sm font-semibold text-white">JDB-NET SSH</span> {{ appVersion }}
<span class="truncate text-xs text-slate-400 hover:text-slate-300">{{ appVersion }}</span>
</a> </a>
</div> </div>
</div>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<button <button
type="button" type="button"
class="rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white" class="hidden rounded-lg px-3 py-1.5 text-xs md:inline-flex"
:class="showSftpPanel ? 'bg-slate-800 text-white' : 'text-slate-400 hover:bg-slate-800 hover:text-white'"
@click="toggleSftp"
>
SFTP
</button>
<button
type="button"
class="hidden rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white md:inline-flex"
@click="openApiKeys" @click="openApiKeys"
> >
API keys API keys
</button> </button>
<button <button
type="button" type="button"
class="rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white" class="hidden rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white md:inline-flex"
@click="openAuditLog" @click="openAuditLog"
> >
Connection audit Connection audit
@@ -989,13 +1038,19 @@ async function deleteIdentityRow(id: number) {
v-for="t in tabs" v-for="t in tabs"
:key="t.id" :key="t.id"
type="button" type="button"
class="flex items-center gap-2 rounded-t-lg border border-b-0 px-3 py-2 text-sm" draggable="true"
:class=" @dragstart="onTabDragStart(t.id)"
t.id === activeTabId @dragover.prevent
@drop="onTabDrop(t.id)"
@dragend="onTabDragEnd"
class="flex items-center gap-2 rounded-t-lg border border-b-0 px-3 py-2 text-sm transition-colors"
:class="[
activePanes.includes(t.id)
? 'border-slate-700 bg-surface text-white' ? 'border-slate-700 bg-surface text-white'
: 'border-transparent bg-transparent text-slate-400 hover:text-white' : 'border-transparent bg-transparent text-slate-400 hover:text-white',
" draggedTabId && draggedTabId !== t.id ? 'hover:bg-slate-800/50' : ''
@click="activeTabId = t.id" ]"
@click="activePanes = [t.id]"
> >
{{ t.label }} {{ t.label }}
<span <span
@@ -1004,18 +1059,28 @@ async function deleteIdentityRow(id: number) {
>×</span> >×</span>
</button> </button>
</div> </div>
<div class="min-h-0 flex-1 p-2 md:p-3"> <div class="relative min-h-0 flex-1 flex flex-row gap-2 p-2 md:p-3">
<div <div
v-for="t in tabs" v-for="t in tabs"
v-show="t.id === activeTabId" v-show="activePanes.includes(t.id)"
:key="t.id" :key="t.id"
class="h-full min-h-0" class="flex-1 min-w-0 h-full"
> >
<TabContent <TabContent
:host-id="t.hostId" :host-id="t.hostId"
:visible="t.id === activeTabId" :visible="activePanes.includes(t.id)"
:show-sftp="showSftpPanel"
/> />
</div> </div>
<div
v-if="draggedTabId && activePanes.length === 1 && !activePanes.includes(draggedTabId)"
class="absolute inset-y-2 right-2 md:inset-y-3 md:right-3 w-[calc(50%-0.25rem)] z-50 flex items-center justify-center rounded-lg border-2 border-dashed border-accent bg-accent/10 backdrop-blur-[2px] transition-all"
@dragover.prevent
@drop="onSplitDrop"
>
<span class="font-medium text-accent">Drop to split side-by-side</span>
</div>
</div> </div>
</template> </template>
</main> </main>
@@ -1139,12 +1204,11 @@ async function deleteIdentityRow(id: number) {
<td class="px-2 py-2">{{ apiKeyStatus(row) }}</td> <td class="px-2 py-2">{{ apiKeyStatus(row) }}</td>
<td class="px-2 py-2 text-right"> <td class="px-2 py-2 text-right">
<button <button
v-if="row.active"
type="button" type="button"
class="rounded px-2 py-1 text-red-400 hover:bg-slate-800" class="rounded px-2 py-1 text-red-400 hover:bg-slate-800"
@click="revokeApiKey(row.id, row.label)" @click="deleteApiKey(row.id, row.label)"
> >
Revoke Delete
</button> </button>
</td> </td>
</tr> </tr>
+1 -1
View File
@@ -226,7 +226,7 @@ export const api = {
return handle(res); return handle(res);
}, },
async revokeApiKey(id: number): Promise<void> { async deleteApiKey(id: number): Promise<void> {
const res = await fetch(`/api/api-keys/${id}`, { const res = await fetch(`/api/api-keys/${id}`, {
method: "DELETE", method: "DELETE",
credentials: "include", credentials: "include",
+1 -1
View File
@@ -31,7 +31,7 @@ async function submit() {
class="w-full max-w-md rounded-xl border border-slate-800 bg-surface-raised p-8 shadow-xl" class="w-full max-w-md rounded-xl border border-slate-800 bg-surface-raised p-8 shadow-xl"
> >
<h1 class="font-sans text-2xl font-semibold tracking-tight text-white"> <h1 class="font-sans text-2xl font-semibold tracking-tight text-white">
JDB-NET SSH SSH
</h1> </h1>
<p class="mt-1 text-sm text-slate-400"> <p class="mt-1 text-sm text-slate-400">
Sign in to manage connections and open terminals. Sign in to manage connections and open terminals.
+3
View File
@@ -14,6 +14,7 @@ import SftpPanel from "./SftpPanel.vue";
const props = defineProps<{ const props = defineProps<{
hostId: number; hostId: number;
visible: boolean; visible: boolean;
showSftp: boolean;
}>(); }>();
const termEl = ref<HTMLElement | null>(null); const termEl = ref<HTMLElement | null>(null);
@@ -187,6 +188,7 @@ watch(
class="h-full min-h-[320px] rounded-lg border border-slate-800 bg-[#0a0e12] p-1" class="h-full min-h-[320px] rounded-lg border border-slate-800 bg-[#0a0e12] p-1"
/> />
</div> </div>
<template v-if="showSftp">
<div <div
v-if="connId" v-if="connId"
class="hidden w-80 shrink-0 flex-col border-l border-slate-800 md:flex" class="hidden w-80 shrink-0 flex-col border-l border-slate-800 md:flex"
@@ -199,5 +201,6 @@ watch(
> >
SFTP unlocks when the shell session is ready. SFTP unlocks when the shell session is ready.
</div> </div>
</template>
</div> </div>
</template> </template>
-6
View File
@@ -1,6 +0,0 @@
{
"name": "ssh",
"lockfileVersion": 3,
"requires": true,
"packages": {}
}
Executable
+25
View File
@@ -0,0 +1,25 @@
#!/bin/bash
if [ ! -d "venv" ]; then
echo "Creating virtual environment in 'venv'..."
python3 -m venv venv
source venv/bin/activate
if [ -f "requirements.txt" ]; then
echo "Installing requirements..."
pip install -r requirements.txt
fi
else
source venv/bin/activate
fi
echo "Building frontend..."
(
cd frontend
if [ ! -d "node_modules" ]; then
echo "Installing frontend dependencies..."
npm install
fi
npm run build
)
exec gunicorn --bind 0.0.0.0:5000 --workers 1 --worker-class geventwebsocket.gunicorn.workers.GeventWebSocketWorker app:app --log-level info