Merge branch 'dev-2.9.1' into dev-26.10.0

This commit is contained in:
LukeGus committed 2026-10-03 16:36:59 -05:00
commit e489d804f9
42 files changed
+225 -86

No files matched your search

+2
View File
@@ -42,5 +42,7 @@ https://youtu.be/lngaePO96tM
- Status checks triggering Fail2Ban bans while a session was open
- Too many database writes from session activity
- Host editor tabs being hidden when they did not fit
- SSH host keys being accepted without a check when the host was missing from the database
- The "last login failed" host status showing in English or mistranslated in several languages
<!-- /BUG_FIXES -->
+31 -2
View File
@@ -84,18 +84,47 @@ export class SSHHostKeyVerifier {
hostId,
);
// No row means nothing to compare against and nowhere to save the
// key, so it is never accepted silently (#1397): the user decides
// when there is a socket to ask on, otherwise it is refused.
if (!host) {
if (!ws) {
sshLogger.error(
"Host not found in database during key verification, rejecting",
{
operation: "host_key_no_host",
hostId,
ip,
port,
userId,
},
);
verify(false);
return;
}
const accepted = await this.promptUserForNewKey(
ws,
ip,
port,
undefined,
fingerprint,
keyType,
algorithm,
);
sshLogger.warn(
"Host not found in database during key verification",
accepted
? "Key for a host missing from the database accepted for this session only"
: "Key for a host missing from the database rejected",
{
operation: "host_key_no_host",
hostId,
ip,
port,
fingerprint,
userId,
},
);
verify(true);
verify(accepted);
return;
}
@@ -76,3 +76,47 @@ describe("host key recovery", () => {
expect(accepted).toEqual([]);
});
});
describe("a host missing from the database", () => {
function answeringSocket(action: "accept" | "reject") {
const socket = new EventEmitter() as EventEmitter & {
send: (data: string) => void;
};
socket.send = () =>
socket.emit(
"message",
Buffer.from(
JSON.stringify({
type: "host_key_verification_response",
data: { action },
}),
),
);
return socket as unknown as WebSocket;
}
async function verifyMissingHost(ws: WebSocket | null) {
const verifier = await SSHHostKeyVerifier.createHostVerifier(
hostId,
"127.0.0.1",
22,
ws,
"user",
false,
null,
);
return new Promise<boolean>((resolve) =>
verifier(Buffer.from("any-key"), resolve),
);
}
it("refuses the key when nobody can be asked", async () => {
expect(await verifyMissingHost(null)).toBe(false);
});
it("asks the user and saves nothing", async () => {
expect(await verifyMissingHost(answeringSocket("accept"))).toBe(true);
expect(await verifyMissingHost(answeringSocket("reject"))).toBe(false);
expect(updateHostKey).not.toHaveBeenCalled();
});
});
+2 -3
View File
@@ -359,7 +359,7 @@
"serverStats": "Host Metrics",
"status": {
"available": "Available",
"reachable": "Up, but the last sign in failed",
"reachable": "Available, but login failed",
"offline": "Offline",
"monitoringDisabled": "Monitoring disabled",
"label": "Status"
@@ -1516,8 +1516,7 @@
"sslManualTitle": "Upload a certificate",
"updateExternalAutoProvisionFailed": "Failed to update the auto-create setting",
"hostTags": "Predefined host tags",
"hostTagsDesc": "One tag per line, available to all users. Editing this list changes suggestions only; tags already assigned to hosts are kept.",
"hostTagsSaved": "Host tag suggestions saved.",
"hostTagsDesc": "Tags every user sees as suggestions in the host editor. Press Space or Enter to add one. Removing a tag here does not remove it from hosts.",
"hostTagsError": "Could not load or save host tag suggestions."
},
"newUi": {
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Gasheermetrieke",
"status": {
"available": "Beskikbaar",
"reachable": "Aan, maar die laaste aanmelding het misluk",
"reachable": "Beskikbaar, maar aanmelding het misluk",
"offline": "Vanlyn",
"monitoringDisabled": "Monitering gedeaktiveer",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "مقاييس المضيف",
"status": {
"available": "متاح",
"reachable": "تم تسجيل الدخول، لكن آخر تسجيل دخول فشل",
"reachable": "متاح، لكن تسجيل الدخول فشل",
"offline": "غير متصل بالإنترنت",
"monitoringDisabled": "تم تعطيل المراقبة",
"label": "حالة"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Метрики на хоста",
"status": {
"available": "Налично",
"reachable": "Включено, но последното влизане не беше успешно",
"reachable": "Достъпен, но влизането е неуспешно",
"offline": "Офлайн",
"monitoringDisabled": "Мониторингът е деактивиран",
"label": "Статус"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "হোস্ট মেট্রিক্স",
"status": {
"available": "উপলব্ধ",
"reachable": "Up, but the last sign in failed",
"reachable": "উপলব্ধ, কিন্তু লগইন ব্যর্থ হয়েছে",
"offline": "অফলাইন",
"monitoringDisabled": "পর্যবেক্ষণ অক্ষম করা হয়েছে",
"label": "অবস্থা"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Mètriques de l'amfitrió",
"status": {
"available": "Disponible",
"reachable": "Activat, però l'últim inici de sessió ha fallat",
"reachable": "Disponible, però l'inici de sessió ha fallat",
"offline": "Fora de línia",
"monitoringDisabled": "Monitorització desactivada",
"label": "Estat"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Metriky hostitele",
"status": {
"available": "K dispozici",
"reachable": "Nahoře, ale poslední přihlášení se nezdařilo",
"reachable": "Dostupný, ale přihlášení selhalo",
"offline": "Offline",
"monitoringDisabled": "Monitorování zakázáno",
"label": "Postavení"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Værtsmålinger",
"status": {
"available": "Tilgængelig",
"reachable": "Oppe, men den sidste login mislykkedes",
"reachable": "Tilgængelig, men login mislykkedes",
"offline": "Offline",
"monitoringDisabled": "Overvågning deaktiveret",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Host-Metriken",
"status": {
"available": "Verfügbar",
"reachable": "Oben angekommen, aber die letzte Anmeldung schlug fehl.",
"reachable": "Erreichbar, aber Anmeldung fehlgeschlagen",
"offline": "Offline",
"monitoringDisabled": "Überwachung deaktiviert",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Μετρήσεις κεντρικού υπολογιστή",
"status": {
"available": "Διαθέσιμος",
"reachable": "Ενεργοποιημένο, αλλά η τελευταία σύνδεση απέτυχε",
"reachable": "Διαθέσιμος, αλλά η σύνδεση απέτυχε",
"offline": "Εκτός σύνδεσης",
"monitoringDisabled": "Η παρακολούθηση απενεργοποιήθηκε",
"label": "Κατάσταση"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Métricas del host",
"status": {
"available": "Disponible",
"reachable": "Arriba, pero el último cartel falló.",
"reachable": "Disponible, pero el inicio de sesión falló",
"offline": "Desconectado",
"monitoringDisabled": "Monitoreo desactivado",
"label": "Estado"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Isännän mittarit",
"status": {
"available": "Saatavilla",
"reachable": "Ylös, mutta viimeisin kirjautuminen epäonnistui",
"reachable": "Saatavilla, mutta kirjautuminen epäonnistui",
"offline": "Offline-tilassa",
"monitoringDisabled": "Valvonta poistettu käytöstä",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Métriques de l'hôte",
"status": {
"available": "Disponible",
"reachable": "J'ai réussi, mais la dernière connexion a échoué.",
"reachable": "Disponible, mais la connexion a échoué",
"offline": "Hors ligne",
"monitoringDisabled": "Surveillance désactivée",
"label": "Statut"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "מדדי מארח",
"status": {
"available": "זָמִין",
"reachable": "למעלה, אבל הכניסה האחרונה נכשלה",
"reachable": "זמין, אך ההתחברות נכשלה",
"offline": "לא מקוון",
"monitoringDisabled": "ניטור מושבת",
"label": "סטָטוּס"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "होस्ट मेट्रिक्स",
"status": {
"available": "उपलब्ध",
"reachable": "Up, but the last sign in failed",
"reachable": "उपलब्ध, लेकिन लॉगिन विफल रहा",
"offline": "ऑफलाइन",
"monitoringDisabled": "निगरानी अक्षम है",
"label": "स्थिति"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Gazdagép-metrikák",
"status": {
"available": "Elérhető",
"reachable": "Felment, de az utolsó bejelentkezés sikertelen",
"reachable": "Elérhető, de a bejelentkezés sikertelen",
"offline": "Offline",
"monitoringDisabled": "Monitorozás letiltva",
"label": "Állapot"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Metrik Host",
"status": {
"available": "Tersedia",
"reachable": "Up, but the last sign in failed",
"reachable": "Tersedia, tetapi login gagal",
"offline": "Offline",
"monitoringDisabled": "Pemantauan dinonaktifkan",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Metriche host",
"status": {
"available": "Disponibile",
"reachable": "Su, ma l'ultimo accesso non è riuscito",
"reachable": "Disponibile, ma l'accesso non è riuscito",
"offline": "Offline",
"monitoringDisabled": "Monitoraggio disabilitato",
"label": "Stato"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "ホストメトリクス",
"status": {
"available": "利用可能",
"reachable": "上昇したが、最後のサインインが失敗した",
"reachable": "利用可能ですが、ログインに失敗しました",
"offline": "オフライン",
"monitoringDisabled": "監視が無効になっています",
"label": "状態"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "호스트 메트릭",
"status": {
"available": "사용 가능",
"reachable": "올라갔지만 마지막 로그인 시도가 실패했습니다.",
"reachable": "사용 가능하지만 로그인에 실패했습니다",
"offline": "오프라인",
"monitoringDisabled": "모니터링이 비활성화되었습니다.",
"label": "상태"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Hoststatistieken",
"status": {
"available": "Beschikbaar",
"reachable": "Omhoog, maar de laatste aanmelding mislukte.",
"reachable": "Beschikbaar, maar inloggen mislukt",
"offline": "Offline",
"monitoringDisabled": "Monitoring uitgeschakeld",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Vertsmålinger",
"status": {
"available": "Tilgjengelig",
"reachable": "Up, but the last sign in failed",
"reachable": "Tilgjengelig, men innlogging mislyktes",
"offline": "Frakoblet",
"monitoringDisabled": "Overvåking deaktivert",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Metryki hosta",
"status": {
"available": "Dostępny",
"reachable": "Up, but the last sign in failed",
"reachable": "Dostępny, ale logowanie nie powiodło się",
"offline": "Niedostępny",
"monitoringDisabled": "Monitorowanie wyłączone",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Métricas do host",
"status": {
"available": "Disponível",
"reachable": "Up, but the last sign in failed",
"reachable": "Disponível, mas o login falhou",
"offline": "Offline",
"monitoringDisabled": "Monitoramento desativado",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Métricas do Host",
"status": {
"available": "Disponível",
"reachable": "Up, but the last sign in failed",
"reachable": "Disponível, mas o início de sessão falhou",
"offline": "Offline",
"monitoringDisabled": "Monitorização desativado",
"label": "Estatuto"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Metrici ale gazdei",
"status": {
"available": "Disponibil",
"reachable": "Activ, dar ultima conectare a eșuat",
"reachable": "Disponibil, dar autentificarea a eșuat",
"offline": "Offline",
"monitoringDisabled": "Monitorizarea este dezactivată",
"label": "Stare"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Метрики хоста",
"status": {
"available": "Доступный",
"reachable": "Up, but the last sign in failed",
"reachable": "Доступен, но вход не выполнен",
"offline": "Офлайн",
"monitoringDisabled": "Мониторинг отключен",
"label": "Статус"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Метрике хоста",
"status": {
"available": "Доступно",
"reachable": "Up, but the last sign in failed",
"reachable": "Доступан, али пријава није успела",
"offline": "Офлајн",
"monitoringDisabled": "Праћење је онемогућено",
"label": "Статус"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Värdstatistik",
"status": {
"available": "Tillgänglig",
"reachable": "Up, but the last sign in failed",
"reachable": "Tillgänglig, men inloggningen misslyckades",
"offline": "Off-line",
"monitoringDisabled": "Övervakning inaktiverad",
"label": "Status"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "เมตริกโฮสต์",
"status": {
"available": "มีอยู่",
"reachable": "Up, but the last sign in failed",
"reachable": "พร้อมใช้งาน แต่เข้าสู่ระบบไม่สำเร็จ",
"offline": "ออฟไลน์",
"monitoringDisabled": "ปิดใช้งานการตรวจสอบ",
"label": "สถานะ"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Sunucu Metrikleri",
"status": {
"available": "Mevcut",
"reachable": "Up, but the last sign in failed",
"reachable": "Erişilebilir, ancak oturum açma başarısız oldu",
"offline": "Çevrimdışı",
"monitoringDisabled": "İzleme devre dışı bırakıldı",
"label": "Durum"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Метрики хоста",
"status": {
"available": "Доступно",
"reachable": "Up, but the last sign in failed",
"reachable": "Доступний, але вхід не виконано",
"offline": "Офлайн",
"monitoringDisabled": "Моніторинг вимкнено",
"label": "Статус"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "Số liệu máy chủ",
"status": {
"available": "Có sẵn",
"reachable": "Up, but the last sign in failed",
"reachable": "Khả dụng, nhưng đăng nhập thất bại",
"offline": "Ngoại tuyến",
"monitoringDisabled": "Chức năng giám sát đã bị vô hiệu hóa.",
"label": "Trạng thái"
+1 -1
View File
@@ -359,7 +359,7 @@
"serverStats": "主机指标",
"status": {
"available": "可用的",
"reachable": "在线,但上次登录失败",
"reachable": "可用,但登录失败",
"offline": "离线",
"monitoringDisabled": "监控已禁用",
"label": "地位"
+1 -1
View File
@@ -353,7 +353,7 @@
"serverStats": "主機指標",
"status": {
"available": "可用的",
"reachable": "Up, but the last sign in failed",
"reachable": "可用,但登入失敗",
"offline": "離線",
"monitoringDisabled": "監控已停用",
"label": "地位"
+60 -41
View File
@@ -1,80 +1,99 @@
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/components/button";
import { toast } from "sonner";
import { X } from "lucide-react";
import { getHostTags, saveHostTags } from "@/api/host-tags-api";
export function AdminHostTags() {
const { t } = useTranslation();
const [value, setValue] = useState("");
const [tags, setTags] = useState<string[]>([]);
const [input, setInput] = useState("");
const [loaded, setLoaded] = useState(false);
const [saving, setSaving] = useState(false);
const [message, setMessage] = useState("");
useEffect(() => {
let cancelled = false;
getHostTags()
.then((tags) => {
.then((list) => {
if (cancelled) return;
setValue(tags.join("\n"));
setTags(list);
setLoaded(true);
})
.catch(() => {
if (!cancelled) setMessage(t("admin.hostTagsError"));
if (!cancelled) toast.error(t("admin.hostTagsError"));
});
return () => {
cancelled = true;
};
}, [t]);
async function save() {
async function save(next: string[]) {
const previous = tags;
setTags(next);
setSaving(true);
setMessage("");
try {
const tags = await saveHostTags(
value
.split("\n")
.map((tag) => tag.trim())
.filter(Boolean),
);
setValue(tags.join("\n"));
setMessage(t("admin.hostTagsSaved"));
setTags(await saveHostTags(next));
window.dispatchEvent(new Event("termix:host-tags-changed"));
} catch {
setMessage(t("admin.hostTagsError"));
setTags(previous);
toast.error(t("admin.hostTagsError"));
} finally {
setSaving(false);
}
}
function add(raw: string) {
const tag = raw.trim();
setInput("");
if (!tag || tags.includes(tag)) return;
void save([...tags, tag]);
}
return (
<div className="flex flex-col gap-2 border-t border-border py-3">
<div className="flex flex-col gap-1.5">
<label htmlFor="global-host-tags" className="text-xs font-medium">
{t("admin.hostTags")}
</label>
<p className="text-[11px] text-muted-foreground">
<span className="text-[10px] text-muted-foreground">
{t("admin.hostTagsDesc")}
</p>
<textarea
id="global-host-tags"
rows={5}
disabled={!loaded || saving}
value={value}
onChange={(event) => setValue(event.target.value)}
className="w-full border border-border bg-background p-2 text-xs"
/>
<Button
type="button"
size="sm"
disabled={!loaded || saving}
onClick={() => void save()}
>
{t("common.save")}
</Button>
{message && (
<p role="status" className="text-xs">
{message}
</p>
)}
</span>
<div className="flex flex-wrap items-center gap-1 min-h-9 px-2 py-1 border border-border bg-background focus-within:ring-1 focus-within:ring-ring">
{tags.map((tag) => (
<span
key={tag}
className="flex items-center gap-0.5 px-1.5 py-0.5 text-[10px] bg-muted border border-border/60 text-foreground"
>
{tag}
<button
type="button"
disabled={saving}
aria-label={t("common.remove")}
onClick={() => void save(tags.filter((tg) => tg !== tag))}
className="text-muted-foreground hover:text-destructive ml-0.5"
>
<X className="size-2.5" />
</button>
</span>
))}
<input
id="global-host-tags"
className="flex-1 min-w-16 text-xs bg-transparent outline-none placeholder:text-muted-foreground/50"
placeholder={tags.length === 0 ? t("hosts.addTag") : ""}
disabled={!loaded || saving}
value={input}
onChange={(e) => setInput(e.target.value)}
onBlur={() => add(input)}
onKeyDown={(e) => {
if (e.nativeEvent.isComposing) return;
if ((e.key === " " || e.key === "Enter") && input.trim()) {
e.preventDefault();
add(input);
} else if (e.key === "Backspace" && !input && tags.length > 0) {
void save(tags.slice(0, -1));
}
}}
/>
</div>
</div>
);
}
+3 -1
View File
@@ -69,7 +69,6 @@ export function AdminGeneralSettingsSection({
onToggle={onToggle}
>
<div className="flex flex-col gap-0 pt-2">
<AdminHostTags />
<div className="flex flex-col gap-1.5 py-2">
<span className="text-xs font-medium">
{t("admin.notificationPrivateEndpoints")}
@@ -351,6 +350,9 @@ export function AdminHostDefaultsSection({
>
{t("hostDefaults.editServerDefaults")}
</Button>
<div className="border-t border-border pt-3">
<AdminHostTags />
</div>
</div>
</AccordionSection>
);
+5 -5
View File
@@ -317,7 +317,7 @@ export function HostEditorGeneralTab({
onChange={(e) => setField("tagInput", e.target.value)}
onKeyDown={(e) => {
if (
e.key === "Enter" &&
(e.key === " " || e.key === "Enter") &&
!e.nativeEvent.isComposing &&
form.tagInput.trim()
) {
@@ -340,15 +340,15 @@ export function HostEditorGeneralTab({
aria-label={t("admin.hostTags")}
>
{suggestedTags.map((tag) => (
<Button
<button
type="button"
key={tag}
variant="outline"
size="sm"
onClick={() => addTag(tag)}
className="flex items-center gap-0.5 px-1.5 py-0.5 text-[10px] border border-dashed border-border text-muted-foreground hover:text-foreground hover:border-foreground/40 transition-colors"
>
<Plus className="size-2.5" />
{tag}
</Button>
</button>
))}
</div>
)}
@@ -0,0 +1,44 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { render, screen, fireEvent, waitFor } from "@testing-library/react";
const getHostTags = vi.fn();
const saveHostTags = vi.fn();
vi.mock("@/api/host-tags-api", () => ({
getHostTags: () => getHostTags(),
saveHostTags: (tags: string[]) => saveHostTags(tags),
}));
vi.mock("react-i18next", () => ({
useTranslation: () => ({ t: (key: string) => key }),
}));
vi.mock("sonner", () => ({ toast: { error: vi.fn() } }));
import { AdminHostTags } from "@/sidebar/AdminHostTags";
describe("AdminHostTags", () => {
beforeEach(() => {
getHostTags.mockReset().mockResolvedValue(["prod"]);
saveHostTags.mockReset().mockImplementation(async (tags) => tags);
});
it("adds a tag on space and saves the list", async () => {
render(<AdminHostTags />);
await screen.findByText("prod");
const input = screen.getByLabelText("admin.hostTags");
await waitFor(() =>
expect((input as HTMLInputElement).disabled).toBe(false),
);
fireEvent.change(input, { target: { value: "web" } });
fireEvent.keyDown(input, { key: " " });
await screen.findByText("web");
expect(saveHostTags).toHaveBeenCalledWith(["prod", "web"]);
});
it("removes a tag and saves the list", async () => {
render(<AdminHostTags />);
await screen.findByText("prod");
fireEvent.click(screen.getByLabelText("common.remove"));
await waitFor(() => expect(screen.queryByText("prod")).toBeNull());
expect(saveHostTags).toHaveBeenCalledWith([]);
});
});