engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app-setup: allow skip of legacy plugin discovery.

Browse source
This commit is contained in:
Marcin Kuzminski 2019-11-29 11:15:13 +01:00
parent 2f94372e2a
commit 656a419c84
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configs/development.ini
View file

@ -290,6 +290,9 @@ instance_id =
## egg:rhodecode-enterprise-ce#crowd ## egg:rhodecode-enterprise-ce#crowd
#rhodecode.auth_plugin_fallback = egg:rhodecode-enterprise-ce#rhodecode #rhodecode.auth_plugin_fallback = egg:rhodecode-enterprise-ce#rhodecode
## Flag to control loading of legacy plugins in py:/path format
auth_plugin.import_legacy_plugins = true
## alternative return HTTP header for failed authentication. Default HTTP ## alternative return HTTP header for failed authentication. Default HTTP
## response is 401 HTTPUnauthorized. Currently HG clients have troubles with ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
## handling that causing a series of failed authentication calls. ## handling that causing a series of failed authentication calls.

3
configs/production.ini
View file

@ -265,6 +265,9 @@ instance_id =
## egg:rhodecode-enterprise-ce#crowd ## egg:rhodecode-enterprise-ce#crowd
#rhodecode.auth_plugin_fallback = egg:rhodecode-enterprise-ce#rhodecode #rhodecode.auth_plugin_fallback = egg:rhodecode-enterprise-ce#rhodecode
## Flag to control loading of legacy plugins in py:/path format
auth_plugin.import_legacy_plugins = true
## alternative return HTTP header for failed authentication. Default HTTP ## alternative return HTTP header for failed authentication. Default HTTP
## response is 401 HTTPUnauthorized. Currently HG clients have troubles with ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
## handling that causing a series of failed authentication calls. ## handling that causing a series of failed authentication calls.

5
rhodecode/config/middleware.py
View file

@ -266,7 +266,6 @@ def includeme(config):
config.include('rhodecode.integrations') config.include('rhodecode.integrations')
if load_all: if load_all:
from rhodecode.authentication import discover_legacy_plugins
# load CE authentication plugins # load CE authentication plugins
config.include('rhodecode.authentication.plugins.auth_crowd') config.include('rhodecode.authentication.plugins.auth_crowd')
config.include('rhodecode.authentication.plugins.auth_headers') config.include('rhodecode.authentication.plugins.auth_headers')
@ -277,7 +276,9 @@ def includeme(config):
config.include('rhodecode.authentication.plugins.auth_token') config.include('rhodecode.authentication.plugins.auth_token')
# Auto discover authentication plugins and include their configuration. # Auto discover authentication plugins and include their configuration.
discover_legacy_plugins(config) if asbool(settings.get('auth_plugin.import_legacy_plugins', 'true')):
from rhodecode.authentication import discover_legacy_plugins
discover_legacy_plugins(config)
# apps # apps
if load_all: if load_all: