# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-04-10 09:47:00
# Node ID c2a00a0d51e21669329cf64d3eebd45990f87e84
# Parent  59717596530a79f2333219ec9eeff7c0848b7809

auth-plugins: fixed problem with cache of settings in multi-worker mode.

- previous implementation had a bug that cached the settings in each class, caused not refreshing
the update of settings in multi-worker mode. Only restart of rhodecode loaded new settings.

diff --git a/rhodecode/authentication/base.py b/rhodecode/authentication/base.py
--- a/rhodecode/authentication/base.py
+++ b/rhodecode/authentication/base.py
@@ -171,11 +171,6 @@ class RhodeCodeAuthPluginBase(object):
             db_type = '{}.encrypted'.format(db_type)
         return db_type
 
-    @LazyProperty
-    def plugin_settings(self):
-        settings = SettingsModel().get_all_settings()
-        return settings
-
     def is_enabled(self):
         """
         Returns true if this plugin is enabled. An enabled plugin can be
@@ -185,12 +180,13 @@ class RhodeCodeAuthPluginBase(object):
         auth_plugins = SettingsModel().get_auth_plugins()
         return self.get_id() in auth_plugins
 
-    def is_active(self):
+    def is_active(self, plugin_cached_settings=None):
         """
         Returns true if the plugin is activated. An activated plugin is
         consulted during authentication, assumed it is also enabled.
         """
-        return self.get_setting_by_name('enabled')
+        return self.get_setting_by_name(
+            'enabled', plugin_cached_settings=plugin_cached_settings)
 
     def get_id(self):
         """
@@ -210,13 +206,24 @@ class RhodeCodeAuthPluginBase(object):
         """
         return AuthnPluginSettingsSchemaBase()
 
-    def get_setting_by_name(self, name, default=None, cache=True):
+    def get_settings(self):
+        """
+        Returns the plugin settings as dictionary.
+        """
+        settings = {}
+        raw_settings = SettingsModel().get_all_settings()
+        for node in self.get_settings_schema():
+            settings[node.name] = self.get_setting_by_name(
+                node.name, plugin_cached_settings=raw_settings)
+        return settings
+
+    def get_setting_by_name(self, name, default=None, plugin_cached_settings=None):
         """
         Returns a plugin setting by name.
         """
         full_name = 'rhodecode_{}'.format(self._get_setting_full_name(name))
-        if cache:
-            plugin_settings = self.plugin_settings
+        if plugin_cached_settings:
+            plugin_settings = plugin_cached_settings
         else:
             plugin_settings = SettingsModel().get_all_settings()
 
@@ -235,15 +242,6 @@ class RhodeCodeAuthPluginBase(object):
             full_name, value, type_)
         return db_setting.app_settings_value
 
-    def get_settings(self):
-        """
-        Returns the plugin settings as dictionary.
-        """
-        settings = {}
-        for node in self.get_settings_schema():
-            settings[node.name] = self.get_setting_by_name(node.name)
-        return settings
-
     def log_safe_settings(self, settings):
         """
         returns a log safe representation of settings, without any secrets
@@ -685,7 +683,8 @@ def authenticate(username, password, env
                 environ=environ or {})
 
         if plugin_cache_active:
-            log.debug('Trying to fetch cached auth by `...%s`', _password_hash[:6])
+            log.debug('Trying to fetch cached auth by pwd hash `...%s`',
+                      _password_hash[:6])
             plugin_user = cache_manager.get(
                 _password_hash, createfunc=auth_func)
         else:
diff --git a/rhodecode/authentication/registry.py b/rhodecode/authentication/registry.py
--- a/rhodecode/authentication/registry.py
+++ b/rhodecode/authentication/registry.py
@@ -70,9 +70,11 @@ class AuthenticationPluginRegistry(objec
         # Add all enabled and active plugins to the list. We iterate over the
         # auth_plugins setting from DB because it also represents the ordering.
         enabled_plugins = SettingsModel().get_auth_plugins()
+        raw_settings = SettingsModel().get_all_settings()
         for plugin_id in enabled_plugins:
             plugin = self.get_plugin(plugin_id)
-            if plugin is not None and plugin.is_active():
+            if plugin is not None and plugin.is_active(
+                    plugin_cached_settings=raw_settings):
                 plugins.append(plugin)
 
         # Add the fallback plugin from ini file.
diff --git a/rhodecode/authentication/views.py b/rhodecode/authentication/views.py
--- a/rhodecode/authentication/views.py
+++ b/rhodecode/authentication/views.py
@@ -63,7 +63,7 @@ class AuthnPluginViewBase(BaseAppView):
         for node in schema:
             if node.name not in defaults:
                 defaults[node.name] = self.plugin.get_setting_by_name(
-                    node.name, node.default, cache=False)
+                    node.name, node.default)
 
         template_context = {
             'defaults': defaults,