trunk merge

1 files changed, 15 insertions, 0 deletions

diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy
index 72271df3a..bdbb30a7f 100755
--- a/bin/nova-vncproxy
+++ b/bin/nova-vncproxy
@@ -63,6 +63,19 @@ flags.DEFINE_flag(flags.HelpshortFlag())
 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 @@ if __name__ == "__main__":
                          host=FLAGS.vncproxy_host,
                          port=FLAGS.vncproxy_port)
     server.start()
+    server.start_tcp(handle_flash_socket_policy, 843, host=FLAGS.vncproxy_host)
+
     server.wait()