Commit ea48a936 authored by Barry Warsaw's avatar Barry Warsaw

Replace the password stuff with flufl.password.

parent d1352a01
......@@ -98,6 +98,7 @@ case second `m'. Any other spelling is incorrect.""",
'flufl.enum',
'flufl.i18n',
'flufl.lock',
'flufl.password',
'httplib2',
'lazr.config',
'lazr.smtptest',
......
......@@ -27,9 +27,11 @@ __all__ = [
from email.utils import formataddr
from flufl.password import lookup, make_secret
from zope.component import getUtility
from mailman.app.notifications import send_goodbye_message
from mailman.config import config
from mailman.core.i18n import _
from mailman.email.message import OwnerNotification
from mailman.interfaces.address import IEmailValidator
......@@ -38,7 +40,6 @@ from mailman.interfaces.member import (
MemberRole, MembershipIsBannedError, NotAMemberError)
from mailman.interfaces.usermanager import IUserManager
from mailman.utilities.i18n import make
from mailman.utilities.passwords import encrypt_password
......@@ -55,7 +56,7 @@ def add_member(mlist, email, realname, password, delivery_mode, language,
:type email: str
:param realname: The subscriber's full name.
:type realname: str
:param password: The subscriber's password.
:param password: The subscriber's plain text password.
:type password: str
:param delivery_mode: The delivery mode the subscriber has chosen.
:type delivery_mode: DeliveryMode
......@@ -96,7 +97,8 @@ def add_member(mlist, email, realname, password, delivery_mode, language,
user.link(address)
# Encrypt the password using the currently selected scheme. The
# scheme is recorded in the hashed password string.
user.password = encrypt_password(password)
scheme = lookup(config.passwords.password_scheme.upper())
user.password = make_secret(password, scheme)
user.preferences.preferred_language = language
member = mlist.subscribe(address, role)
member.preferences.delivery_mode = delivery_mode
......
......@@ -26,6 +26,7 @@ __all__ = [
]
from flufl.password import generate
from operator import attrgetter
from storm.expr import And, Or
from uuid import UUID
......@@ -43,7 +44,6 @@ from mailman.interfaces.subscriptions import (
ISubscriptionService, MissingUserError)
from mailman.interfaces.usermanager import IUserManager
from mailman.model.member import Member
from mailman.utilities.passwords import make_user_friendly_password
......@@ -161,7 +161,7 @@ class SubscriptionService:
# password to a system default. This will have to get reset since
# it can't be retrieved. Note that none of these are used unless
# the address is completely new to us.
password = make_user_friendly_password()
password = generate(int(config.passwords.password_length))
return add_member(mlist, subscriber, real_name, password,
delivery_mode,
system_preferences.preferred_language, role)
......
......@@ -29,6 +29,7 @@ import sys
import codecs
from email.utils import formataddr, parseaddr
from flufl.password import generate
from operator import attrgetter
from zope.component import getUtility
from zope.interface import implements
......@@ -40,7 +41,6 @@ from mailman.interfaces.command import ICLISubCommand
from mailman.interfaces.listmanager import IListManager
from mailman.interfaces.member import (
AlreadySubscribedError, DeliveryMode, DeliveryStatus)
from mailman.utilities.passwords import make_user_friendly_password
......@@ -198,7 +198,7 @@ class Members:
real_name = real_name.decode(fp.encoding)
email = email.decode(fp.encoding)
# Give the user a default, user-friendly password.
password = make_user_friendly_password()
password = generate(int(config.passwords.password_length))
try:
add_member(mlist, email, real_name, password,
DeliveryMode.regular,
......
......@@ -149,18 +149,6 @@ password_scheme: ssha
# When Mailman generates them, this is the default length of passwords.
password_length: 8
# Specify the type of passwords to use, when Mailman generates the passwords
# itself, as would be the case for membership requests where the user did not
# fill in a password, or during list creation, when auto-generation of admin
# passwords was selected.
#
# Set this value to 'yes' for classic Mailman user-friendly(er) passwords.
# These generate semi-pronounceable passwords which are easier to remember.
# Set this value to 'no' to use more cryptographically secure, but harder to
# remember, passwords -- if your operating system and Python version support
# the necessary feature (specifically that /dev/urandom be available).
user_friendly_passwords: yes
[runner.master]
# Define which runners, and how many of them, to start.
......
......@@ -544,7 +544,7 @@ mailing list.
>>> mlist.send_welcome_msg = True
>>> id_4 = moderator.hold_subscription(mlist,
... 'fperson@example.org', 'Frank Person',
... '{NONE}abcxyz', DeliveryMode.regular, 'en')
... 'abcxyz', DeliveryMode.regular, 'en')
A message will be sent to the moderators telling them about the held
subscription and the fact that they may need to approve it.
......@@ -695,7 +695,7 @@ Frank Person is now a member of the mailing list.
>>> print member.user.real_name
Frank Person
>>> print member.user.password
{NONE}abcxyz
{CLEARTEXT}abcxyz
Holding unsubscription requests
......
......@@ -66,7 +66,7 @@ Creating users via the API
==========================
New users can be created through the REST API. To do so requires the initial
email address for the user, and optionally the user's full name and password.
email address for the user, a password, and optionally the user's full name.
::
>>> transaction.abort()
......
......@@ -26,18 +26,18 @@ __all__ = [
]
from flufl.password import lookup, make_secret, generate
from restish import http, resource
from uuid import UUID
from zope.component import getUtility
from mailman.config import config
from mailman.interfaces.address import ExistingAddressError
from mailman.interfaces.usermanager import IUserManager
from mailman.rest.addresses import UserAddresses
from mailman.rest.helpers import CollectionMixin, etag, no_content, path_to
from mailman.rest.preferences import Preferences
from mailman.rest.validator import Validator
from mailman.utilities.passwords import (
encrypt_password, make_user_friendly_password)
......@@ -101,8 +101,9 @@ class AllUsers(_UserBase):
error.email))
if password is None:
# This will have to be reset since it cannot be retrieved.
password = make_user_friendly_password()
user.password = encrypt_password(password)
password = generate(int(config.passwords.password_length))
scheme = lookup(config.passwords.password_scheme.upper())
user.password = make_secret(password, scheme)
location = path_to('users/{0}'.format(user.user_id.int))
return http.created(location, [], None)
......
This diff is collapsed.
# Copyright (C) 2007-2011 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
# GNU Mailman is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or (at your option)
# any later version.
#
# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along with
# GNU Mailman. If not, see <http://www.gnu.org/licenses/>.
"""Unit tests for the passwords module."""
from __future__ import absolute_import, unicode_literals
__metaclass__ = type
__all__ = [
]
import unittest
from itertools import izip_longest
from mailman.config import config
from mailman.core import errors
from mailman.testing.layers import ConfigLayer
from mailman.utilities import passwords
class PasswordsTestBase:
scheme = None
def setUp(self):
# passwords; 8-bit or unicode strings; ascii or binary
self.pw8a = b'abc'
self.pw8b = b'abc\xc3\xbf' # 'abc\xff'
self.pwub = b'abc\xff'
# bad password; 8-bit or unicode; ascii or binary
self.bad8a = b'xyz'
self.bad8b = b'xyz\xc3\xbf' # 'xyz\xff'
self.badub = b'xyz\xff'
def test_passwords(self):
unless = self.failUnless
failif = self.failIf
secret = passwords.make_secret(self.pw8a, self.scheme)
unless(passwords.check_response(secret, self.pw8a))
failif(passwords.check_response(secret, self.bad8a))
def test_passwords_with_funky_chars(self):
unless = self.failUnless
failif = self.failIf
secret = passwords.make_secret(self.pw8b, self.scheme)
unless(passwords.check_response(secret, self.pw8b))
failif(passwords.check_response(secret, self.bad8b))
def test_unicode_passwords_with_funky_chars(self):
unless = self.failUnless
failif = self.failIf
secret = passwords.make_secret(self.pwub, self.scheme)
unless(passwords.check_response(secret, self.pwub))
failif(passwords.check_response(secret, self.badub))
class TestBogusPasswords(PasswordsTestBase, unittest.TestCase):
scheme = -1
def test_passwords(self):
self.assertRaises(errors.BadPasswordSchemeError,
passwords.make_secret, self.pw8a, self.scheme)
def test_passwords_with_funky_chars(self):
self.assertRaises(errors.BadPasswordSchemeError,
passwords.make_secret, self.pw8b, self.scheme)
def test_unicode_passwords_with_funky_chars(self):
self.assertRaises(errors.BadPasswordSchemeError,
passwords.make_secret, self.pwub, self.scheme)
class TestNonePasswords(PasswordsTestBase, unittest.TestCase):
scheme = passwords.Schemes.no_scheme
def test_passwords(self):
failif = self.failIf
secret = passwords.make_secret(self.pw8a, self.scheme)
failif(passwords.check_response(secret, self.pw8a))
failif(passwords.check_response(secret, self.bad8a))
def test_passwords_with_funky_chars(self):
failif = self.failIf
secret = passwords.make_secret(self.pw8b, self.scheme)
failif(passwords.check_response(secret, self.pw8b))
failif(passwords.check_response(secret, self.bad8b))
def test_unicode_passwords_with_funky_chars(self):
failif = self.failIf
secret = passwords.make_secret(self.pwub, self.scheme)
failif(passwords.check_response(secret, self.pwub))
failif(passwords.check_response(secret, self.badub))
class TestCleartextPasswords(PasswordsTestBase, unittest.TestCase):
scheme = passwords.Schemes.cleartext
class TestSHAPasswords(PasswordsTestBase, unittest.TestCase):
scheme = passwords.Schemes.sha
class TestSSHAPasswords(PasswordsTestBase, unittest.TestCase):
scheme = passwords.Schemes.ssha
class TestPBKDF2Passwords(PasswordsTestBase, unittest.TestCase):
scheme = passwords.Schemes.pbkdf2
class TestSchemeLookup(unittest.TestCase):
def test_scheme_name_lookup(self):
unless = self.failUnless
unless(passwords.lookup_scheme('NONE') is passwords.Schemes.no_scheme)
unless(passwords.lookup_scheme('CLEARTEXT') is
passwords.Schemes.cleartext)
unless(passwords.lookup_scheme('SHA') is passwords.Schemes.sha)
unless(passwords.lookup_scheme('SSHA') is passwords.Schemes.ssha)
unless(passwords.lookup_scheme('PBKDF2') is passwords.Schemes.pbkdf2)
unless(passwords.lookup_scheme(' -bogus- ') is None)
# See itertools doc page examples.
def _grouper(seq):
args = [iter(seq)] * 2
return list(izip_longest(*args))
class TestPasswordGeneration(unittest.TestCase):
layer = ConfigLayer
def test_default_user_friendly_password_length(self):
self.assertEqual(len(passwords.make_user_friendly_password()),
int(config.passwords.password_length))
def test_provided_user_friendly_password_length(self):
self.assertEqual(len(passwords.make_user_friendly_password(12)), 12)
def test_provided_odd_user_friendly_password_length(self):
self.assertEqual(len(passwords.make_user_friendly_password(15)), 15)
def test_user_friendly_password(self):
password = passwords.make_user_friendly_password()
for pair in _grouper(password):
# There will always be one vowel and one non-vowel.
vowel = (pair[0] if pair[0] in 'aeiou' else pair[1])
consonant = (pair[0] if pair[0] not in 'aeiou' else pair[1])
self.assertTrue(vowel in 'aeiou', vowel)
self.assertTrue(consonant not in 'aeiou', consonant)
def test_encrypt_password_plaintext_default_scheme(self):
# Test that a plain text password gets encrypted.
self.assertEqual(passwords.encrypt_password('abc'),
'{CLEARTEXT}abc')
def test_encrypt_password_plaintext(self):
# Test that a plain text password gets encrypted with the given scheme.
scheme = passwords.Schemes.sha
self.assertEqual(passwords.encrypt_password('abc', scheme),
'{SHA}qZk-NkcGgWq6PiVxeFDCbJzQ2J0=')
def test_encrypt_password_plaintext_by_scheme_name(self):
# Test that a plain text password gets encrypted with the given
# scheme, which is given by name.
self.assertEqual(passwords.encrypt_password('abc', 'cleartext'),
'{CLEARTEXT}abc')
def test_encrypt_password_already_encrypted_default_scheme(self):
# Test that a password which is already encrypted is return unchanged.
self.assertEqual(passwords.encrypt_password('{SHA}abc'), '{SHA}abc')
def test_encrypt_password_already_encrypted(self):
# Test that a password which is already encrypted is return unchanged,
# ignoring any requested scheme.
scheme = passwords.Schemes.cleartext
self.assertEqual(passwords.encrypt_password('{SHA}abc', scheme),
'{SHA}abc')
def test_encrypt_password_password_value_error(self):
self.assertRaises(ValueError, passwords.encrypt_password, 7)
def test_encrypt_password_scheme_value_error(self):
self.assertRaises(ValueError, passwords.encrypt_password, 'abc', 'foo')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment