Compare commits

...

10 Commits

Author SHA1 Message Date
chrome-storm-c442
c21b263b24 v1.9.25: show server group in --list and --info CLI output
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 06:55:32 -05:00
chrome-storm-c442
464b803b42 v1.9.24: add --s3-create-bucket to CLI and skill
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 06:21:27 -05:00
chrome-storm-c442
bbef9ad014 v1.9.23: S3 create/delete bucket GUI buttons
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 06:16:50 -05:00
chrome-storm-c442
9f7fbb759f v1.9.22: add S3 bucket check rule to global CLAUDE.md installer
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 05:23:45 -05:00
chrome-storm-c442
16e69a2bd6 v1.9.21: update global CLAUDE.md installer — full command table for all server types
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 05:21:21 -05:00
chrome-storm-c442
bc4cf2b7a3 v1.9.20: Win32 restore watchdog — fix stuck minimized after Win+D
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 04:37:32 -05:00
chrome-storm-c442
35bdefba59 v1.9.19: fix offscreen window — validate saved geometry, reject -32000 coords
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 04:13:11 -05:00
chrome-storm-c442
d33f573483 v1.9.18: revert GUI to v1.9.14 state — fix broken window display
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 04:09:47 -05:00
chrome-storm-c442
cf319c502e v1.9.16: add --s3-url presigned URL command to ssh.py
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 04:05:00 -05:00
chrome-storm-c442
01ab318e4b v1.9.15: fix minimize/restore — remove grab_set, add Win32 restore fallback
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-05 03:58:32 -05:00
16 changed files with 271 additions and 83 deletions

View File

@@ -30,17 +30,39 @@ _BLOCK_START = "<!-- server-manager:start -->"
_BLOCK_END = "<!-- server-manager:end -->" _BLOCK_END = "<!-- server-manager:end -->"
GLOBAL_CLAUDE_MD_BLOCK = f"""{_BLOCK_START} GLOBAL_CLAUDE_MD_BLOCK = f"""{_BLOCK_START}
## Server Manager — управление серверами ## Серверы — ТОЛЬКО через /ssh
**ВСЕГДА** используй server manager для подключения к серверам. Никогда не используй `ssh`, `sshpass` или прямые подключения. **НИКОГДА не используй raw `ssh` команды.** НИКОГДА не читай `~/.ssh/config` для поиска серверов.
Все операции с серверами — **ТОЛЬКО через скилл `/ssh`** или напрямую через `ssh.py`:
- Скилл: `/ssh ALIAS "command"` — выполнить команду на сервере ```bash
- Список серверов: `python3 ~/.server-connections/ssh.py --list` python ~/.server-connections/ssh.py --list # список серверов (alias, тип, заметки)
- Документация: `~/.claude/commands/ssh.md` python ~/.server-connections/ssh.py --info ALIAS # инфо (без creds)
- Memory bank: проект `global-infrastructure` → `techContext.md` python ~/.server-connections/ssh.py --status # online/offline
- Инфраструктура: https://git.sensey24.ru/aibot777/infrastructure-docs ```
**Запрещено:** использовать `ssh`, `sshpass`, читать `~/.server-connections/` напрямую, раскрывать IP/пароли/порты. При вопросе о сервере — **СНАЧАЛА `--list`**, найди нужный алиас по заметкам и **ПРОВЕРЬ ТИП**.
Скрипт `ssh.py` сам читает credentials из зашифрованного хранилища. Claude НЕ видит IP, логины, пароли.
### КРИТИЧНО — команды зависят от типа сервера
**`ALIAS "command"` (shell) — ТОЛЬКО для типов `ssh` и `telnet`!**
| Тип | Команды |
|-----|---------|
| `ssh`/`telnet` | `ALIAS "cmd"`, `--upload ALIAS local remote`, `--download ALIAS remote local` |
| `s3` (MinIO и др.) | `--s3-buckets ALIAS`, `--s3-ls ALIAS bucket/prefix`, `--s3-upload ALIAS local bucket/key`, `--s3-download ALIAS bucket/key local`, `--s3-delete ALIAS bucket/key`, `--s3-url ALIAS bucket/key [SEC]`, `--s3-create-bucket ALIAS name` |
| `mariadb`/`mssql`/`postgresql` | `--sql ALIAS "SELECT ..."`, `--sql-databases ALIAS`, `--sql-tables ALIAS [db]` |
| `redis` | `--redis ALIAS "GET key"`, `--redis-info ALIAS`, `--redis-keys ALIAS "pattern"` |
| `grafana` | `--grafana-dashboards ALIAS`, `--grafana-alerts ALIAS` |
| `prometheus` | `--prom-query ALIAS "up"`, `--prom-targets ALIAS`, `--prom-alerts ALIAS` |
| `winrm` | `--ps ALIAS "Get-Process"`, `--cmd ALIAS "dir"` |
**Формат: `python ~/.server-connections/ssh.py КОМАНДА АЛИАС АРГУМЕНТЫ`** — алиас ВСЕГДА второй после команды.
**S3 правило:** перед `--s3-upload/download/delete` — СНАЧАЛА `--s3-buckets ALIAS` и `--s3-ls ALIAS bucket/` чтобы узнать реальные бакеты и пути. НЕ УГАДЫВАЙ имена бакетов!
**Запрещено:** использовать `ssh`/`sshpass`, читать `~/.server-connections/` напрямую, раскрывать IP/пароли/порты.
{_BLOCK_END} {_BLOCK_END}
""" """

View File

@@ -390,6 +390,12 @@ _EN = {
"s3_uploading_n": "Uploading {count} files...", "s3_uploading_n": "Uploading {count} files...",
"s3_uploaded_n": "Uploaded {count} files", "s3_uploaded_n": "Uploaded {count} files",
"s3_upload_partial": "Uploaded {ok}/{total} files", "s3_upload_partial": "Uploaded {ok}/{total} files",
"s3_create_bucket": "Create Bucket",
"s3_bucket_name_prompt": "Bucket name:",
"s3_delete_bucket": "Delete Bucket",
"s3_delete_bucket_confirm": "Delete bucket \"{name}\"? It must be empty.",
"s3_bucket_created": "Bucket \"{name}\" created",
"s3_bucket_deleted": "Bucket \"{name}\" deleted",
"s3_new_folder": "New Folder", "s3_new_folder": "New Folder",
"s3_folder_name_prompt": "Folder name:", "s3_folder_name_prompt": "Folder name:",
"s3_creating_folder": "Creating folder...", "s3_creating_folder": "Creating folder...",
@@ -907,6 +913,12 @@ _RU = {
"s3_uploading_n": "Загрузка {count} файлов...", "s3_uploading_n": "Загрузка {count} файлов...",
"s3_uploaded_n": "Загружено {count} файлов", "s3_uploaded_n": "Загружено {count} файлов",
"s3_upload_partial": "Загружено {ok}/{total} файлов", "s3_upload_partial": "Загружено {ok}/{total} файлов",
"s3_create_bucket": "Создать бакет",
"s3_bucket_name_prompt": "Имя бакета:",
"s3_delete_bucket": "Удалить бакет",
"s3_delete_bucket_confirm": "Удалить бакет \"{name}\"? Он должен быть пустым.",
"s3_bucket_created": "Бакет \"{name}\" создан",
"s3_bucket_deleted": "Бакет \"{name}\" удалён",
"s3_new_folder": "Новая папка", "s3_new_folder": "Новая папка",
"s3_folder_name_prompt": "Имя папки:", "s3_folder_name_prompt": "Имя папки:",
"s3_creating_folder": "Создание папки...", "s3_creating_folder": "Создание папки...",
@@ -1424,6 +1436,12 @@ _ZH = {
"s3_uploading_n": "正在上传 {count} 个文件...", "s3_uploading_n": "正在上传 {count} 个文件...",
"s3_uploaded_n": "已上传 {count} 个文件", "s3_uploaded_n": "已上传 {count} 个文件",
"s3_upload_partial": "已上传 {ok}/{total} 个文件", "s3_upload_partial": "已上传 {ok}/{total} 个文件",
"s3_create_bucket": "创建存储桶",
"s3_bucket_name_prompt": "存储桶名称:",
"s3_delete_bucket": "删除存储桶",
"s3_delete_bucket_confirm": "删除存储桶 \"{name}\"?必须为空。",
"s3_bucket_created": "存储桶 \"{name}\" 已创建",
"s3_bucket_deleted": "存储桶 \"{name}\" 已删除",
"s3_new_folder": "新建文件夹", "s3_new_folder": "新建文件夹",
"s3_folder_name_prompt": "文件夹名称:", "s3_folder_name_prompt": "文件夹名称:",
"s3_creating_folder": "创建文件夹中...", "s3_creating_folder": "创建文件夹中...",

View File

@@ -518,3 +518,29 @@ class S3Client:
return resp.get("ContentLength", 0) return resp.get("ContentLength", 0)
except Exception: except Exception:
return 0 return 0
def create_bucket(self, bucket_name: str) -> bool:
"""Create a new S3 bucket."""
if not self._ensure_connected():
return False
try:
self._client.create_bucket(Bucket=bucket_name)
self._last_ok = time.time()
log.info("S3 bucket created: %s", bucket_name)
return True
except Exception as exc:
log.error("S3 create_bucket failed: %s", exc)
return False
def delete_bucket(self, bucket_name: str) -> bool:
"""Delete an empty S3 bucket."""
if not self._ensure_connected():
return False
try:
self._client.delete_bucket(Bucket=bucket_name)
self._last_ok = time.time()
log.info("S3 bucket deleted: %s", bucket_name)
return True
except Exception as exc:
log.error("S3 delete_bucket failed: %s", exc)
return False

View File

@@ -2,6 +2,7 @@
Main application window — sidebar + tabview layout. Main application window — sidebar + tabview layout.
""" """
import sys
import tkinter import tkinter
import customtkinter as ctk import customtkinter as ctk
from tkinter import messagebox from tkinter import messagebox
@@ -91,7 +92,7 @@ class App(ctk.CTk):
# Restore saved window geometry or use default # Restore saved window geometry or use default
saved_geo = self.store._window_geometry saved_geo = self.store._window_geometry
if saved_geo: if saved_geo and self._is_valid_geometry(saved_geo):
self.geometry(saved_geo) self.geometry(saved_geo)
else: else:
self.geometry("1100x700") self.geometry("1100x700")
@@ -118,6 +119,32 @@ class App(ctk.CTk):
# Cleanup on close # Cleanup on close
self.protocol("WM_DELETE_WINDOW", self._on_close) self.protocol("WM_DELETE_WINDOW", self._on_close)
# Win32: restore window when stuck minimized after Win+D
self._restore_check_id = None
if sys.platform == "win32":
self.after(3000, self._start_restore_watchdog)
def _start_restore_watchdog(self):
"""Start periodic check for stuck minimized state (Windows only)."""
try:
import ctypes
self._user32 = ctypes.windll.user32
self._hwnd = int(self.wm_frame(), 16)
self._check_restore()
except Exception:
pass
def _check_restore(self):
"""If window is iconic but user clicked taskbar, force restore."""
try:
if self._user32.IsIconic(self._hwnd):
fg = self._user32.GetForegroundWindow()
if fg == self._hwnd:
self._user32.ShowWindow(self._hwnd, 9) # SW_RESTORE
except Exception:
pass
self._restore_check_id = self.after(500, self._check_restore)
def _build_layout(self): def _build_layout(self):
# PanedWindow — resizable sidebar | main area # PanedWindow — resizable sidebar | main area
self._paned = tkinter.PanedWindow( self._paned = tkinter.PanedWindow(
@@ -667,10 +694,31 @@ class App(ctk.CTk):
except Exception: except Exception:
pass pass
@staticmethod
def _is_valid_geometry(geo: str) -> bool:
"""Reject geometry with offscreen coordinates (e.g. minimized -32000)."""
try:
# format: WxH+X+Y or WxH-X-Y
import re
m = re.match(r"(\d+)x(\d+)([+-]\d+)([+-]\d+)", geo)
if not m:
return False
x, y = int(m.group(3)), int(m.group(4))
return -100 < x < 10000 and -100 < y < 10000
except Exception:
return False
def _on_close(self): def _on_close(self):
# Cancel restore watchdog
try:
if self._restore_check_id:
self.after_cancel(self._restore_check_id)
except Exception:
pass
# Save window geometry (size + position) and sidebar width # Save window geometry (size + position) and sidebar width
try: try:
self.store._window_geometry = self.geometry() geo = self.geometry()
self.store._window_geometry = geo if self._is_valid_geometry(geo) else None
# Save sidebar width from PanedWindow sash position # Save sidebar width from PanedWindow sash position
try: try:
sash_pos = self._paned.sash_coord(0) sash_pos = self._paned.sash_coord(0)

View File

@@ -33,12 +33,6 @@ class GroupDialog(ctk.CTkToplevel):
self.resizable(False, False) self.resizable(False, False)
self.transient(master) self.transient(master)
self.grab_set() self.grab_set()
self.protocol("WM_DELETE_WINDOW", self._on_close)
# Fix: restore dialog when parent is un-minimized
self._master_ref = master
master.bind("<Map>", self._on_parent_map, add="+")
self.bind("<Unmap>", self._on_unmap, add="+")
# ── Name ── # ── Name ──
ctk.CTkLabel(self, text=t("group_name"), anchor="w").pack( ctk.CTkLabel(self, text=t("group_name"), anchor="w").pack(
@@ -77,7 +71,7 @@ class GroupDialog(ctk.CTkToplevel):
btn_frame.pack(fill="x", padx=20, pady=(15, 10)) btn_frame.pack(fill="x", padx=20, pady=(15, 10))
ctk.CTkButton(btn_frame, text=t("cancel"), width=80, ctk.CTkButton(btn_frame, text=t("cancel"), width=80,
fg_color="gray", command=self._on_close).pack(side="left") fg_color="gray", command=self.destroy).pack(side="left")
ctk.CTkButton(btn_frame, text=t("save"), width=80, ctk.CTkButton(btn_frame, text=t("save"), width=80,
command=self._save).pack(side="right") command=self._save).pack(side="right")
@@ -96,34 +90,6 @@ class GroupDialog(ctk.CTkToplevel):
else: else:
btn.configure(border_color=fg) btn.configure(border_color=fg)
def _on_parent_map(self, event=None):
try:
if not self.winfo_exists():
return
self.deiconify()
self.lift()
self.focus_force()
self.grab_set()
except Exception:
pass
def _on_unmap(self, event=None):
try:
self.grab_release()
except Exception:
pass
def _on_close(self):
try:
self._master_ref.unbind("<Map>")
except Exception:
pass
try:
self.grab_release()
except Exception:
pass
self.destroy()
def _save(self): def _save(self):
name = self._name_var.get().strip() name = self._name_var.get().strip()
if not name: if not name:
@@ -141,4 +107,4 @@ class GroupDialog(ctk.CTkToplevel):
group = self.store.add_group(name, self._selected_color) group = self.store.add_group(name, self._selected_color)
self.result = group self.result = group
self._on_close() self.destroy()

View File

@@ -62,11 +62,6 @@ class ServerDialog(ctk.CTkToplevel):
# Release grab on close (prevents stuck app) # Release grab on close (prevents stuck app)
self.protocol("WM_DELETE_WINDOW", self._on_close) self.protocol("WM_DELETE_WINDOW", self._on_close)
# Fix: restore dialog when parent is un-minimized
self._master_ref = master
master.bind("<Map>", self._on_parent_map, add="+")
self.bind("<Unmap>", self._on_unmap, add="+")
self._field_frames: dict[str, ctk.CTkFrame] = {} self._field_frames: dict[str, ctk.CTkFrame] = {}
self._build_ui(server) self._build_ui(server)
@@ -490,31 +485,8 @@ class ServerDialog(ctk.CTkToplevel):
except ValueError as e: except ValueError as e:
self._show_error(str(e)) self._show_error(str(e))
def _on_parent_map(self, event=None):
"""Force-restore dialog when parent window is un-minimized."""
try:
if not self.winfo_exists():
return
self.deiconify()
self.lift()
self.focus_force()
self.grab_set()
except Exception:
pass
def _on_unmap(self, event=None):
"""Release grab when dialog is minimized to prevent input lock."""
try:
self.grab_release()
except Exception:
pass
def _on_close(self): def _on_close(self):
"""Release grab and destroy — prevents stuck app on minimize.""" """Release grab and destroy — prevents stuck app on minimize."""
try:
self._master_ref.unbind("<Map>")
except Exception:
pass
try: try:
self.grab_release() self.grab_release()
except Exception: except Exception:

View File

@@ -153,7 +153,24 @@ class S3Tab(ctk.CTkFrame):
bucket_frame, variable=self._bucket_var, values=[""], bucket_frame, variable=self._bucket_var, values=[""],
width=200, command=self._on_bucket_change, width=200, command=self._on_bucket_change,
) )
self._bucket_menu.pack(side="left", padx=(0, 15)) self._bucket_menu.pack(side="left", padx=(0, 5))
# Create bucket [+]
self._create_bucket_btn = ctk.CTkButton(
bucket_frame, text="+", width=28, height=28,
corner_radius=6, font=ctk.CTkFont(size=14, weight="bold"),
command=self._create_bucket,
)
self._create_bucket_btn.pack(side="left", padx=(0, 3))
# Delete bucket [🗑]
self._delete_bucket_btn = ctk.CTkButton(
bucket_frame, text="\U0001f5d1", width=28, height=28,
corner_radius=6, fg_color="#dc2626", hover_color="#b91c1c",
font=ctk.CTkFont(size=13),
command=self._delete_bucket,
)
self._delete_bucket_btn.pack(side="left", padx=(0, 15))
# Path display # Path display
self._path_label = ctk.CTkLabel( self._path_label = ctk.CTkLabel(
@@ -626,6 +643,64 @@ class S3Tab(ctk.CTkFrame):
threading.Thread(target=_do, daemon=True).start() threading.Thread(target=_do, daemon=True).start()
def _create_bucket(self):
"""Prompt for bucket name and create it."""
if not self._client:
return
dialog = ctk.CTkInputDialog(
text=t("s3_bucket_name_prompt"),
title=t("s3_create_bucket"),
)
name = dialog.get_input()
if not name or not name.strip():
return
name = name.strip()
self._status_label.configure(text="...")
def _do():
ok = self._client.create_bucket(name)
self.after(0, lambda: self._on_bucket_created(ok, name))
threading.Thread(target=_do, daemon=True).start()
def _on_bucket_created(self, ok: bool, name: str):
if ok:
self._status_label.configure(
text=t("s3_bucket_created").format(name=name))
self._current_bucket = name
self._load_buckets()
else:
self._status_label.configure(text=t("s3_folder_failed"))
def _delete_bucket(self):
"""Delete the currently selected bucket (must be empty)."""
if not self._client or not self._current_bucket:
return
from tkinter import messagebox
ok = messagebox.askyesno(
t("s3_delete_bucket"),
t("s3_delete_bucket_confirm").format(name=self._current_bucket),
)
if not ok:
return
bucket_name = self._current_bucket
self._status_label.configure(text="...")
def _do():
ok = self._client.delete_bucket(bucket_name)
self.after(0, lambda: self._on_bucket_deleted(ok, bucket_name))
threading.Thread(target=_do, daemon=True).start()
def _on_bucket_deleted(self, ok: bool, name: str):
if ok:
self._status_label.configure(
text=t("s3_bucket_deleted").format(name=name))
self._current_bucket = ""
self._load_buckets()
else:
self._status_label.configure(text=t("s3_delete_failed"))
def _go_back(self): def _go_back(self):
if self._nav_stack: if self._nav_stack:
self._current_prefix = self._nav_stack.pop() self._current_prefix = self._nav_stack.pop()

Binary file not shown.

View File

@@ -32,7 +32,7 @@
| `telnet` | `ALIAS "command"` (без SFTP/sudo/ключей) | `--upload`, `--download` | | `telnet` | `ALIAS "command"` (без SFTP/sudo/ключей) | `--upload`, `--download` |
| `mariadb` / `mssql` / `postgresql` | `--sql`, `--sql-databases`, `--sql-tables` | `ALIAS "command"` | | `mariadb` / `mssql` / `postgresql` | `--sql`, `--sql-databases`, `--sql-tables` | `ALIAS "command"` |
| `redis` | `--redis`, `--redis-info`, `--redis-keys` | `ALIAS "command"` | | `redis` | `--redis`, `--redis-info`, `--redis-keys` | `ALIAS "command"` |
| `s3` (MinIO, AWS S3, и др.) | `--s3-buckets`, `--s3-ls`, `--s3-upload`, `--s3-download`, `--s3-delete`, `--s3-url` | `ALIAS "command"`, `--upload`, `--download` | | `s3` (MinIO, AWS S3, и др.) | `--s3-buckets`, `--s3-ls`, `--s3-upload`, `--s3-download`, `--s3-delete`, `--s3-url`, `--s3-create-bucket` | `ALIAS "command"`, `--upload`, `--download` |
| `grafana` | `--grafana-dashboards`, `--grafana-alerts` | `ALIAS "command"` | | `grafana` | `--grafana-dashboards`, `--grafana-alerts` | `ALIAS "command"` |
| `prometheus` | `--prom-query`, `--prom-targets`, `--prom-alerts` | `ALIAS "command"` | | `prometheus` | `--prom-query`, `--prom-targets`, `--prom-alerts` | `ALIAS "command"` |
| `winrm` | `--ps`, `--cmd` | `ALIAS "command"` | | `winrm` | `--ps`, `--cmd` | `ALIAS "command"` |
@@ -64,7 +64,7 @@ python ~/.server-connections/ssh.py --sql-databases "mariadb-alias"
## Общие команды ## Общие команды
### Список серверов (безопасный — alias, тип, ключ, заметки) ### Список серверов (безопасный — alias, тип, группа, ключ, заметки)
```bash ```bash
python ~/.server-connections/ssh.py --list python ~/.server-connections/ssh.py --list
``` ```
@@ -213,6 +213,11 @@ python ~/.server-connections/ssh.py --s3-url ALIAS bucket/key 86400
``` ```
По умолчанию ссылка действует 1 час (3600 сек). Второй аргумент — время жизни в секундах (например 86400 = 24 часа). По умолчанию ссылка действует 1 час (3600 сек). Второй аргумент — время жизни в секундах (например 86400 = 24 часа).
### Создать бакет
```bash
python ~/.server-connections/ssh.py --s3-create-bucket ALIAS bucket-name
```
### Типичный workflow: "создай папку и залей файл" ### Типичный workflow: "создай папку и залей файл"
```bash ```bash
# 1. Посмотри бакеты # 1. Посмотри бакеты

View File

@@ -42,6 +42,8 @@ S3 (type: s3):
python ssh.py --s3-upload ALIAS local bucket/key # upload file python ssh.py --s3-upload ALIAS local bucket/key # upload file
python ssh.py --s3-download ALIAS bucket/key local # download file python ssh.py --s3-download ALIAS bucket/key local # download file
python ssh.py --s3-delete ALIAS bucket/key # delete object python ssh.py --s3-delete ALIAS bucket/key # delete object
python ssh.py --s3-url ALIAS bucket/key [SEC] # presigned URL (default 3600s)
python ssh.py --s3-create-bucket ALIAS name # create bucket
WinRM (type: winrm): WinRM (type: winrm):
python ssh.py --ps ALIAS "Get-Process" # PowerShell via WinRM python ssh.py --ps ALIAS "Get-Process" # PowerShell via WinRM
@@ -100,6 +102,11 @@ def load_servers():
return data, {s["alias"]: s for s in data.get("servers", [])} return data, {s["alias"]: s for s in data.get("servers", [])}
def _group_map(data: dict) -> dict:
"""Map group UUID → group name."""
return {g["id"]: g.get("name", "") for g in data.get("groups", [])}
def save_servers(data): def save_servers(data):
servers_file = _get_servers_file() servers_file = _get_servers_file()
text = json.dumps(data, indent=2, ensure_ascii=False) text = json.dumps(data, indent=2, ensure_ascii=False)
@@ -777,7 +784,8 @@ def ping_server(server: dict):
def list_servers(full=False): def list_servers(full=False):
_, servers = load_servers() data, servers = load_servers()
groups = _group_map(data)
if full: if full:
# WARNING: full mode shows sensitive data (IP, port, user) # WARNING: full mode shows sensitive data (IP, port, user)
# Only for local/manual use, NEVER through AI API # Only for local/manual use, NEVER through AI API
@@ -789,13 +797,14 @@ def list_servers(full=False):
print(f"{alias:<20} {s['ip']:<20} {s.get('port', 22):<8} {s.get('user', 'root'):<10} {has_key:<6}") print(f"{alias:<20} {s['ip']:<20} {s.get('port', 22):<8} {s.get('user', 'root'):<10} {has_key:<6}")
else: else:
# Safe mode: only aliases (no IPs, ports, users) # Safe mode: only aliases (no IPs, ports, users)
print(f"{'Alias':<20} {'Type':<10} {'Key':<6} {'Notes'}") print(f"{'Alias':<20} {'Type':<10} {'Group':<14} {'Key':<6} {'Notes'}")
print("-" * 70) print("-" * 80)
for alias, s in servers.items(): for alias, s in servers.items():
has_key = "yes" if os.path.exists(SSH_KEY_PATH) else "no" has_key = "yes" if os.path.exists(SSH_KEY_PATH) else "no"
stype = s.get("type", "ssh") stype = s.get("type", "ssh")
group_name = groups.get(s.get("group", ""), "-")
notes = s.get("notes", "") notes = s.get("notes", "")
print(f"{alias:<20} {stype:<10} {has_key:<6} {notes}") print(f"{alias:<20} {stype:<10} {group_name:<14} {has_key:<6} {notes}")
def _resolve_alias(alias: str, servers: dict) -> str: def _resolve_alias(alias: str, servers: dict) -> str:
@@ -829,12 +838,16 @@ def _resolve_alias(alias: str, servers: dict) -> str:
def server_info(alias: str): def server_info(alias: str):
"""Show server info safe for AI context — NO ip, user, password, port, totp_secret.""" """Show server info safe for AI context — NO ip, user, password, port, totp_secret."""
_, servers = load_servers() data, servers = load_servers()
groups = _group_map(data)
alias = _resolve_alias(alias, servers) alias = _resolve_alias(alias, servers)
s = servers[alias] s = servers[alias]
has_key = "yes" if os.path.exists(SSH_KEY_PATH) else "no" has_key = "yes" if os.path.exists(SSH_KEY_PATH) else "no"
print(f"Alias: {s['alias']}") print(f"Alias: {s['alias']}")
print(f"Type: {s.get('type', 'ssh')}") print(f"Type: {s.get('type', 'ssh')}")
group_name = groups.get(s.get("group", ""), "")
if group_name:
print(f"Group: {group_name}")
print(f"Key: {has_key}") print(f"Key: {has_key}")
print(f"Auth: {s.get('auth', 'password')}") print(f"Auth: {s.get('auth', 'password')}")
print(f"2FA: {'yes' if s.get('totp_secret') else 'no'}") print(f"2FA: {'yes' if s.get('totp_secret') else 'no'}")
@@ -1459,6 +1472,38 @@ def s3_delete(server: dict, remote_path: str):
sys.exit(1) sys.exit(1)
def s3_url(server: dict, remote_path: str, expires: int = 3600):
"""Generate a presigned URL for an S3 object."""
client = _get_s3_client(server)
parts = remote_path.split("/", 1)
bucket = parts[0] if parts else server.get("bucket", "")
key = parts[1] if len(parts) > 1 else ""
if not bucket or not key:
print("ERROR: Usage: --s3-url ALIAS bucket/key [seconds]", file=sys.stderr)
sys.exit(1)
try:
url = client.generate_presigned_url(
"get_object",
Params={"Bucket": bucket, "Key": key},
ExpiresIn=expires,
)
print(url)
except Exception as e:
print(f"ERROR: {e}", file=sys.stderr)
sys.exit(1)
def s3_create_bucket(server: dict, bucket_name: str):
"""Create a new S3 bucket."""
client = _get_s3_client(server)
try:
client.create_bucket(Bucket=bucket_name)
print(f"Bucket created: {bucket_name}")
except Exception as e:
print(f"ERROR: {e}", file=sys.stderr)
sys.exit(1)
# ── Grafana commands ────────────────────────────────── # ── Grafana commands ──────────────────────────────────
def _grafana_request(server: dict, endpoint: str) -> dict: def _grafana_request(server: dict, endpoint: str) -> dict:
@@ -1763,6 +1808,17 @@ def main():
alias = _resolve_alias(sys.argv[2], servers) alias = _resolve_alias(sys.argv[2], servers)
s3_delete(servers[alias], sys.argv[3]) s3_delete(servers[alias], sys.argv[3])
sys.exit(0) sys.exit(0)
if cmd == "--s3-url" and len(sys.argv) >= 4:
_, servers = load_servers()
alias = _resolve_alias(sys.argv[2], servers)
expires = int(sys.argv[4]) if len(sys.argv) >= 5 else 3600
s3_url(servers[alias], sys.argv[3], expires)
sys.exit(0)
if cmd == "--s3-create-bucket" and len(sys.argv) >= 4:
_, servers = load_servers()
alias = _resolve_alias(sys.argv[2], servers)
s3_create_bucket(servers[alias], sys.argv[3])
sys.exit(0)
# ── Grafana commands ── # ── Grafana commands ──
if cmd == "--grafana-dashboards" and len(sys.argv) >= 3: if cmd == "--grafana-dashboards" and len(sys.argv) >= 3:

View File

@@ -1,6 +1,6 @@
"""Version info for ServerManager.""" """Version info for ServerManager."""
__version__ = "1.9.14" __version__ = "1.9.25"
__app_name__ = "ServerManager" __app_name__ = "ServerManager"
__author__ = "aibot777" __author__ = "aibot777"
__description__ = "Desktop GUI for managing remote servers" __description__ = "Desktop GUI for managing remote servers"