Changeset 1965 for trunk

Timestamp:

Jan 8, 2009, 4:19:47 PM (16 years ago)

Author:

quentin

Message:

Include the VNC host and port in the VNC authentication token

Location:

trunk/packages/invirt-vnc-server

Files:

• debian/changelog (modified) (1 diff)
• invirt-vnc-authtoken (modified) (2 diffs)

trunk/packages/invirt-vnc-server/debian/changelog

@@ +1 @@
+invirt-vnc-server (0.0.6) unstable; urgency=low
+
+  * Include the VNC host and port in the authentication token
+
+  -- Quentin Smith <quentin@mit.edu>  Thu, 08 Jan 2009 16:15:46 -0500
+
 invirt-vnc-server (0.0.5) unstable; urgency=low
 

trunk/packages/invirt-vnc-server/invirt-vnc-authtoken

@@ -9 +9 @@
 import base64
 from invirt.vnc import getTokenKey
+from invirt.config import structs as config
 
 def getAuthToken(username, machine, lifetime=5*60):
@@ -15 +16 @@
     data['machine'] = machine
     data['expires'] = time.time() + lifetime
+    data['connect_host'] = config.web.hostname
+    try:
+        data['connect_port'] = 10003 + [h.hostname for h in
+                                        config.hosts].index(os.uname()[1])
+    except:
+        data['connect_port'] = 5900
     pickled_data = cPickle.dumps(data)
     m = hmac.new(getTokenKey(), digestmod=sha)