summaryrefslogtreecommitdiffstats
path: root/pyload/remote/wsbackend/AbstractHandler.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-08-08 17:38:35 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-08-08 17:38:35 +0200
commit52f6599748ef61219112111dc5db71f3342b076d (patch)
treee3627ded64b7e98493ca1ec7bd182aaa1774252e /pyload/remote/wsbackend/AbstractHandler.py
parentMultiHosters: moved settings to addon plugins. (diff)
downloadpyload-52f6599748ef61219112111dc5db71f3342b076d.tar.xz
adapted account api to multi user, fixed http referer bug
Diffstat (limited to 'pyload/remote/wsbackend/AbstractHandler.py')
-rw-r--r--pyload/remote/wsbackend/AbstractHandler.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/pyload/remote/wsbackend/AbstractHandler.py b/pyload/remote/wsbackend/AbstractHandler.py
index 8012d6cd8..f540435c4 100644
--- a/pyload/remote/wsbackend/AbstractHandler.py
+++ b/pyload/remote/wsbackend/AbstractHandler.py
@@ -18,6 +18,8 @@
from mod_pywebsocket.msgutil import send_message
from mod_pywebsocket.util import get_class_logger
+
+from pyload.Api import User
from pyload.remote.json_converter import loads, dumps
@@ -115,7 +117,16 @@ class AbstractHandler:
return tuple(o)
def do_login(self, req, args, kwargs):
- user = self.api.checkAuth(*args, **kwargs)
+ user = None
+ # Cookies login when one argument is given
+ if len(args) == 1:
+ s = self.load_session(args)
+ else:
+ s = self.api.checkAuth(*args, **kwargs)
+ if s:
+ uid = s.get('uid', None)
+ user = User(uid=uid)
+
if user:
req.api = self.api.withUserContext(user.uid)
return self.send_result(req, self.OK, True)