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