feat: multi-type server support — SQL, Redis, Grafana, Prometheus, Telnet, WinRM, RDP/VNC
Full implementation of multi-type server management across GUI and CLI: New clients: SQLClient (MariaDB/MSSQL/PostgreSQL), RedisClient, GrafanaClient, PrometheusClient, TelnetSession, WinRMClient, RemoteDesktopLauncher. New GUI tabs: QueryTab (SQL editor + Treeview), RedisTab (console + history), GrafanaTab (dashboards + alerts), PrometheusTab (PromQL + targets), PowershellTab (PS/CMD), LaunchTab (RDP/VNC external client). Infrastructure: TAB_REGISTRY for conditional tabs per server type, adaptive server_dialog fields, colored type badges in sidebar, status checker for all types (SSH/TCP/SQL/Redis/HTTP), 100+ i18n keys. CLI: ssh.py extended with --sql, --redis, --grafana-*, --prom-*, --ps, --cmd. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
"""
|
||||
Server add/edit dialog — modal window with all server fields.
|
||||
Form adapts visible fields based on selected server type.
|
||||
"""
|
||||
|
||||
import customtkinter as ctk
|
||||
@@ -7,6 +8,24 @@ from core.server_store import SERVER_TYPES, DEFAULT_PORTS
|
||||
from core.i18n import t
|
||||
|
||||
|
||||
# Which conditional fields to show for each server type.
|
||||
# Fields NOT listed here (alias, ip, type+port, skip_check, notes, buttons)
|
||||
# are always visible.
|
||||
FIELD_MAP = {
|
||||
"ssh": ["user", "password", "totp", "bind_interface"],
|
||||
"telnet": ["user", "password"],
|
||||
"winrm": ["user", "password", "use_ssl"],
|
||||
"mariadb": ["user", "password", "database"],
|
||||
"mssql": ["user", "password", "database"],
|
||||
"postgresql": ["user", "password", "database"],
|
||||
"redis": ["password", "db_index"],
|
||||
"grafana": ["api_token", "use_ssl"],
|
||||
"prometheus": ["use_ssl"],
|
||||
"rdp": ["user", "password"],
|
||||
"vnc": ["password"],
|
||||
}
|
||||
|
||||
|
||||
def _get_network_interfaces() -> list[tuple[str, str]]:
|
||||
"""Return list of (name, ipv4_address) for available network interfaces."""
|
||||
try:
|
||||
@@ -30,30 +49,31 @@ class ServerDialog(ctk.CTkToplevel):
|
||||
self.result = None
|
||||
|
||||
self.title(t("edit_server") if server else t("add_server"))
|
||||
self.geometry("450x680")
|
||||
self.geometry("450x720")
|
||||
self.resizable(False, False)
|
||||
self.grab_set()
|
||||
|
||||
# Center on parent
|
||||
self.transient(master)
|
||||
|
||||
self._field_frames: dict[str, ctk.CTkFrame] = {}
|
||||
self._build_ui(server)
|
||||
|
||||
def _build_ui(self, server: dict | None):
|
||||
pad = {"padx": 20, "pady": (5, 0)}
|
||||
entry_pad = {"padx": 20, "pady": (2, 5)}
|
||||
|
||||
# Alias
|
||||
# ── Always visible: Alias ──
|
||||
ctk.CTkLabel(self, text=t("alias"), anchor="w").pack(fill="x", **pad)
|
||||
self.alias_entry = ctk.CTkEntry(self, placeholder_text=t("placeholder_alias"))
|
||||
self.alias_entry.pack(fill="x", **entry_pad)
|
||||
|
||||
# IP
|
||||
# ── Always visible: IP ──
|
||||
ctk.CTkLabel(self, text=t("ip"), anchor="w").pack(fill="x", **pad)
|
||||
self.ip_entry = ctk.CTkEntry(self, placeholder_text=t("placeholder_ip"))
|
||||
self.ip_entry.pack(fill="x", **entry_pad)
|
||||
|
||||
# Type + Port row
|
||||
# ── Always visible: Type + Port row ──
|
||||
row = ctk.CTkFrame(self, fg_color="transparent")
|
||||
row.pack(fill="x", padx=20, pady=(5, 5))
|
||||
|
||||
@@ -73,9 +93,13 @@ class ServerDialog(ctk.CTkToplevel):
|
||||
self.port_entry = ctk.CTkEntry(port_frame, placeholder_text=t("placeholder_port"))
|
||||
self.port_entry.pack(fill="x")
|
||||
|
||||
# Network interface
|
||||
ctk.CTkLabel(self, text=t("network_interface"), anchor="w").pack(fill="x", **pad)
|
||||
self._iface_map: dict[str, str] = {} # display_name -> ip
|
||||
# ── Conditional fields container — all packed here, shown/hidden dynamically ──
|
||||
# We use self as parent but wrap each field group in a frame for easy show/hide.
|
||||
|
||||
# --- bind_interface ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ctk.CTkLabel(f, text=t("network_interface"), anchor="w").pack(fill="x", **pad)
|
||||
self._iface_map: dict[str, str] = {}
|
||||
ifaces = _get_network_interfaces()
|
||||
auto_label = t("auto_default")
|
||||
iface_values = [auto_label]
|
||||
@@ -84,43 +108,78 @@ class ServerDialog(ctk.CTkToplevel):
|
||||
iface_values.append(label)
|
||||
self._iface_map[label] = ip
|
||||
self._iface_var = ctk.StringVar(value=auto_label)
|
||||
self._iface_menu = ctk.CTkOptionMenu(self, values=iface_values, variable=self._iface_var)
|
||||
self._iface_menu = ctk.CTkOptionMenu(f, values=iface_values, variable=self._iface_var)
|
||||
self._iface_menu.pack(fill="x", **entry_pad)
|
||||
self._field_frames["bind_interface"] = f
|
||||
|
||||
# User
|
||||
ctk.CTkLabel(self, text=t("username"), anchor="w").pack(fill="x", **pad)
|
||||
self.user_entry = ctk.CTkEntry(self, placeholder_text=t("placeholder_user"))
|
||||
# --- user ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ctk.CTkLabel(f, text=t("username"), anchor="w").pack(fill="x", **pad)
|
||||
self.user_entry = ctk.CTkEntry(f, placeholder_text=t("placeholder_user"))
|
||||
self.user_entry.pack(fill="x", **entry_pad)
|
||||
self._field_frames["user"] = f
|
||||
|
||||
# Password
|
||||
ctk.CTkLabel(self, text=t("password"), anchor="w").pack(fill="x", **pad)
|
||||
pass_frame = ctk.CTkFrame(self, fg_color="transparent")
|
||||
pass_frame.pack(fill="x", padx=20, pady=(2, 5))
|
||||
self.password_entry = ctk.CTkEntry(pass_frame, show="*", placeholder_text=t("placeholder_password"))
|
||||
# --- password ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ctk.CTkLabel(f, text=t("password"), anchor="w").pack(fill="x", **pad)
|
||||
pass_inner = ctk.CTkFrame(f, fg_color="transparent")
|
||||
pass_inner.pack(fill="x", padx=20, pady=(2, 5))
|
||||
self.password_entry = ctk.CTkEntry(pass_inner, show="*", placeholder_text=t("placeholder_password"))
|
||||
self.password_entry.pack(side="left", fill="x", expand=True, padx=(0, 5))
|
||||
self.show_pass = ctk.CTkButton(pass_frame, text=t("show"), width=60, command=self._toggle_password)
|
||||
self.show_pass = ctk.CTkButton(pass_inner, text=t("show"), width=60, command=self._toggle_password)
|
||||
self.show_pass.pack(side="right")
|
||||
self._pass_visible = False
|
||||
self._field_frames["password"] = f
|
||||
|
||||
# TOTP Secret
|
||||
ctk.CTkLabel(self, text=t("totp_secret_dialog"), anchor="w").pack(fill="x", **pad)
|
||||
self.totp_entry = ctk.CTkEntry(self, placeholder_text=t("placeholder_totp_secret"),
|
||||
# --- totp ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ctk.CTkLabel(f, text=t("totp_secret_dialog"), anchor="w").pack(fill="x", **pad)
|
||||
self.totp_entry = ctk.CTkEntry(f, placeholder_text=t("placeholder_totp_secret"),
|
||||
font=ctk.CTkFont(family="Consolas", size=12))
|
||||
self.totp_entry.pack(fill="x", **entry_pad)
|
||||
self._field_frames["totp"] = f
|
||||
|
||||
# Skip status checks
|
||||
# --- database ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ctk.CTkLabel(f, text=t("database"), anchor="w").pack(fill="x", **pad)
|
||||
self.database_entry = ctk.CTkEntry(f, placeholder_text="mydb")
|
||||
self.database_entry.pack(fill="x", **entry_pad)
|
||||
self._field_frames["database"] = f
|
||||
|
||||
# --- db_index ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ctk.CTkLabel(f, text=t("db_index"), anchor="w").pack(fill="x", **pad)
|
||||
self.db_index_entry = ctk.CTkEntry(f, placeholder_text="0")
|
||||
self.db_index_entry.pack(fill="x", **entry_pad)
|
||||
self._field_frames["db_index"] = f
|
||||
|
||||
# --- api_token ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ctk.CTkLabel(f, text=t("api_token"), anchor="w").pack(fill="x", **pad)
|
||||
self.api_token_entry = ctk.CTkEntry(f, show="*", placeholder_text=t("placeholder_api_token"))
|
||||
self.api_token_entry.pack(fill="x", **entry_pad)
|
||||
self._field_frames["api_token"] = f
|
||||
|
||||
# --- use_ssl ---
|
||||
f = ctk.CTkFrame(self, fg_color="transparent")
|
||||
self.use_ssl_var = ctk.BooleanVar(value=False)
|
||||
self.use_ssl_cb = ctk.CTkCheckBox(f, text=t("use_ssl"), variable=self.use_ssl_var)
|
||||
self.use_ssl_cb.pack(fill="x", padx=20, pady=(8, 2))
|
||||
self._field_frames["use_ssl"] = f
|
||||
|
||||
# ── Always visible: Skip status checks ──
|
||||
self.skip_check_var = ctk.BooleanVar(value=False)
|
||||
self.skip_check_cb = ctk.CTkCheckBox(
|
||||
self, text=t("skip_check"), variable=self.skip_check_var
|
||||
)
|
||||
self.skip_check_cb.pack(fill="x", padx=20, pady=(8, 2))
|
||||
|
||||
# Notes
|
||||
# ── Always visible: Notes ──
|
||||
ctk.CTkLabel(self, text=t("notes"), anchor="w").pack(fill="x", **pad)
|
||||
self.notes_entry = ctk.CTkEntry(self, placeholder_text=t("placeholder_notes"))
|
||||
self.notes_entry.pack(fill="x", **entry_pad)
|
||||
|
||||
# Buttons
|
||||
# ── Always visible: Buttons ──
|
||||
btn_frame = ctk.CTkFrame(self, fg_color="transparent")
|
||||
btn_frame.pack(fill="x", padx=20, pady=(15, 20))
|
||||
ctk.CTkButton(btn_frame, text=t("cancel"), fg_color="#6b7280", command=self.destroy).pack(side="left", expand=True, padx=(0, 5))
|
||||
@@ -137,6 +196,10 @@ class ServerDialog(ctk.CTkToplevel):
|
||||
self.totp_entry.insert(0, server.get("totp_secret", ""))
|
||||
self.skip_check_var.set(server.get("skip_check", False))
|
||||
self.notes_entry.insert(0, server.get("notes", ""))
|
||||
self.database_entry.insert(0, server.get("database", ""))
|
||||
self.db_index_entry.insert(0, str(server.get("db_index", "")))
|
||||
self.api_token_entry.insert(0, server.get("api_token", ""))
|
||||
self.use_ssl_var.set(server.get("use_ssl", False))
|
||||
|
||||
# Restore network interface selection
|
||||
saved_ip = server.get("bind_interface")
|
||||
@@ -155,10 +218,23 @@ class ServerDialog(ctk.CTkToplevel):
|
||||
self._iface_menu.configure(values=current_values)
|
||||
self._iface_var.set(unavail_label)
|
||||
|
||||
# Apply field visibility for initial type
|
||||
self._apply_field_visibility(self.type_var.get())
|
||||
|
||||
def _apply_field_visibility(self, server_type: str):
|
||||
"""Hide all conditional fields, then show only those for the given type."""
|
||||
visible = set(FIELD_MAP.get(server_type, []))
|
||||
for name, frame in self._field_frames.items():
|
||||
if name in visible:
|
||||
frame.pack(fill="x", before=self.skip_check_cb)
|
||||
else:
|
||||
frame.pack_forget()
|
||||
|
||||
def _on_type_change(self, value):
|
||||
default_port = DEFAULT_PORTS.get(value, 22)
|
||||
self.port_entry.delete(0, "end")
|
||||
self.port_entry.insert(0, str(default_port))
|
||||
self._apply_field_visibility(value)
|
||||
|
||||
def _toggle_password(self):
|
||||
self._pass_visible = not self._pass_visible
|
||||
@@ -211,6 +287,32 @@ class ServerDialog(ctk.CTkToplevel):
|
||||
if bind_ip:
|
||||
server_data["bind_interface"] = bind_ip
|
||||
|
||||
# New conditional fields
|
||||
visible = set(FIELD_MAP.get(server_type, []))
|
||||
|
||||
if "database" in visible:
|
||||
db = self.database_entry.get().strip()
|
||||
if db:
|
||||
server_data["database"] = db
|
||||
|
||||
if "db_index" in visible:
|
||||
db_idx = self.db_index_entry.get().strip()
|
||||
if db_idx:
|
||||
try:
|
||||
server_data["db_index"] = int(db_idx)
|
||||
except ValueError:
|
||||
self._show_error(t("db_index_must_be_number"))
|
||||
return
|
||||
|
||||
if "api_token" in visible:
|
||||
token = self.api_token_entry.get().strip()
|
||||
if token:
|
||||
server_data["api_token"] = token
|
||||
|
||||
if "use_ssl" in visible:
|
||||
if self.use_ssl_var.get():
|
||||
server_data["use_ssl"] = True
|
||||
|
||||
try:
|
||||
if self.editing:
|
||||
if alias != self._original_alias and self.store.get_server(alias):
|
||||
|
||||
Reference in New Issue
Block a user