Merge ~blake-rouse/maas:fix-1844793 into maas:master

[Blake Rouse]

Fixes LP: #1844793 - Add ability for a user to change password over the websocket API.

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maasserver/websockets/handlers/tests/test_user.py b/src/maasserver/websockets/handlers/tests/test_user.py
index ae0e8ee..2c69685 100644
--- a/src/maasserver/websockets/handlers/tests/test_user.py
+++ b/src/maasserver/websockets/handlers/tests/test_user.py
@@ -30,6 +30,7 @@ from maasserver.websockets.base import (
     dehydrate_datetime,
     HandlerDoesNotExistError,
     HandlerPermissionError,
+    HandlerValidationError,
 )
 from maasserver.websockets.handlers.user import UserHandler
 from maastesting.djangotestcase import count_queries
@@ -348,3 +349,25 @@ class TestUserHandler(MAASServerTestCase):
         handler = UserHandler(user, {}, None)
         last_login_serialised = handler.get({"id": user.id})['last_login']
         self.assertEqual(last_login_serialised, now.strftime(DATETIME_FORMAT))
+
+    def test_change_password_invalid(self):
+        user = factory.make_User()
+        user.set_password("oldpassword")
+        handler = UserHandler(user, {}, None)
+        self.assertRaises(HandlerValidationError, handler.change_password, {
+            "new_password1": "newpassword",
+            "new_password2": "mismatchpassword",
+            "old_password": "oldpassword",
+        })
+
+    def test_change_password(self):
+        user = factory.make_User()
+        user.set_password("oldpassword")
+        handler = UserHandler(user, {}, None)
+        observed = handler.change_password({
+            "new_password1": "newpassword",
+            "new_password2": "newpassword",
+            "old_password": "oldpassword",
+        })
+        self.assertEqual(self.dehydrate_user(user, for_self=True), observed)
+        self.assertTrue(user.check_password("newpassword"))
diff --git a/src/maasserver/websockets/handlers/user.py b/src/maasserver/websockets/handlers/user.py
index d9ea2cc..c046a91 100644
--- a/src/maasserver/websockets/handlers/user.py
+++ b/src/maasserver/websockets/handlers/user.py
@@ -7,6 +7,7 @@ __all__ = [
     "UserHandler",
 ]
 
+from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.models import User
 from django.db.models import Count
 from django.http import HttpRequest
@@ -22,11 +23,13 @@ from maasserver.permissions import (
     PodPermission,
     ResourcePoolPermission,
 )
+from maasserver.utils.forms import get_QueryDict
 from maasserver.websockets.base import (
     dehydrate_datetime,
     Handler,
     HandlerDoesNotExistError,
     HandlerPermissionError,
+    HandlerValidationError,
 )
 from provisioningserver.events import EVENT_TYPES
 
@@ -50,6 +53,7 @@ class UserHandler(Handler):
             'create_authorisation_token',
             'update_token_name',
             'delete_authorisation_token',
+            'change_password',
         ]
         fields = [
             "id",
@@ -232,3 +236,14 @@ class UserHandler(Handler):
         profile.delete_authorisation_token(params['key'])
         self.create_audit_event(EVENT_TYPES.AUTHORISATION, "Deleted token.")
         return {}
+
+    def change_password(self, params):
+        """Update the authenticated user password."""
+        form = PasswordChangeForm(user=self.user, data=get_QueryDict(params))
+        if form.is_valid():
+            form.save()
+            self.user.sshkeys_count = self.user.sshkey_set.count()
+            self.user.machines_count = self.user.node_set.count()
+            return self.full_dehydrate(self.user)
+        else:
+            raise HandlerValidationError(form.errors)