[Zope3-checkins] SVN: Zope3/branches/hdima-password-managers/src/zope/app/security/ Ooops, we don't need to encode already encoded password

[Dmitry Vasiliev]

Log message for revision 39584:
  Ooops, we don't need to encode already encoded password
  

Changed:
  U   Zope3/branches/hdima-password-managers/src/zope/app/security/globalprincipals.txt
  U   Zope3/branches/hdima-password-managers/src/zope/app/security/principalregistry.py
  _U  Zope3/branches/hdima-password-managers/src/zope/app/security/tests/module.py
  _U  Zope3/branches/hdima-password-managers/src/zope/app/security/tests/modulehookup.py
  U   Zope3/branches/hdima-password-managers/src/zope/app/security/tests/principal.zcml
  U   Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_adapter.py
  _U  Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_basicauthadapter.py
  _U  Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_loginpassword.py
  U   Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_logout.py
  _U  Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_vocabulary.py

-=-
Modified: Zope3/branches/hdima-password-managers/src/zope/app/security/globalprincipals.txt
===================================================================
--- Zope3/branches/hdima-password-managers/src/zope/app/security/globalprincipals.txt	2005-10-24 18:52:14 UTC (rev 39583)
+++ Zope3/branches/hdima-password-managers/src/zope/app/security/globalprincipals.txt	2005-10-24 18:59:18 UTC (rev 39584)
@@ -19,8 +19,8 @@
     ...         title="Manager"
     ...         description="System Manager"
     ...         login="admin"
-    ...         password="123"
     ...         password_manager="SHA1"
+    ...         password="40bd001563085fc35165329ea1ff5c5ecbdbbeef"
     ...         />
     ...
     ...    </configure>

Modified: Zope3/branches/hdima-password-managers/src/zope/app/security/principalregistry.py
===================================================================
--- Zope3/branches/hdima-password-managers/src/zope/app/security/principalregistry.py	2005-10-24 18:52:14 UTC (rev 39583)
+++ Zope3/branches/hdima-password-managers/src/zope/app/security/principalregistry.py	2005-10-24 18:59:18 UTC (rev 39584)
@@ -153,8 +153,7 @@
         super(Principal, self).__init__(id, title, description)
         self.__login = login
         self.__pwManagerName = pwManagerName
-        pwManager = self.__getPasswordManager()
-        self.__pw = pwManager.encodePassword(pw)
+        self.__pw = pw
 
     def __getPasswordManager(self):
         return zapi.getUtility(IPasswordManager, self.__pwManagerName)


Property changes on: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/module.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/modulehookup.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/principal.zcml
===================================================================
--- Zope3/branches/hdima-password-managers/src/zope/app/security/tests/principal.zcml	2005-10-24 18:52:14 UTC (rev 39583)
+++ Zope3/branches/hdima-password-managers/src/zope/app/security/tests/principal.zcml	2005-10-24 18:59:18 UTC (rev 39584)
@@ -5,16 +5,21 @@
 
   <include package="zope.app.security" file="meta.zcml"/>
 
-  <principal 
+  <principal
       id="zope.p1"
       title="Sir Tim Peters"
       description="Tim Peters"
-      login="tim" password="123" password_manager="SHA1" />
+      login="tim"
+      password_manager="SHA1"
+      password="40bd001563085fc35165329ea1ff5c5ecbdbbeef"
+      />
 
-  <principal 
+  <principal
       id="zope.p2"
       title="Sir Jim Fulton"
       description="Jim Fulton"
-      login="jim" password="123" />
- 
+      login="jim"
+      password="123"
+      />
+
 </configure>

Modified: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_adapter.py
===================================================================
--- Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_adapter.py	2005-10-24 18:52:14 UTC (rev 39583)
+++ Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_adapter.py	2005-10-24 18:59:18 UTC (rev 39584)
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
@@ -17,11 +17,12 @@
 import unittest
 from zope.testing.doctestunit import DocTestSuite
 
+
 def test_suite():
     return unittest.TestSuite((
         DocTestSuite('zope.app.security.adapter'),
         ))
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
-


Property changes on: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_basicauthadapter.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_loginpassword.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_logout.py
===================================================================
--- Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_logout.py	2005-10-24 18:52:14 UTC (rev 39583)
+++ Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_logout.py	2005-10-24 18:59:18 UTC (rev 39584)
@@ -1,3 +1,19 @@
+##############################################################################
+#
+# Copyright (c) 2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""
+$Id$
+"""
 import unittest
 
 from zope.testing import doctest
@@ -8,6 +24,7 @@
 from zope.app.testing import placelesssetup
 from zope.app.security import interfaces
 
+
 def test_suite():
     return unittest.TestSuite((
         doctest.DocFileSuite(
@@ -23,5 +40,6 @@
             ),
         ))
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')


Property changes on: Zope3/branches/hdima-password-managers/src/zope/app/security/tests/test_vocabulary.py
___________________________________________________________________
Name: svn:keywords
   + Id