Merge lp:~jimmy-sigint/nova/support_flash_socket_policy_in_vnc_proxy into lp:~hudson-openstack/nova/trunk

[Jimmy Bergman]

Add a socket server responding with an allowing flash socket policy for all requests from flash on port 843 to nova-vncproxy

[Vish Ishaya (vishvananda)]

It will be very cool to get this feature in. Unfortunately we've pulled twisted out of the rest of the code base and it seems silly to add the dependency back for this small feature. It seems like this could be done without twisted by making the wsgi app listen on 843 as well and handling the requests on that port by sending the policy data.

review: Needs Fixing

[Jimmy Bergman (jimmy-sigint)]

Missed that (re twisted), will arrange some other solution. I didn't try to hack it into the wsgi app due to the fact that it doesn't use HTTP, it connects and simply sends <policy-file-request/> followed by a NULL byte, and I guessed that it would be messy to get the wsgi app to handle non-http stuff.

[Jimmy Bergman (jimmy-sigint)]

> It will be very cool to get this feature in. Unfortunately we've pulled
> twisted out of the rest of the code base and it seems silly to add the
> dependency back for this small feature. It seems like this could be done
> without twisted by making the wsgi app listen on 843 as well and handling the
> requests on that port by sending the policy data.

The branch is now updated to instead let the nova.wsgi.Server have an additional
raw non-HTTP TCP listener listening on 843 (and the code to support that is
added to nova.wsgi.Server).

[Vish Ishaya (vishvananda)]

awesome! Much better.

review: Approve

[Matt Dietz (cerberus)]

lgtm.

review: Approve

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:nova failed due to conflicts:

text conflict in bin/nova-vncproxy

[Jimmy Bergman (jimmy-sigint)]

Now I've merged with trunk again and adapted the patch to the nova/wsgi.py refactoring that was merged while this branch was pending approval.

[Jimmy Bergman (jimmy-sigint)]

What is the process for redoing the merge attempt?

[Vish Ishaya (vishvananda)]

I'll kick it off again.

[Vish Ishaya (vishvananda)]

In general, if you set the branch back to Needs Review, it will notify nova-core that it has been updated, so we can re-approve.

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~jimmy-sigint/nova/support_flash_socket_policy_in_vnc_proxy into lp:nova failed. Below is the output from the failed tests.

FloatingIpTest
    test_floating_ip_allocate OK 0.15
    test_floating_ip_associate OK 0.21
    test_floating_ip_disassociate OK 0.09
    test_floating_ip_release OK 0.09
    test_floating_ip_show OK 0.09
    test_floating_ips_list OK 0.09
    test_translate_floating_ip_view OK 0.04
FlavorsExtraSpecsTest
    test_create OK 0.05
    test_create_empty_body OK 0.04
    test_delete OK 0.04
    test_index OK 0.04
    test_index_no_data OK 0.05
    test_show OK 0.05
    test_show_spec_not_found OK 0.25
    test_update_item OK 0.04
    test_update_item_body_uri_mismatch OK 0.04
    test_update_item_empty_body OK 0.04
    test_update_item_too_many_keys OK 0.04
AccountsTest
    test_account_create OK 0.17
    test_account_delete OK 0.17
    test_account_update OK 0.17
    test_get_account OK 0.43
AdminAPITest
    test_admin_disabled OK 0.13
    test_admin_enabled OK 0.17
APITest
    test_exceptions_are_converted_to_faults OK 0.01
    test_malformed_json OK 0.06
    test_malformed_xml OK 0.06
Test
    test_authorize_project OK 0.09
    test_authorize_token OK 0.32
    test_authorize_user OK 0.05
    test_bad_project OK 0.09
    test_bad_token OK 0.05
    test_bad_user_bad_key OK 0.06
    test_bad_user_good_key OK 0.05
    test_no_user OK 0.05
    test_not_existing_project OK 0.31
    test_token_expiry OK 0.05
TestFunctional
    test_token_doesnotexist OK 0.06
    test_token_expiry OK 0.08
TestLimiter
    test_authorize_token OK 0.08
LimiterTest
    test_limiter...

[Vish Ishaya (vishvananda)]

looks like you got caught by the pep8 police!

[Jimmy Bergman (jimmy-sigint)]

this is now fixed.

=== modified file 'bin/nova-vncproxy'
--- bin/nova-vncproxy	2011-06-21 16:03:27 +0000
+++ bin/nova-vncproxy	2011-07-07 06:14:57 +0000
@@ -63,6 +63,19 @@
 flags.DEFINE_flag(flags.HelpXMLFlag())
 
 
+def handle_flash_socket_policy(socket):
+    LOG.info(_("Received connection on flash socket policy port"))
+
+    fd = socket.makefile('rw')
+    expected_command = "<policy-file-request/>"
+    if expected_command in fd.read(len(expected_command) + 1):
+        LOG.info(_("Received valid flash socket policy request"))
+        fd.write('<?xml version="1.0"?><cross-domain-policy><allow-'
+                 'access-from domain="*" to-ports="%d" /></cross-'
+                 'domain-policy>' % (FLAGS.vncproxy_port))
+        fd.flush()
+    socket.close()
+
 if __name__ == "__main__":
     utils.default_flagfile()
     FLAGS(sys.argv)
@@ -101,4 +114,6 @@
                          host=FLAGS.vncproxy_host,
                          port=FLAGS.vncproxy_port)
     server.start()
+    server.start_tcp(handle_flash_socket_policy, 843, host=FLAGS.vncproxy_host)
+
     server.wait()

=== modified file 'nova/wsgi.py'
--- nova/wsgi.py	2011-06-21 15:25:44 +0000
+++ nova/wsgi.py	2011-07-07 06:14:57 +0000
@@ -67,6 +67,7 @@
         self.host = host or "0.0.0.0"
         self.port = port or 0
         self._server = None
+        self._tcp_server = None
         self._socket = None
         self._pool = eventlet.GreenPool(pool_size or self.default_pool_size)
         self._logger = logging.getLogger("eventlet.wsgi.server")
@@ -106,6 +107,17 @@
         """
         LOG.info(_("Stopping WSGI server."))
         self._server.kill()
+        if self._tcp_server is not None:
+            LOG.info(_("Stopping raw TCP server."))
+            self._tcp_server.kill()
+
+    def start_tcp(self, listener, port, host='0.0.0.0', key=None, backlog=128):
+        """Run a raw TCP server with the given application."""
+        arg0 = sys.argv[0]
+        LOG.info(_('Starting TCP server %(arg0)s on %(host)s:%(port)s')
+                 % locals())
+        socket = eventlet.listen((host, port), backlog=backlog)
+        self._tcp_server = self._pool.spawn_n(self._run_tcp, listener, socket)
 
     def wait(self):
         """Block, until the server has stopped.
@@ -120,6 +132,15 @@
         except greenlet.GreenletExit:
             LOG.info(_("WSGI server has stopped."))
 
+    def _run_tcp(self, listener, socket):
+        """Start a raw TCP server in a new green thread."""
+        while True:
+            try:
+                new_sock, address = socket.accept()
+                self._pool.spawn_n(listener, new_sock)
+            except (SystemExit, KeyboardInterrupt):
+                pass
+
 
 class Request(webob.Request):
     pass