changeset 817:cf1812a4445e

server: fixed empty_password_allowed_warning_dangerous_list option
author Goffi <goffi@goffi.org>
date Sat, 26 Dec 2015 14:36:45 +0100
parents 0fd4b81972c0
children f8a7a046ff9c
files src/server/server.py src/twisted/plugins/libervia_server.py
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/server/server.py	Sat Dec 26 14:17:29 2015 +0100
+++ b/src/server/server.py	Sat Dec 26 14:36:45 2015 +0100
@@ -837,7 +837,7 @@
                 request.finish()
                 return
         else:
-            if profile != login_jid.full() or (not password and profile not in self.sat_host.empty_password_allowed_warning_dangerous_list):
+            if profile != login_jid.full() or (not password and profile not in self.sat_host.options['empty_password_allowed_warning_dangerous_list']):
                 # profiles with empty passwords are restricted to local frontends
                 request.write(C.PROFILE_AUTH_ERROR)
                 request.finish()
--- a/src/twisted/plugins/libervia_server.py	Sat Dec 26 14:17:29 2015 +0100
+++ b/src/twisted/plugins/libervia_server.py	Sat Dec 26 14:36:45 2015 +0100
@@ -125,6 +125,8 @@
             except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
                 pass
         usage.Options.__init__(self)
+        for opt_data in OPT_PARAMETERS_CFG:
+            self[opt_data[0]] = opt_data[2]
 
     def handleDeprecated(self, config_parser):
         """display warning and/or change option when a deprecated option if found