fixed vnc embedded

Author: buzzqw

gtk3/PCM.py

@@ -1078,6 +1078,8 @@ def _apri_rdp(self, nome: str, dati: dict):
 
     def _apri_vnc(self, nome: str, dati: dict):
         self._resolve_credentials(dati)
+        sftp_enabled = dati.get("sftp_browser", False)
+
         if dati.get("vnc_internal", False):
             # Viewer integrato
             def _salva_password_vnc(pwd: str):
@@ -1095,16 +1097,81 @@ def _salva_password_vnc(pwd: str):
                 except Exception:
                     pass
 
-            widget = VncWebWidget(
-                host=dati.get("host",""),
-                port=dati.get("port","5900"),
-                password=dati.get("password",""),
-                color_depth=dati.get("vnc_color", 0),
-                quality=dati.get("vnc_quality", 2),
-                on_save_password=_salva_password_vnc,
-            )
-            widget.show_all()
-            container = self._sftp_browser_paned(widget, dati)
+            if sftp_enabled:
+                # Pannello SFTP differito: aperto solo dopo che VNC è connesso
+                # e solo se la porta SSH risponde.
+                ssh_host = dati.get("host", "")
+                ssh_port = int(dati.get("mon_ssh_port", 22))
+                sftp_dati = dict(dati)
+                sftp_dati["port"] = ssh_port
+
+                ph_lbl = Gtk.Label(label="In attesa della connessione VNC…")
+                ph_lbl.set_valign(Gtk.Align.CENTER)
+                ph_lbl.set_halign(Gtk.Align.CENTER)
+                ph_lbl.set_line_wrap(True)
+                ph_lbl.set_margin_start(8)
+                ph_lbl.set_margin_end(8)
+                placeholder = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+                placeholder.set_size_request(220, -1)
+                placeholder.pack_start(ph_lbl, True, True, 0)
+
+                paned = Gtk.Paned(orientation=Gtk.Orientation.HORIZONTAL)
+
+                def _on_vnc_ready():
+                    import socket as _sock
+                    ph_lbl.set_text(f"Verifica SSH {ssh_host}:{ssh_port}…")
+
+                    def _probe():
+                        try:
+                            s = _sock.create_connection((ssh_host, ssh_port), timeout=3)
+                            s.close()
+                            GLib.idle_add(_ssh_aperta)
+                        except OSError:
+                            GLib.idle_add(_ssh_chiusa)
+
+                    def _ssh_aperta():
+                        sftp = SftpBrowserWidget(
+                            sftp_dati,
+                            on_apri_editor=lambda c, p: self._apri_sftp_editor(c, p),
+                        )
+                        paned.remove(placeholder)
+                        paned.pack2(sftp, False, False)
+                        sftp.show_all()
+
+                    def _ssh_chiusa():
+                        ph_lbl.set_markup(
+                            f"<small>Porta SSH {ssh_port}\nnon raggiungibile\nsu {ssh_host}</small>"
+                        )
+
+                    threading.Thread(target=_probe, daemon=True).start()
+
+                widget = VncWebWidget(
+                    host=dati.get("host", ""),
+                    port=dati.get("port", "5900"),
+                    password=dati.get("password", ""),
+                    color_depth=dati.get("vnc_color", 0),
+                    quality=dati.get("vnc_quality", 2),
+                    on_save_password=_salva_password_vnc,
+                    on_vnc_ready=_on_vnc_ready,
+                )
+                widget.show_all()
+                paned.pack1(widget, True, True)
+                paned.pack2(placeholder, False, True)
+                paned.set_position(700)
+                paned.show_all()
+                container = paned
+            else:
+                widget = VncWebWidget(
+                    host=dati.get("host", ""),
+                    port=dati.get("port", "5900"),
+                    password=dati.get("password", ""),
+                    color_depth=dati.get("vnc_color", 0),
+                    quality=dati.get("vnc_quality", 2),
+                    on_save_password=_salva_password_vnc,
+                )
+                widget.show_all()
+                container = widget
+
             container._pcm_dati = dati
             self._append_tab(container, nome, lambda: self._chiudi_tab(container))
         else:
@@ -1119,7 +1186,58 @@ def _salva_password_vnc(pwd: str):
             widget = TerminalWidget.da_profilo(dati)
             widget.comando_display = nome
             widget.show_all()
-            container = self._sftp_browser_paned(widget, dati)
+
+            if sftp_enabled:
+                # Pannello SFTP differito: probe SSH in background senza attendere VNC
+                ssh_host = dati.get("host", "")
+                ssh_port = int(dati.get("mon_ssh_port", 22))
+                sftp_dati = dict(dati)
+                sftp_dati["port"] = ssh_port
+
+                ph_lbl = Gtk.Label(label=f"Verifica SSH {ssh_host}:{ssh_port}…")
+                ph_lbl.set_valign(Gtk.Align.CENTER)
+                ph_lbl.set_halign(Gtk.Align.CENTER)
+                ph_lbl.set_line_wrap(True)
+                ph_lbl.set_margin_start(8)
+                ph_lbl.set_margin_end(8)
+                placeholder = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+                placeholder.set_size_request(220, -1)
+                placeholder.pack_start(ph_lbl, True, True, 0)
+
+                paned = Gtk.Paned(orientation=Gtk.Orientation.HORIZONTAL)
+                paned.pack1(widget, True, True)
+                paned.pack2(placeholder, False, True)
+                paned.set_position(700)
+                paned.show_all()
+                container = paned
+
+                def _ssh_aperta_ext():
+                    sftp = SftpBrowserWidget(
+                        sftp_dati,
+                        on_apri_editor=lambda c, p: self._apri_sftp_editor(c, p),
+                    )
+                    paned.remove(placeholder)
+                    paned.pack2(sftp, False, False)
+                    sftp.show_all()
+
+                def _ssh_chiusa_ext():
+                    ph_lbl.set_markup(
+                        f"<small>Porta SSH {ssh_port}\nnon raggiungibile\nsu {ssh_host}</small>"
+                    )
+
+                def _probe_ext():
+                    import socket as _sock
+                    try:
+                        s = _sock.create_connection((ssh_host, ssh_port), timeout=3)
+                        s.close()
+                        GLib.idle_add(_ssh_aperta_ext)
+                    except OSError:
+                        GLib.idle_add(_ssh_chiusa_ext)
+
+                threading.Thread(target=_probe_ext, daemon=True).start()
+            else:
+                container = widget
+
             container._pcm_dati = dati
             self._append_tab(container, nome)
             GLib.idle_add(widget.grab_focus)

gtk3/sftp_browser.py

@@ -166,16 +166,49 @@ def _init_ui(self):
     # ------------------------------------------------------------------
 
     def _connetti(self):
-        try:
-            host = self._profilo.get("host", "")
-            port = int(self._profilo.get("port", 22))
+        import socket as _socket
+
+        host = self._profilo.get("host", "")
+        if not host:
+            GLib.idle_add(self._set_status, "Host non configurato")
+            return
+
+        port = int(self._profilo.get("port", 22))
+        pkey = self._profilo.get("private_key", "")
+
+        # Per VNC/RDP la password del profilo è quella VNC/RDP, non SSH.
+        proto = self._profilo.get("protocol", "ssh")
+        if proto in ("vnc", "rdp"):
+            user = ""
+            pwd  = ""
+        else:
             user = self._profilo.get("user", "")
             pwd  = self._profilo.get("password", "")
-            pkey = self._profilo.get("private_key", "")
 
+        # Verifica raggiungibilità porta SSH prima di tentare l'auth.
+        # Una semplice probe TCP non scatena fail2ban.
+        GLib.idle_add(self._set_status, f"Verifica SSH {host}:{port}…")
+        try:
+            probe = _socket.create_connection((host, port), timeout=3)
+            probe.close()
+        except OSError:
+            GLib.idle_add(self._set_status, f"SSH non disponibile su {host}:{port}")
+            return
+
+        # Porta aperta ma credenziali SSH mancanti: chiedi all'utente.
+        if not user:
+            creds = [None]
+            done  = threading.Event()
+            GLib.idle_add(self._mostra_dialog_credenziali_ssh, host, port, creds, done)
+            done.wait(timeout=120)
+            if not creds[0]:
+                GLib.idle_add(self._set_status, "Connessione SSH annullata")
+                return
+            user, pwd = creds[0]
+
+        GLib.idle_add(self._set_status, f"Connessione SSH {user}@{host}:{port}…")
+        try:
             self._ssh = paramiko.SSHClient()
-            # RejectPolicy: rifiuta host sconosciuti invece di accettarli silenziosamente.
-            # known_hosts dell'utente viene caricato automaticamente da load_system_host_keys().
             self._ssh.load_system_host_keys()
             if self._profilo.get("strict_host", False):
                 self._ssh.set_missing_host_key_policy(paramiko.RejectPolicy())
@@ -191,7 +224,6 @@ def _connetti(self):
             self._ssh.connect(**kwargs)
             self._sftp = self._ssh.open_sftp()
 
-            # Home directory
             _, stdout, _ = self._ssh.exec_command("echo $HOME")
             home = stdout.read().decode().strip() or "/"
             self._cwd = home
@@ -200,7 +232,6 @@ def _connetti(self):
         except paramiko.ssh_exception.SSHException as e:
             msg = str(e)
             if "not found in known_hosts" in msg or "Unknown server" in msg.lower():
-                # Host non presente nei known_hosts: mostra istruzioni all'utente
                 avviso = (
                     f"Chiave host di '{host}' non trovata nei known_hosts.\n"
                     f"Verifica l'impronta con il server e aggiungi manualmente:\n"
@@ -213,6 +244,53 @@ def _connetti(self):
         except Exception as e:
             GLib.idle_add(self._set_status, t("sftp.err_connect").format(e=e))
 
+    def _mostra_dialog_credenziali_ssh(self, host: str, port: int,
+                                       creds: list, done: threading.Event):
+        """Dialog GTK per inserire username/password SSH. Chiamato sul main thread."""
+        parent = self.get_toplevel()
+        parent = parent if isinstance(parent, Gtk.Window) else None
+        dlg = Gtk.Dialog(
+            title=f"Credenziali SSH — {host}:{port}",
+            transient_for=parent,
+            modal=True,
+        )
+        dlg.add_buttons("Annulla", Gtk.ResponseType.CANCEL,
+                         "Connetti",  Gtk.ResponseType.OK)
+        dlg.set_default_response(Gtk.ResponseType.OK)
+
+        area = dlg.get_content_area()
+        area.set_spacing(6)
+        area.set_margin_start(12)
+        area.set_margin_end(12)
+        area.set_margin_top(8)
+        area.set_margin_bottom(8)
+
+        grid = Gtk.Grid(row_spacing=6, column_spacing=8)
+        lbl_u = Gtk.Label(label="Utente SSH:", xalign=1.0)
+        ent_u = Gtk.Entry()
+        ent_u.set_hexpand(True)
+        ent_u.set_activates_default(True)
+        lbl_p = Gtk.Label(label="Password SSH:", xalign=1.0)
+        ent_p = Gtk.Entry()
+        ent_p.set_visibility(False)
+        ent_p.set_hexpand(True)
+        ent_p.set_activates_default(True)
+        grid.attach(lbl_u, 0, 0, 1, 1)
+        grid.attach(ent_u, 1, 0, 1, 1)
+        grid.attach(lbl_p, 0, 1, 1, 1)
+        grid.attach(ent_p, 1, 1, 1, 1)
+        area.pack_start(grid, False, False, 0)
+        dlg.show_all()
+
+        resp = dlg.run()
+        user = ent_u.get_text().strip()
+        pwd  = ent_p.get_text()
+        dlg.destroy()
+
+        if resp == Gtk.ResponseType.OK and user:
+            creds[0] = (user, pwd)
+        done.set()
+
     # ------------------------------------------------------------------
     # Navigazione
     # ------------------------------------------------------------------

gtk3/vnc_widget.py

@@ -56,12 +56,14 @@ def _find_vnc_client() -> str | None:
 
 class _VncGtkVnc(Gtk.Box):
 
-    def __init__(self, host, port, password, color_depth=0, quality=2, on_save_password=None):
+    def __init__(self, host, port, password, color_depth=0, quality=2,
+                 on_save_password=None, on_vnc_ready=None):
         super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=0)
         self._host = host
         self._port = str(port)
         self._password = password
         self._on_save_password = on_save_password
+        self._on_vnc_ready = on_vnc_ready
         self._closed = False
         self._scaling = True
         self._pointer_local = False
@@ -279,6 +281,8 @@ def _on_initialized(self, d):
             f"VNC — {self._host}:{self._port}"
             + (f"  [{nome}]" if nome else "")
         )
+        if self._on_vnc_ready:
+            self._on_vnc_ready()
 
     def _on_disconnected(self, d):
         if not self._closed:
@@ -450,11 +454,12 @@ class _VncSocket(Gtk.Box):
         "xvnc4viewer":    ("-Parent {}",    "-passwd {}"),
     }
 
-    def __init__(self, host, port, password):
+    def __init__(self, host, port, password, on_vnc_ready=None):
         super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=0)
         self._host = host
         self._port = str(port)
         self._password = password
+        self._on_vnc_ready = on_vnc_ready
         self._client = _find_vnc_client()
         self._proc = None
         self._closed = False
@@ -563,6 +568,8 @@ def _write_passwd_file(password):
 
     def _on_plug_added(self, s):
         self._lbl.set_text(f"VNC → {self._host}:{self._port}")
+        if self._on_vnc_ready:
+            self._on_vnc_ready()
 
     def _on_plug_removed(self, s):
         if not self._closed:
@@ -628,7 +635,8 @@ def chiudi_processo(self):
 # ---------------------------------------------------------------------------
 
 def VncWebWidget(host: str, port: str = "5900", password: str = "",
-                  color_depth: int = 0, quality: int = 2, on_save_password=None):
+                  color_depth: int = 0, quality: int = 2,
+                  on_save_password=None, on_vnc_ready=None):
     """
     Restituisce il miglior widget VNC disponibile:
       1. gtk-vnc nativo (gir1.2-gtk-vnc-2.0)  — toolbar completa
@@ -637,11 +645,14 @@ def VncWebWidget(host: str, port: str = "5900", password: str = "",
 
     color_depth: 0=32bpp, 1=16bpp, 2=8bpp
     quality:     0=best,  1=good,  2=fast
+    on_vnc_ready: callable() invocato sul main thread quando VNC è connesso
     """
     if _GTKV_OK:
         return _VncGtkVnc(host=host, port=port, password=password,
                           color_depth=color_depth, quality=quality,
-                          on_save_password=on_save_password)
+                          on_save_password=on_save_password,
+                          on_vnc_ready=on_vnc_ready)
     if _find_vnc_client():
-        return _VncSocket(host=host, port=port, password=password)
+        return _VncSocket(host=host, port=port, password=password,
+                          on_vnc_ready=on_vnc_ready)
     return _VncNoDriver(host=host, port=port)