Changeset 118

Timestamp:

Oct 7, 2007, 5:17:25 PM (17 years ago)

Author:

quentin

Message:

Generate real authentication tokens

Location:

trunk

Files:

• vnc/vnc_server/vncexternalauth.py (modified) (1 diff)
• web/templates/main.py (modified) (2 diffs)

trunk/vnc/vnc_server/vncexternalauth.py

@@ -66 +66 @@
             return #FIXME
         token = base64.urlsafe_b64decode(token)
-        token = cPickle.load(token)
+        token = cPickle.loads(token)
         m = hmac.new(TOKEN_KEY, digestmod=sha)
         m.update(token['data'])
         if (m.digest() == token['digest']):
-            data = cPickle.load(token['data'])
+            data = cPickle.loads(token['data'])
             expires = data["expires"]
             if (time.time() < expires):

trunk/web/templates/main.py

@@ -6 +6 @@
 import string
 import subprocess
+import time
+import cPickle
+import base64
 
 print 'Content-Type: text/html\n'
@@ -207 +210 @@
     if machine is None: #gave error page already
         return
-    token = 'quentin'
+    
+    TOKEN_KEY = "0M6W0U1IXexThi5idy8mnkqPKEq1LtEnlK/pZSn0cDrN"
+
+    data = {}
+    data["user"] = user
+    data["machine"]=machine
+    data["expires"]=time.time()+(5*60)
+    pickledData = cPickle.dumps(data)
+    m = hmac.new(TOKEN_KEY, digestmod=sha)
+    m.update(pickledData)
+    token = {'data': pickledData, 'digest': m.digest()}
+    token = cPickle.dumps(token)
+    token = base64.urlsafe_b64encode(token)
+    
     d = dict(user=user,
              machine=machine,