summaryrefslogtreecommitdiffstats
path: root/module/remote/XMLRPCBackend.py
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2011-02-05 14:19:22 +0100
committerGravatar mkaay <mkaay@mkaay.de> 2011-02-05 14:19:22 +0100
commit7c332ae610f7feca193ba50ea900f5a417681a7b (patch)
treee71f1ba6b8eb52f13c11289069d65288b17a111c /module/remote/XMLRPCBackend.py
parentpy 2.5 fix -> removed import (diff)
downloadpyload-7c332ae610f7feca193ba50ea900f5a417681a7b.tar.xz
created unified authentication system (same data for webinterface an GUI/CLI, multiple accounts)
Diffstat (limited to 'module/remote/XMLRPCBackend.py')
-rw-r--r--module/remote/XMLRPCBackend.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/module/remote/XMLRPCBackend.py b/module/remote/XMLRPCBackend.py
index d5f72034e..08803df23 100644
--- a/module/remote/XMLRPCBackend.py
+++ b/module/remote/XMLRPCBackend.py
@@ -23,17 +23,16 @@ from module.remote.RemoteManager import BackendBase
class XMLRPCBackend(BackendBase):
def setup(self):
server_addr = (self.core.config['remote']['listenaddr'], int(self.core.config['remote']['port']))
- usermap = {self.core.config.username: self.core.config.password}
if self.core.config['ssl']['activated']:
if exists(self.core.config['ssl']['cert']) and exists(self.core.config['ssl']['key']):
self.core.log.info(_("Using SSL XMLRPCBackend"))
self.server = Server.SecureXMLRPCServer(server_addr, self.core.config['ssl']['cert'],
- self.core.config['ssl']['key'], usermap)
+ self.core.config['ssl']['key'], self.checkAuth)
else:
self.core.log.warning(_("SSL Certificates not found, fallback to auth XMLRPC server"))
- self.server = Server.AuthXMLRPCServer(server_addr, usermap)
+ self.server = Server.AuthXMLRPCServer(server_addr, self.checkAuth)
else:
- self.server = Server.AuthXMLRPCServer(server_addr, usermap)
+ self.server = Server.AuthXMLRPCServer(server_addr, self.checkAuth)
self.server.register_instance(self.core.server_methods)