Merge lp:~brandontschaefer/libertine/maliit-server-proxy into lp:libertine

[Brandon Schaefer]

Set up a new proxy socket for the maliit server.

Set up a new proxy socket for the maliit server.

We now setup a mapping between the host socket and the address so when we find a socket in the mapping we can send it up to create a new connection for that address and socket.

We also attempt a bit more error handling if we cannot find dbus or maliit socket. Attempt to clean it up if something goes wrong.

The maliit server is not required, so we dont exit if we fail. DBus is.

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:227
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/221/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/224
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/183/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/183/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/183/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/183/console
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1119/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/221/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Broke something will have to look at

[Brandon Schaefer (brandontschaefer)]

Ok turns out, if you attempt to get the dbus address *before* you open to socket you'll have a bad time. Though im still not 100% why we cant ask for the env variable (though i tired and it didnt work) Soo theres a reason :).

So right now we've two types of proxy sockets, required and optional.

Required:
DBus socket

Optional:
Maliit socket

The optional one, we pass an any exception we hit while attempting to creating it and just attempt to move on. If its a major issue such as memory something else with hit that exception. The key part is we clean up the socket if any errors happen now. Which with real file sockets is annoying to deal with :)

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:228
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/223/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/226
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/185/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/185/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/185/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/185/console
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1121/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/223/rebuild

review: Needs Fixing (continuous-integration)

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:228
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/224/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/227
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/186/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/186/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/186/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/186/console
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1122/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/224/rebuild

review: Needs Fixing (continuous-integration)

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:228
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/225/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/228
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/187/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/187/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/187/console
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/187/console
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1123/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/225/rebuild

review: Needs Fixing (continuous-integration)

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:228
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/232/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/235
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/194
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/194/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/194
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/194/console
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1130/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/232/rebuild

review: Needs Fixing (continuous-integration)

[lp:~brandontschaefer/libertine/maliit-server-proxy]

229. By Brandon Schaefer on 2016-05-19

* We now depend on python3-dbus
* Missing new line

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:229
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/236/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/239
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/198
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/198/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/198
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/198/console
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1134/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/236/rebuild

review: Needs Fixing (continuous-integration)

[lp:~brandontschaefer/libertine/maliit-server-proxy]

230. By Brandon Schaefer on 2016-05-19

* Opps need build depends!

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:230
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/237/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/240
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/199
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/199
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/199
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/199
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1135/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/237/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

I seem to remember that some package or packages have to be installed inside the container as well to make this work. Do we need to seed any packages for this?

review: Needs Information

[lp:~brandontschaefer/libertine/maliit-server-proxy]

231. By Brandon Schaefer on 2016-05-20

* Seed maliit input contexts gtk/qt

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:231
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/239/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/242
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/201
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/201
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/201
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/201
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1137/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/239/rebuild

review: Approve (continuous-integration)

[lp:~brandontschaefer/libertine/maliit-server-proxy]

232. By Brandon Schaefer on 2016-06-02

* Dont seed these packages until they are working!

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:232
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/243/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/246
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/205
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/205
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/205
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/205
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1141/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/243/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, looks good to me for getting the base parts of this in.

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-05-19 19:55:34 +0000
+++ debian/control	2016-06-02 18:43:46 +0000
@@ -22,6 +22,7 @@
                python3-psutil,
                python3-testtools,
                python3-xdg,
+               python3-dbus,
                qtdeclarative5-dev
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/libertine
@@ -32,6 +33,7 @@
          python3-libertine-lxc,
          qml-module-qtquick2,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         python3-dbus,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: sandbox for running deb-packaged X11 apps on Ubuntu Personal

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-05-16 20:11:01 +0000
+++ python/libertine/Libertine.py	2016-06-02 18:43:46 +0000
@@ -77,7 +77,9 @@
         self.container_type = 'unknown'
         self.container_id = container_id
         self.root_path = libertine.utils.get_libertine_container_rootfs_path(self.container_id)
-        self.default_packages = ['matchbox', 'libnss-extrausers', 'software-properties-common',
+        self.default_packages = ['matchbox',
+                                 'libnss-extrausers',
+                                 'software-properties-common',
                                  'humanity-icon-theme']
 
     def create_libertine_container(self, password=None, multiarch=False, verbosity=1):

=== modified file 'tools/libertine-launch'
--- tools/libertine-launch	2016-05-05 20:41:46 +0000
+++ tools/libertine-launch	2016-06-02 18:43:46 +0000
@@ -25,18 +25,36 @@
 from libertine import LibertineContainer
 
 
-def set_dbus_session_socket_path():
+def get_session_socket_path(session_socket_name):
     unique_id = os.environ['DISPLAY'].strip(':')
 
     if not os.path.exists(libertine.utils.get_libertine_runtime_dir()):
         os.makedirs(libertine.utils.get_libertine_runtime_dir())
 
-    dbus_session_socket_path = (
-        os.path.join(libertine.utils.get_libertine_runtime_dir(), 'host_dbus_session' + unique_id))
-
-    os.environ['DBUS_SESSION_BUS_ADDRESS'] = "unix:path=" + dbus_session_socket_path
-
-    return dbus_session_socket_path
+    session_socket_path = (
+        os.path.join(libertine.utils.get_libertine_runtime_dir(), session_socket_name + unique_id))
+
+    return session_socket_path
+
+
+def get_dbus_session_socket_path():
+    return get_session_socket_path('host_dbus_session')
+
+
+def get_maliit_session_socket_path():
+    return get_session_socket_path('host_maliit_session')
+
+
+def set_env_socket_path(session_socket_path, session_env):
+    os.environ[session_env] = "unix:path=" + session_socket_path
+
+
+def set_dbus_env_socket_path(socket_path):
+    set_env_socket_path(socket_path, 'DBUS_SESSION_BUS_ADDRESS')
+
+
+def set_maliit_env_socket_path(socket_path):
+    set_env_socket_path(socket_path, 'MALIIT_SERVER_ADDRESS')
 
 
 def launch_libertine_session_bridge(session_socket_path):
@@ -74,11 +92,17 @@
         if e in os.environ:
             del os.environ[e]
 
-    session_socket_path = set_dbus_session_socket_path()
-
-    session_bridge = launch_libertine_session_bridge(session_socket_path)
-
-    detect_session_bridge_socket(session_socket_path)
+    dbus_socket_path = get_dbus_session_socket_path()
+    maliit_socket_path = get_maliit_session_socket_path()
+    session_bridge_arguments = dbus_socket_path + ' ' + maliit_socket_path
+
+    session_bridge = launch_libertine_session_bridge(session_bridge_arguments)
+
+    set_dbus_env_socket_path(dbus_socket_path)
+    set_maliit_env_socket_path(maliit_socket_path)
+
+    # should detect the maliit socket, but dont know if its around or not here.
+    detect_session_bridge_socket(dbus_socket_path)
 
     container = LibertineContainer(args.container_id) 
 

=== modified file 'tools/libertine-session-bridge'
--- tools/libertine-session-bridge	2016-02-04 20:23:58 +0000
+++ tools/libertine-session-bridge	2016-06-02 18:43:46 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 
+import dbus 
 import libertine.utils
 import os
 import select
@@ -9,15 +10,15 @@
 from socket import *
 
 
-def accept_new_connection():
-    newconn = container_dbus_session_sock.accept()[0]
+def accept_new_connection(host_adder, container_sock):
+    newconn = container_sock.accept()[0]
     descriptors.append(newconn)
 
-    host_dbus_session_sock = socket(AF_UNIX, SOCK_STREAM)
-    host_dbus_session_sock.connect(host_dbus_session_addr)
-    descriptors.append(host_dbus_session_sock)
+    host_sock = socket(AF_UNIX, SOCK_STREAM)
+    host_sock.connect(host_adder)
+    descriptors.append(host_sock)
 
-    socket_pairs.append([newconn, host_dbus_session_sock])
+    socket_pairs.append([newconn, host_sock])
 
 
 def get_socket_pair(socket):
@@ -57,6 +58,26 @@
         j.close()
 
 
+def get_host_maliit_socket():
+    address_bus_name    = "org.maliit.server"
+    address_object_path = "/org/maliit/server/address"
+    address_interface   = "org.maliit.Server.Address"
+    address_property    = "address"
+    
+    session_bus = dbus.SessionBus()
+    maliit_object = session_bus.get_object('org.maliit.server', '/org/maliit/server/address')
+
+    interface = dbus.Interface(maliit_object, dbus.PROPERTIES_IFACE)
+    address = interface.Get('org.maliit.Server.Address', 'address')
+
+    partition_key = 'unix:abstract='
+    address = address.split(',')[0]
+    address = address.partition(partition_key)[2]
+    address = "\0%s" % address
+
+    return address
+
+
 def get_host_dbus_socket():
     socket_key = "DBUS_SESSION_BUS_ADDRESS=unix:abstract="
 
@@ -73,9 +94,13 @@
 
 
 def socket_cleanup(signum, frame):
-    container_dbus_session_sock.close()
+    for socket in descriptors:
+        socket.close()
+
     close_all_connections()
-    os.remove(dbus_session_socket_path)
+
+    for socket_path in session_socket_paths:
+        os.remove(socket_path)
 
 
 def main_loop():
@@ -94,8 +119,8 @@
             if sock.fileno() == -1:
                 continue
 
-            if sock == container_dbus_session_sock:
-                accept_new_connection()
+            if sock in host_session_socket_path_map:
+                accept_new_connection(host_session_socket_path_map[sock], sock)
 
             else:
                 data = sock.recv(4096)
@@ -118,14 +143,54 @@
                     totalsent = totalsent + sent
 
 
-dbus_session_socket_path = sys.argv[1]
-
-container_dbus_session_sock = socket(AF_UNIX, SOCK_STREAM)
-container_dbus_session_sock.bind(dbus_session_socket_path)
-container_dbus_session_sock.listen(5)
-
-host_dbus_session_addr = get_host_dbus_socket()
-descriptors = [container_dbus_session_sock]
+def create_socket(session_socket_path):
+    try:
+        sock = socket(AF_UNIX, SOCK_STREAM)
+    except:
+        sock = None
+    else:
+        try:
+            sock.bind(session_socket_path)
+            sock.listen(5)
+        except:
+            sock.close()
+            sock = None
+        else:
+            return sock
+
+    return None
+    
+
+def create_container_socket(session_socket_path, get_host_session_path_function):
+    container_session_sock = create_socket(session_socket_path)
+
+    if container_session_sock is not None:
+        try:
+            host_session_path = get_host_session_path_function()
+        except:
+            container_session_sock.close()
+            container_session_sock = None
+            raise
+        else:
+            host_session_socket_path_map.update({container_session_sock:host_session_path})
+
+            session_socket_paths.append(session_socket_path)
+            descriptors.append(container_session_sock)
+
+
+descriptors = []
+host_session_socket_path_map = {}
+session_socket_paths = []
+
+# Required sockets:
+create_container_socket(sys.argv[1], get_host_dbus_socket)
+
+# Optional sockets:
+try:
+    create_container_socket(sys.argv[2], get_host_maliit_socket)
+except:
+    pass
+
 socket_pairs = []
 
 main_loop()