Attachment 687779 Details for Bug 904295 – Proof of concept patch (please don't mind my complete ignorance when it comes to Python)

[patch] Proof of concept patch (please don't mind my complete ignorance when it comes to Python)

virt-manager-console-use-tls.patch (text/plain), 1.81 KB, created by Anthony Messina on 2013-01-26 01:08:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anthony Messina

Created: 2013-01-26 01:08:13 UTC

Size: 1.81 KB

patch

obsolete

>--- console.py	2013-01-25 18:59:31.433046035 -0600
>+++ /usr/share/virt-manager/virtManager/console.py	2013-01-25 18:58:49.568576453 -0600
>@@ -72,6 +72,11 @@
>         if self._connhost.count(":"):
>             self._connhost, self._connport = self._connhost.split(":", 1)
> 
>+        if gdev.tlsPort:
>+            self._connport = gdev.tlsPort
>+            self.gtlsport = gdev.tlsPort
>+            self.gport  = self.gtlsport
>+
>     def need_tunnel(self):
>         if self.gaddr != "127.0.0.1":
>             return False
>@@ -81,13 +86,14 @@
>     def get_conn_host(self):
>         host = self._connhost
>         port = self._connport
>+        tls_port = self.gtlsport
> 
>         if not self.need_tunnel():
>             port = self.gport
>             if self.gaddr != "0.0.0.0":
>                 host = self.gaddr
> 
>-        return host, port
>+        return host, port, tls_port
> 
>     def logstring(self):
>         return ("proto=%s trans=%s connhost=%s connuser=%s "
>@@ -525,14 +531,20 @@
>         return self.display_channel.get_properties("width", "height")
> 
>     def open_host(self, ginfo, password=None):
>-        host, port = ginfo.get_conn_host()
>+        host, port, tls_port = ginfo.get_conn_host()
> 
>         uri = "spice://"
>-        uri += str(host) + "?port=" + str(port)
>-        logging.debug("spice uri: %s", uri)
> 
>         self.spice_session = spice.Session()
>+
>+        if tls_port > 0:
>+            uri += str(host) + "?tls-port=" + str(tls_port)
>+            self.spice_session.set_property("ca_file", os.getenv("HOME") + "/.pki/CA/ca-cert.pem")
>+        else:
>+            uri += str(host) + "?port=" + str(port)
>+
>         self.spice_session.set_property("uri", uri)
>+
>         if password:
>             self.spice_session.set_property("password", password)
>         gobject.GObject.connect(self.spice_session, "channel-new",

Actions: View | Diff

Attachments on bug 904295: 687779