fixed string encoding of SSHA encoded passwords in Python 3

Author: cmeerw

CHANGES.txt

@@ -11,6 +11,12 @@ Python v2.5 and v2.6.  Starting with the v1.6 releases of Roundup
 v2.7.2 or later are required to run newer releases of Roundup.  From v2.0
 onwards Python 3.4 and later are also supported.
 
+2020-XX-YY 2.0.0 beta 1
+
+Fixed:
+
+- encoding for SSHA encoded passwords with Python 3 (Christof
+  Meerwald)
 
 2020-04-05 2.0.0 beta 0
 

roundup/password.py

@@ -114,7 +114,7 @@ def ssha(password, salt):
     '''
     shaval = sha1(password)  # nosec
     shaval.update(salt)
-    ssha_digest = b64encode(shaval.digest() + salt).strip()
+    ssha_digest = b2s(b64encode(shaval.digest() + salt).strip())
     return ssha_digest
 
 
@@ -359,13 +359,17 @@ def __str__(self):
 def test():
     # SHA
     p = Password('sekrit')
+    assert Password(encrypted=str(p)) == 'sekrit'
+    assert 'sekrit' == Password(encrypted=str(p))
     assert p == 'sekrit'
     assert p != 'not sekrit'
     assert 'sekrit' == p
     assert 'not sekrit' != p
 
     # MD5
     p = Password('sekrit', 'MD5')
+    assert Password(encrypted=str(p)) == 'sekrit'
+    assert 'sekrit' == Password(encrypted=str(p))
     assert p == 'sekrit'
     assert p != 'not sekrit'
     assert 'sekrit' == p
@@ -374,13 +378,17 @@ def test():
     # crypt
     if crypt:  # not available on Windows
         p = Password('sekrit', 'crypt')
+        assert Password(encrypted=str(p)) == 'sekrit'
+        assert 'sekrit' == Password(encrypted=str(p))
         assert p == 'sekrit'
         assert p != 'not sekrit'
         assert 'sekrit' == p
         assert 'not sekrit' != p
 
     # SSHA
     p = Password('sekrit', 'SSHA')
+    assert Password(encrypted=str(p)) == 'sekrit'
+    assert 'sekrit' == Password(encrypted=str(p))
     assert p == 'sekrit'
     assert p != 'not sekrit'
     assert 'sekrit' == p
@@ -397,6 +405,8 @@ def test():
 
     # PBKDF2 - high level integration
     p = Password('sekrit', 'PBKDF2')
+    assert Password(encrypted=str(p)) == 'sekrit'
+    assert 'sekrit' == Password(encrypted=str(p))
     assert p == 'sekrit'
     assert p != 'not sekrit'
     assert 'sekrit' == p