1
diff --git a/src/maasserver/websockets/handlers/tests/test_user.py b/src/maasserver/websockets/handlers/tests/test_user.py
2
index 67bcd6e..d221fa2 100644
3
--- a/src/maasserver/websockets/handlers/tests/test_user.py
4
+++ b/src/maasserver/websockets/handlers/tests/test_user.py
5
@@ -394,3 +394,67 @@ class TestUserHandler(MAASServerTestCase):
6
394
        )
394
        )
7
395
        self.assertEqual(self.dehydrate_user(user, for_self=True), observed)
395
        self.assertEqual(self.dehydrate_user(user, for_self=True), observed)
8
396
        self.assertTrue(user.check_password("newpassword"))
396
        self.assertTrue(user.check_password("newpassword"))
9
397
10
398
    def test_change_other_users_password_as_admin(self):
11
399
        admin_user = factory.make_admin()
12
400
        handler = UserHandler(admin_user, {}, None)
13
401
        user = factory.make_User()
14
402
15
403
        response = handler.admin_change_password(
16
404
            {
17
405
                "id": user.id,
18
406
                "password1": "newpassword",
19
407
                "password2": "newpassword",
20
408
            }
21
409
        )
22
410
        user = reload_object(user)
23
411
24
412
        self.assertIsNone(response)
25
413
        self.assertTrue(
26
414
            user.check_password("newpassword"),
27
415
            "Password not correctly changed",
28
416
        )
29
417
30
418
    def test_cannot_change_other_users_password_as_unprivileged(self):
31
419
        unprivileged_user = factory.make_User()
32
420
        handler = UserHandler(unprivileged_user, {}, None)
33
421
        user = factory.make_User()
34
422
35
423
        self.assertRaises(
36
424
            HandlerPermissionError,
37
425
            handler.admin_change_password,
38
426
            {
39
427
                "id": user.id,
40
428
                "password1": "newpassword",
41
429
                "password2": "newpassword",
42
430
            },
43
431
        )
44
432
45
433
    def test_cannot_change_own_password_as_unprivileged_using_admin(self):
46
434
        unprivileged_user = factory.make_User()
47
435
        handler = UserHandler(unprivileged_user, {}, None)
48
436
49
437
        self.assertRaises(
50
438
            HandlerPermissionError,
51
439
            handler.admin_change_password,
52
440
            {
53
441
                "id": unprivileged_user.id,
54
442
                "password1": "newpassword",
55
443
                "password2": "newpassword",
56
444
            },
57
445
        )
58
446
59
447
    def test_cannot_change_other_users_password_as_admin_bad_password(self):
60
448
        admin_user = factory.make_admin()
61
449
        handler = UserHandler(admin_user, {}, None)
62
450
        user = factory.make_User()
63
451
64
452
        self.assertRaises(
65
453
            HandlerValidationError,
66
454
            handler.admin_change_password,
67
455
            {
68
456
                "id": user.id,
69
457
                "password1": "foo",
70
458
                "password2": "bar",
71
459
            },
72
460
        )
73
diff --git a/src/maasserver/websockets/handlers/user.py b/src/maasserver/websockets/handlers/user.py
74
index 7a12ac0..865f331 100644
75
--- a/src/maasserver/websockets/handlers/user.py
76
+++ b/src/maasserver/websockets/handlers/user.py
77
@@ -5,7 +5,10 @@
78
5
5
79
6
__all__ = ["UserHandler"]
6
__all__ = ["UserHandler"]
80
7
7
82
8
from django.contrib.auth.forms import PasswordChangeForm
8
from django.contrib.auth.forms import (
83
9
    AdminPasswordChangeForm,
84
10
    PasswordChangeForm,
85
11
)
86
9
from django.contrib.auth.models import User
12
from django.contrib.auth.models import User
87
10
from django.db.models import Count
13
from django.db.models import Count
88
11
from django.http import HttpRequest
14
from django.http import HttpRequest
89
@@ -51,6 +54,7 @@ class UserHandler(Handler):
90
51
            "auth_user",
54
            "auth_user",
91
52
            "mark_intro_complete",
55
            "mark_intro_complete",
92
53
            "change_password",
56
            "change_password",
93
57
            "admin_change_password",
94
54
        ]
58
        ]
95
55
        fields = [
59
        fields = [
96
56
            "id",
60
            "id",
97
@@ -208,3 +212,14 @@ class UserHandler(Handler):
98
208
            return self.full_dehydrate(self.user)
212
            return self.full_dehydrate(self.user)
99
209
        else:
213
        else:
100
210
            raise HandlerValidationError(form.errors)
214
            raise HandlerValidationError(form.errors)
101
215
102
216
    def admin_change_password(self, params):
103
217
        """As Admin, update another user's password."""
104
218
        if not self.user.is_superuser:
105
219
            raise HandlerPermissionError()
106
220
        user = self.get_object(params)
107
221
        form = AdminPasswordChangeForm(user=user, data=get_QueryDict(params))
108
222
        if form.is_valid():
109
223
            form.save()
110
224
        else:
111
225
            raise HandlerValidationError(form.errors)
Reviewer	Date Requested	Status
MAAS Lander		Approve on 2020-10-22
Alberto Donato (community)	2020-10-21	Approve on 2020-10-22
Review via email: mp+392616@code.launchpad.net