From 2ed733a5452df80f789692f0476247d030a1201c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 05:01:23 +0000 Subject: [PATCH 1/2] Bump django-ckeditor from 6.0.0 to 6.1.0 Bumps [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/django-ckeditor/django-ckeditor/releases) - [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/master/CHANGELOG.rst) - [Commits](https://github.com/django-ckeditor/django-ckeditor/compare/6.0.0...6.1.0) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b4294b337..0207e6f3d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ django>=2.2,<2.3 -django-ckeditor==6.0.0 +django-ckeditor==6.1.0 django-phonenumber-field[phonenumbers]==5.1.0 django-reversion==3.0.9 django-xforwardedfor-middleware==2.0 From ba4886232eec1632ce1c4d24b11052b2cac81c5b Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 5 Jun 2021 16:34:46 +0200 Subject: [PATCH 2/2] Do not try to update password for non local users. see #2239 --- modoboa/core/views/auth.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modoboa/core/views/auth.py b/modoboa/core/views/auth.py index 892ec1d2d..75a14929f 100644 --- a/modoboa/core/views/auth.py +++ b/modoboa/core/views/auth.py @@ -47,8 +47,12 @@ def dologin(request): user = authenticate(username=form.cleaned_data["username"], password=form.cleaned_data["password"]) if user and user.is_active: - if param_tools.get_global_parameter("update_scheme", - raise_exception=False): + condition = ( + user.is_local and + param_tools.get_global_parameter( + "update_scheme", raise_exception=False) + ) + if condition: # check if password scheme is correct scheme = param_tools.get_global_parameter( "password_scheme", raise_exception=False)