# HG changeset patch # User souliane # Date 1448619711 -3600 # Node ID cec204c6360c9a409c9db3283f084c2bfda20162 # Parent 772c8edd1057d8c959c25678be731b0c49c2a9b1 plugin misc_account: fixed password verification diff -r 772c8edd1057 -r cec204c6360c src/plugins/plugin_misc_account.py --- a/src/plugins/plugin_misc_account.py Fri Nov 27 10:15:23 2015 +0100 +++ b/src/plugins/plugin_misc_account.py Fri Nov 27 11:21:51 2015 +0100 @@ -332,7 +332,7 @@ def error_ui(message=None): if not message: - D_("The provided profile password doesn't match.") + message = D_("The provided profile password doesn't match.") error_ui = xml_tools.XMLUI("popup", title=D_("Attempt failure")) error_ui.addText(message) return {'xmlui': error_ui.toXml()} @@ -341,7 +341,9 @@ delete_passwd = data[xml_tools.SAT_FORM_PREFIX + 'delete_passwd'] delete_checkbox = data[xml_tools.SAT_FORM_PREFIX + 'delete_checkbox'] if delete_checkbox == 'true': - if verify(delete_passwd): + verified = yield verify(delete_passwd) + assert isinstance(verified, bool) + if verified: defer.returnValue(self.__deleteAccount(profile)) defer.returnValue(error_ui()) @@ -353,7 +355,9 @@ posts = delete_posts_checkbox == 'true' comments = delete_comments_checkbox == 'true' if posts or comments: - if verify(delete_posts_passwd): + verified = yield verify(delete_posts_passwd) + assert isinstance(verified, bool) + if verified: defer.returnValue(self.__deleteBlogPosts(posts, comments, profile)) defer.returnValue(error_ui()) @@ -362,7 +366,9 @@ new_passwd1 = data[xml_tools.SAT_FORM_PREFIX + 'new_passwd1'] new_passwd2 = data[xml_tools.SAT_FORM_PREFIX + 'new_passwd2'] if new_passwd1 or new_passwd2: - if verify(current_passwd): + verified = yield verify(current_passwd) + assert isinstance(verified, bool) + if verified: if new_passwd1 == new_passwd2: data = yield self.__changePassword(new_passwd1, profile=profile) defer.returnValue(data)