Added ability to check with SHA-1

Chandrashekar

2012-09-26 9f75321b652b68356f46cec2d63152b1c9f964db

Added ability to check with SHA-1

 repoze/who/plugins/htpasswd.py

@@ -96,6 +96,12 @@
    salt = hashed[:2]
    return _same_string(hashed, crypt(password, salt))

def sha1_check(password, hashed):
    from hashlib import sha1
    import base64
    encrypted_string = base64.standard_b64encode(sha1(password).digest())
    return _same_string(hashed, "%s%s" % ("{SHA}",encrypted_string))

def plain_check(password, hashed):
    return _same_string(password, hashed)


 repoze/who/plugins/tests/test_htpasswd.py

@@ -128,6 +128,15 @@
        self.assertEqual(crypt_check('password', hashed), True)
        self.assertEqual(crypt_check('notpassword', hashed), False)

    def test_sha1_check(self):
        import base64
        from hashlib import sha1
        from repoze.who.plugins.htpasswd import sha1_check

        encrypted_string = base64.standard_b64encode(sha1("password").digest())
        self.assertEqual(sha1_check('password', "%s%s" % ("{SHA}",encrypted_string)), True)
        self.assertEqual(sha1_check('notpassword', "%s%s" % ("{SHA}", encrypted_string)), False)

    def test_plain_check(self):
        from repoze.who.plugins.htpasswd import plain_check
        self.failUnless(plain_check('password', 'password'))