Changeset e837493

Timestamp:

04/27/2009 01:01:20 PM (16 years ago)

Author:

Damien Churchill <damoc@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

204f055

Parents:

c4cdd7

Message:

add basic session support

Location:

deluge/ui/web

Files:

• js/Deluge.Login.js (modified) (4 diffs)
• js/Deluge.UI.js (modified) (1 diff)
• json_api.py (modified) (3 diffs)
• server.py (modified) (2 diffs)

deluge/ui/web/js/Deluge.Login.js

@@ -24 +24 @@
 (function(){
         Ext.deluge.LoginWindow = Ext.extend(Ext.Window, {
+                
+                firstShow: true,
+                
                 constructor: function(config) {
                         config = Ext.apply({
@@ -46 +49 @@
                         Deluge.Events.on('logout', this.onLogout, this);
                         this.on('show', this.onShow, this);
+                        this.on('beforeshow', this.onBeforeShow, this);
                         
                         this.addButton({
@@ -83 +87 @@
                         Deluge.Client.web.login(passwordField.getValue(), {
                                 success: function(result) {
-                                        if (result == true) {
+                                        if (result) {
                                                 Deluge.Events.fire('login');
                                                 this.hide();
                                                 passwordField.setRawValue('');
+                                                Deluge.UI.cookies.set("session", result);
                                         } else {
                                                 Ext.MessageBox.show({
@@ -106 +111 @@
                 
                 onLogout: function() {
-                        this.show();
+                        var session = Deluge.UI.cookies.get("session", false);
+                        if (session) {
+                                Deluge.Client.web.delete_session(session, {
+                                        success: function(result) {
+                                                Deluge.UI.cookies.set("session", false);
+                                                this.show();
+                                        },
+                                        scope: this
+                                });
+                        }
+                },
+                
+                onBeforeShow: function() {
+                        var session = Deluge.UI.cookies.get("session", false);
+                        if (session) {
+                                Deluge.Client.web.check_session(session, {
+                                        success: function(result) {
+                                                if (result) {
+                                                        Deluge.Events.fire('login');
+                                                        this.loginForm.items.get('password').setRawValue('');
+                                                        this.hide();
+                                                } else {
+                                                        Deluge.UI.cookies.set("session", false);
+                                                        this.show();
+                                                }
+                                        },
+                                        failure: function(result) {
+                                                Deluge.UI.cookies.set("session", false);
+                                                this.show();
+                                        },
+                                        scope: this
+                                });
+                                return false;
+                        }
                 },
                 

deluge/ui/web/js/Deluge.UI.js

@@ -50 +50 @@
                 });
                 
-                Deluge.Login.show();
-                
                 Deluge.Events.on("connect", this.onConnect, this);
                 Deluge.Events.on("disconnect", this.onDisconnect, this);
-                Deluge.Client = new Ext.ux.util.RpcClient({url: '/json'});
+                Deluge.Client = new Ext.ux.util.RpcClient({
+                        url: '/json'
+                });
+                Deluge.Client.on('connected', function(e) {
+                        Deluge.Login.show();
+                });
                 this.update = this.update.bind(this);
         },

deluge/ui/web/json_api.py

@@ -26 +26 @@
 import time
 import base64
+import random
 import urllib
 import hashlib
@@ -428 +429 @@
         return d
     
+    def _create_session(self, login='admin'):
+        m = hashlib.md5()
+        m.update(login)
+        m.update(str(time.time()))
+        m.update(str(random.getrandbits(999)))
+        m.update(m.hexdigest())
+        session_id = m.hexdigest()
+        
+        config = component.get("DelugeWeb").config
+        config["sessions"][session_id] = {
+            "login": login
+        }
+        return session_id
+    
+    @export
+    def check_session(self, session_id):
+        d = Deferred()
+        config = component.get("DelugeWeb").config
+        d.callback(session_id in config["sessions"])
+        return d
+    
+    @export
+    def delete_session(self, session_id):
+        d = Deferred()
+        config = component.get("DelugeWeb").config
+        del config["sessions"][session_id]
+        d.callback(True)
+        return d
+    
     @export
     def login(self, password):
@@ -437 +467 @@
         m.update(password)
         d = Deferred()
-        d.callback(m.hexdigest() == config['pwd_md5'])
+        if m.hexdigest() == config['pwd_md5']:
+            # Change this to return a session id
+            d.callback(self._create_session())
+        else:
+            d.callback(False)
         return d
     

deluge/ui/web/server.py

@@ -27 +27 @@
 import locale
 import shutil
+import signal
 import urllib
 import gettext
@@ -72 +73 @@
     "pwd_md5": "2c9baa929ca38fb5c9eb5b054474d1ce",
     "base": "",
-    "sessions": [],
+    "sessions": {},
     "sidebar_show_zero": False,
     "sidebar_show_trackers": False,