Merge lp:~trapnine/maas/fix-1510224 into lp:~maas-committers/maas/trunk

[Jeffrey C Jones]

New changepasswords command. Updates multiple MAAS passwords non-interactively from STDIN, just like chpasswd.

[Gavin Panella (allenap)]

Looks good. I have a few suggestions. Dealing with input encoding is important. There's a blocker in the tests where global state is mutated and not reset; more in the diff comments.

review: Needs Fixing

[Jeffrey C Jones (trapnine)]

> Looks good. I have a few suggestions. Dealing with input encoding is
> important. There's a blocker in the tests where global state is mutated and
> not reset; more in the diff comments.

Thanks Gavin. Everything's been addressed, please take a look.

[Gavin Panella (allenap)]

Looks great!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~trapnine/maas/fix-1510224 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Get:2 http://security.ubuntu.com trusty-security/main Sources [98.0 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:3 http://security.ubuntu.com trusty-security/universe Sources [30.9 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Get:4 http://security.ubuntu.com trusty-security/main amd64 Packages [362 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Get:5 http://security.ubuntu.com trusty-security/universe amd64 Packages [117 kB]
Get:6 http://security.ubuntu.com trusty-security/main Translation-en [196 kB]
Get:7 http://security.ubuntu.com trusty-security/universe Translation-en [68.4 kB]
Fetched 937 kB in 3s (246 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txtftp py...

=== added file 'src/maasserver/management/commands/changepasswords.py'
--- src/maasserver/management/commands/changepasswords.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/management/commands/changepasswords.py	2015-11-09 07:40:54 +0000
@@ -0,0 +1,53 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Django command: Batch update multiple passwords non-interactively."""
+
+from fileinput import (
+    hook_encoded,
+    input,
+)
+from textwrap import dedent
+
+from django.contrib.auth import get_user_model
+from django.core.management.base import (
+    BaseCommand,
+    CommandError,
+)
+from maasserver.utils.orm import transactional
+
+
+class Command(BaseCommand):
+    help = dedent("""\
+        Update passwords in batch mode.
+
+        Like the chpasswd command, this command reads a list of username and
+        password pairs from standard input and uses this information to update
+        a group of existing users. The input must be UTF8 encoded, and each
+        line is of the format:
+
+            username:password
+
+        A list of files can be provided as arguments. If provided, the input
+        will be read from the files instead of standard input.""")
+
+    @transactional
+    def handle(self, *args, **options):
+        count = 0
+        UserModel = get_user_model()
+        for line in input(args, openhook=hook_encoded("utf-8")):
+            try:
+                username, password = line.rstrip('\r\n').split(":", 1)
+            except ValueError:
+                raise CommandError(
+                    "Invalid input provided. "
+                    "Format is 'username:password', one per line.")
+            try:
+                user = UserModel._default_manager.get(
+                    **{UserModel.USERNAME_FIELD: username})
+            except UserModel.DoesNotExist:
+                raise CommandError("User '%s' does not exist." % username)
+            user.set_password(password)
+            user.save()
+            count += 1
+        return "%d password(s) successfully changed." % count

=== modified file 'src/maasserver/tests/test_commands.py'
--- src/maasserver/tests/test_commands.py	2015-06-16 15:51:05 +0000
+++ src/maasserver/tests/test_commands.py	2015-11-09 07:40:54 +0000
@@ -16,15 +16,20 @@
 
 from codecs import getwriter
 from io import BytesIO
+import StringIO
 
 from apiclient.creds import convert_tuple_to_string
 import django
 from django.contrib.auth.models import User
 from django.core.management import call_command
 from django.core.management.base import CommandError
-from maasserver.management.commands import createadmin
+from maasserver.management.commands import (
+    changepasswords,
+    createadmin,
+)
 from maasserver.models.user import get_creds_tuple
 from maasserver.testing.factory import factory
+from maasserver.testing.orm import reload_object
 from maasserver.utils.orm import get_one
 from maastesting.djangotestcase import DjangoTestCase
 from testtools.matchers import StartsWith
@@ -182,6 +187,49 @@
             createadmin.prompt_for_email)
 
 
+class TestChangePasswords(DjangoTestCase):
+
+    def test_bad_input(self):
+        stdin = StringIO.StringIO("nobody")
+        self.patch(changepasswords, 'input').return_value = stdin
+        error_text = assertCommandErrors(self, 'changepasswords')
+        self.assertIn(
+            "Invalid input provided. "
+            "Format is 'username:password', one per line.", error_text)
+
+    def test_nonexistent_user(self):
+        stdin = StringIO.StringIO("nobody:nopass")
+        self.patch(changepasswords, 'input').return_value = stdin
+        error_text = assertCommandErrors(self, 'changepasswords')
+        self.assertIn("User 'nobody' does not exist.", error_text)
+
+    def test_changes_one_password(self):
+        username = factory.make_username()
+        password = factory.make_string(size=16, spaces=True, prefix="password")
+        user = factory.make_User(username=username, password=password)
+        self.assertTrue(user.check_password(password))
+        newpass = factory.make_string(size=16, spaces=True, prefix="newpass")
+        stdin = StringIO.StringIO("%s:%s" % (username, newpass))
+        self.patch(changepasswords, 'input').return_value = stdin
+        call_command('changepasswords')
+        self.assertTrue(reload_object(user).check_password(newpass))
+
+    def test_changes_ten_passwords(self):
+        users_passwords = []
+        stringio = StringIO.StringIO()
+        for _ in range(10):
+            username = factory.make_username()
+            user = factory.make_User(username=username)
+            newpass = factory.make_string(spaces=True, prefix="newpass")
+            users_passwords.append((user, newpass))
+            stringio.write("%s:%s\n" % (username, newpass))
+        stringio.seek(0)
+        self.patch(changepasswords, 'input').return_value = stringio
+        call_command('changepasswords')
+        for user, newpass in users_passwords:
+            self.assertTrue(reload_object(user).check_password(newpass))
+
+
 class TestApikeyCommand(DjangoTestCase):
 
     def test_apikey_requires_username(self):