Changeset 1391 for trunk

Timestamp:

Oct 28, 2008, 8:00:22 PM (16 years ago)

Author:

broder

Message:

In the web interface, get the VNC auth token over remctl

File:

• trunk/packages/invirt-web/code/main.py (modified) (1 diff)

trunk/packages/invirt-web/code/main.py

@@ -246 +246 @@
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
 
-    TOKEN_KEY = "0M6W0U1IXexThi5idy8mnkqPKEq1LtEnlK/pZSn0cDrN"
-
-    data = {}
-    data["user"] = username
-    data["machine"] = machine.name
-    data["expires"] = time.time()+(5*60)
-    pickled_data = cPickle.dumps(data)
-    m = hmac.new(TOKEN_KEY, digestmod=sha)
-    m.update(pickled_data)
-    token = {'data': pickled_data, 'digest': m.digest()}
-    token = cPickle.dumps(token)
-    token = base64.urlsafe_b64encode(token)
+    token = remctl('control', machine.name, 'vnctoken')
     host = controls.listHost(machine)
     if host: