[Checkins] SVN: Products.PluggableAuthService/branches/shh-16-masquerading/ Merged r102150:HEAD from 1.6 branch.
Stefan H. Holek
stefan at epy.co.at
Tue Jun 21 05:02:46 EDT 2011
Log message for revision 121961:
Merged r102150:HEAD from 1.6 branch.
Changed:
_U Products.PluggableAuthService/branches/shh-16-masquerading/
A Products.PluggableAuthService/branches/shh-16-masquerading/COPYRIGHT.txt
A Products.PluggableAuthService/branches/shh-16-masquerading/LICENSE.txt
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/COPYRIGHT.txt
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/basic_auth.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/upgrade.py
D Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/LICENSE.txt
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PluggableAuthService.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PropertiedUser.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/UserPropertySheet.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/__init__.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/doc/CHANGES.txt
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/exportimport.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/__init__.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/authservice.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/plugins.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/propertysheets.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/request.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/permissions.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/BasePlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ChallengeProtocolChooser.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/CookieAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DomainAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/InlineAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/LocalRolePlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RecursiveGroupsPlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RequestTypeSniffer.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ScriptablePlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SessionAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBRoleManager.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBUserManager.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/__init__.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/exportimport.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/__init__.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/helpers.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ChallengeProtocolChooser.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_CookieAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DomainAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_HTTPBasicAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_InlineAuthHelper.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_LocalRolePlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RecursiveGroupsPlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RequestTypeSniffer.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ScriptablePlugin.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_doctests.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_exportimport.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/__init__.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/conformance.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/pastc.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_Caching.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_MoreCaching.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PluggableAuthService.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PropertiedUser.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserFolder.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserPropertySheet.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_exportimport.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_utils.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/utils.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/utils.py
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt
U Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/zcml.py
U Products.PluggableAuthService/branches/shh-16-masquerading/bootstrap.py
U Products.PluggableAuthService/branches/shh-16-masquerading/buildout.cfg
U Products.PluggableAuthService/branches/shh-16-masquerading/setup.py
-=-
Property changes on: Products.PluggableAuthService/branches/shh-16-masquerading
___________________________________________________________________
Modified: svn:ignore
- Products.PluggableAuthService.egg-info
develop-eggs
dist
eggs
bin
var
parts
downloads
.installed.cfg
+ Products.PluggableAuthService.egg-info
develop-eggs
dist
eggs
fake-eggs
bin
var
parts
downloads
.installed.cfg
Copied: Products.PluggableAuthService/branches/shh-16-masquerading/COPYRIGHT.txt (from rev 121960, Products.PluggableAuthService/branches/1.6/COPYRIGHT.txt)
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/COPYRIGHT.txt (rev 0)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/COPYRIGHT.txt 2011-06-21 09:02:46 UTC (rev 121961)
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
Copied: Products.PluggableAuthService/branches/shh-16-masquerading/LICENSE.txt (from rev 121960, Products.PluggableAuthService/branches/1.6/LICENSE.txt)
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/LICENSE.txt (rev 0)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/LICENSE.txt 2011-06-21 09:02:46 UTC (rev 121961)
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/COPYRIGHT.txt
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/COPYRIGHT.txt 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/COPYRIGHT.txt 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2006 Zope Corporation (TM) and Contributors.
+Copyright (c) 2004-2006 Zope Foundation and Contributors.
All Rights Reserved.
This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/basic_auth.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/basic_auth.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/basic_auth.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/upgrade.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/upgrade.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/Extensions/upgrade.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2004 Zope Corporation. All Rights Reserved.
+# Copyright (c) 2004 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Visible Source
# License, Version 1.0 (ZVSL). A copy of the ZVSL should accompany this
Deleted: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/LICENSE.txt
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/LICENSE.txt 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/LICENSE.txt 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,54 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
- accompanying copyright notice, this list of conditions,
- and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
- copyright notice, this list of conditions, and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
- endorse or promote products derived from this software
- without prior written permission from the copyright
- holders.
-
-4. The right to distribute this software or to use it for
- any purpose does not give you the right to use
- Servicemarks (sm) or Trademarks (tm) of the copyright
- holders. Use of them is covered by separate agreement
- with the copyright holders.
-
-5. If any files are modified, you must cause the modified
- files to carry prominent notices stating that you changed
- the files and the date of any change.
-
-Disclaimer
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
- AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- NO EVENT SHALL THE COPYRIGHT HOLDERS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
-
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PluggableAuthService.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PluggableAuthService.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PluggableAuthService.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PropertiedUser.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PropertiedUser.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/PropertiedUser.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/UserPropertySheet.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/UserPropertySheet.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/UserPropertySheet.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/__init__.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/__init__.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/__init__.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/doc/CHANGES.txt 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/doc/CHANGES.txt 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,14 +1,48 @@
PluggableAuthService changelog
==============================
-PluggableAuthService 1.6.2 (unreleased)
+PluggableAuthService 1.6.6 (unreleased)
---------------------------------------
+- TBD
+
+PluggableAuthService 1.6.5 (2011-05-30)
+---------------------------------------
+
+- Launchpad #789858: don't allow conflicting login name in 'updateUser'.
+
+- Launchpad #672694: In the ZODBRoleManager made it clearer that
+ adding a removing a role does not have much effect if you do not do
+ the same in the root of the site (at the bottom of the Security tab
+ at manage_access).
+
+
+PluggableAuthService 1.6.4 (2010-11-04)
+---------------------------------------
+
+- Don't fail on users defined in multiple user sources on the ZODBGroupManager
+ listing page.
+
+
+PluggableAuthService 1.6.3 (2010-02-01)
+---------------------------------------
+
+- Fixed xml templates directory path computation to allow reuse of
+ ``SimpleXMLExportImport`` class outside ``Products.PluggableAuthService``.
+
+
+PluggableAuthService 1.6.2 (2009-11-16)
+---------------------------------------
+
+- Launchpad #420319: Fix misconfigured ``startswith`` match type filter
+ in ``plugins.DomainAuthHelper``.
+
- Fixed test setup for tests using page templates relying on the
DefaultTraversable adapter.
- Fixed broken markup.
+
PluggableAuthService 1.6.1 (2008-11-20)
---------------------------------------
@@ -18,6 +52,7 @@
- Launchpad #300321: ZODBGroupManager.enumerateGroups failed to find
groups with unicode IDs.
+
PluggableAuthService 1.6 (2008-08-05)
-------------------------------------
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/exportimport.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/exportimport.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/exportimport.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
#
# 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.
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/__init__.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/__init__.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/__init__.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/authservice.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/authservice.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/authservice.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/plugins.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/plugins.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/plugins.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/propertysheets.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/propertysheets.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/propertysheets.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/request.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/request.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/interfaces/request.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/permissions.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/permissions.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/permissions.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/BasePlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/BasePlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/BasePlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ChallengeProtocolChooser.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ChallengeProtocolChooser.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ChallengeProtocolChooser.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/CookieAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/CookieAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/CookieAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -18,6 +18,7 @@
"""
from base64 import encodestring, decodestring
+from binascii import Error
from urllib import quote, unquote
from AccessControl.SecurityInfo import ClassSecurityInfo
@@ -118,15 +119,25 @@
creds['password'] = request.form.get('__ac_password', '')
elif cookie and cookie != 'deleted':
- cookie_val = decodestring(unquote(cookie))
+ raw = unquote(cookie)
try:
+ cookie_val = decodestring(raw)
+ except Error:
+ # Cookie is in a different format, so it is not ours
+ return creds
+
+ try:
login, password = cookie_val.split(':')
except ValueError:
# Cookie is in a different format, so it is not ours
return creds
- creds['login'] = login.decode('hex')
- creds['password'] = password.decode('hex')
+ try:
+ creds['login'] = login.decode('hex')
+ creds['password'] = password.decode('hex')
+ except TypeError:
+ # Cookie is in a different format, so it is not ours
+ return {}
if creds:
creds['remote_host'] = request.get('REMOTE_HOST', '')
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DomainAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DomainAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DomainAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -88,7 +88,7 @@
_MATCH_TYPE_FILTERS = {
'equals': EqualsFilter,
- 'startswith': EndsWithFilter,
+ 'startswith': StartsWithFilter,
'endswith': EndsWithFilter,
'regex': RegexFilter,
}
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/InlineAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/InlineAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/InlineAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/LocalRolePlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/LocalRolePlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/LocalRolePlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RecursiveGroupsPlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RecursiveGroupsPlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RecursiveGroupsPlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RequestTypeSniffer.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RequestTypeSniffer.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/RequestTypeSniffer.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ScriptablePlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ScriptablePlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ScriptablePlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SessionAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SessionAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/SessionAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -250,14 +250,12 @@
for k, v in self._principal_groups.items():
if group_id in v:
- # should be one and only one mapping to 'k'
-
parent = aq_parent( self )
info = parent.searchPrincipals( id=k, exact_match=True )
- assert( len( info ) in ( 0, 1 ) )
if len( info ) == 0:
title = '<%s: not found>' % k
else:
+ # always use the title of the first principal found
title = info[0].get( 'title', k )
result.append( ( k, title ) )
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBRoleManager.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBRoleManager.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBRoleManager.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -223,6 +223,10 @@
""" Remove 'role_id' from the list of roles managed by this object.
o Raise KeyError if not found.
+
+ Note that if you really want to remove a role you should first
+ remove it from the roles in the root of the site (at the
+ bottom of the Security tab at manage_access).
"""
for principal_id in self._principal_roles.keys():
self.removeRoleFromPrincipal( role_id, principal_id )
@@ -397,7 +401,11 @@
, RESPONSE
, REQUEST=None
):
- """ Remove one or more roles via the ZMI.
+ """ Remove one or more role assignments via the ZMI.
+
+ Note that if you really want to remove a role you should first
+ remove it from the roles in the root of the site (at the
+ bottom of the Security tab at manage_access).
"""
role_ids = filter( None, role_ids )
@@ -409,7 +417,7 @@
for role_id in role_ids:
self.removeRole( role_id )
- message = 'Roles+removed'
+ message = 'Role+assignments+removed'
RESPONSE.redirect( '%s/manage_roles?manage_tabs_message=%s'
% ( self.absolute_url(), message )
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBUserManager.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBUserManager.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/ZODBUserManager.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
-##############################################################################
+#############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -296,10 +296,15 @@
# The following raises a KeyError if the user_id is invalid
old_login = self.getLoginForUserId(user_id)
- del self._login_to_userid[old_login]
- self._login_to_userid[login_name] = user_id
- self._userid_to_login[user_id] = login_name
+ if old_login != login_name:
+ if self._login_to_userid.get(login_name) is not None:
+ raise ValueError('Login name not available: %s' % login_name)
+
+ del self._login_to_userid[old_login]
+ self._login_to_userid[login_name] = user_id
+ self._userid_to_login[user_id] = login_name
+
security.declarePrivate( 'removeUser' )
def removeUser( self, user_id ):
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/__init__.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/__init__.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/__init__.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/exportimport.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/exportimport.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/exportimport.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2005 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -54,6 +54,8 @@
$Id$
"""
+import os, sys
+
from xml.dom.minidom import parseString
from Acquisition import Implicit
@@ -70,6 +72,10 @@
from Products.PageTemplates.PageTemplateFile \
import PageTemplateFile as PageTemplateResource
+def getPackagePath(instance):
+ module = sys.modules[instance.__module__]
+ return os.path.dirname(module.__file__)
+
class SimpleXMLExportImport(Implicit):
""" Base for plugins whose configuration can be dumped to an XML file.
@@ -95,8 +101,9 @@
def export(self, export_context, subdir, root=False):
""" See IFilesystemExporter.
"""
+ package_path = getPackagePath(self)
template = PageTemplateResource('xml/%s' % self._FILENAME,
- globals()).__of__(self.context)
+ package_path).__of__(self.context)
info = self._getExportInfo()
export_context.writeDataFile('%s.xml' % self.context.getId(),
template(info=info),
@@ -209,7 +216,7 @@
'title': ginfo['title'],
'description': ginfo['description'],
}
- info['principals'] = self._listGroupPrincipals(group_id)
+ info['principals'] = self._listGroupPrincipals(group_id)
group_info.append(info)
return {'title': self.context.title,
'groups': group_info,
@@ -260,7 +267,7 @@
'title': rinfo['title'],
'description': rinfo['description'],
}
- info['principals'] = self._listRolePrincipals(role_id)
+ info['principals'] = self._listRolePrincipals(role_id)
role_info.append(info)
return {'title': self.context.title,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/__init__.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/__init__.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/__init__.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/helpers.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/helpers.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/helpers.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ChallengeProtocolChooser.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ChallengeProtocolChooser.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ChallengeProtocolChooser.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_CookieAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_CookieAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_CookieAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -187,7 +187,38 @@
'remote_host': '',
'remote_address': ''})
+ def test_extractCredentials_from_cookie_with_colon_that_is_not_ours(self):
+ # http://article.gmane.org/gmane.comp.web.zope.plone.product-developers/5145
+ from base64 import encodestring
+ helper = self._makeOne()
+ response = FauxCookieResponse()
+ request = FauxSettableRequest(RESPONSE=response)
+
+ cookie_str = 'cookie:from_other_plugin'
+ cookie_val = encodestring(cookie_str)
+ cookie_val = cookie_val.rstrip()
+ request.set(helper.cookie_name, cookie_val)
+
+ self.assertEqual(helper.extractCredentials(request),
+ {})
+
+ def test_extractCredentials_from_cookie_with_bad_binascii(self):
+ # this might happen between browser implementations
+ from base64 import encodestring
+
+ helper = self._makeOne()
+ response = FauxCookieResponse()
+ request = FauxSettableRequest(RESPONSE=response)
+
+ cookie_val = 'NjE2NDZkNjk2ZTo3MDZjNmY2ZTY1MzQ3NQ%3D%3D'[:-1]
+ request.set(helper.cookie_name, cookie_val)
+
+ self.assertEqual(helper.extractCredentials(request),
+ {})
+
+
+
if __name__ == "__main__":
unittest.main()
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DomainAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DomainAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DomainAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2008 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001-2008 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_HTTPBasicAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_HTTPBasicAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_HTTPBasicAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_InlineAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_InlineAuthHelper.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_InlineAuthHelper.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_LocalRolePlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_LocalRolePlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_LocalRolePlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RecursiveGroupsPlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RecursiveGroupsPlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RecursiveGroupsPlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RequestTypeSniffer.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RequestTypeSniffer.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_RequestTypeSniffer.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ScriptablePlugin.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ScriptablePlugin.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ScriptablePlugin.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2008 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001-2008 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2008 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001-2008 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2008 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001-2008 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -443,6 +443,17 @@
self.assertEqual(user_id, 'user1')
self.assertEqual(login, 'user1 at foobar.com')
+ def test_updateUser_login_name_conflicts(self):
+ # See https://bugs.launchpad.net/zope-pas/+bug/789858
+ zum = self._makeOne()
+
+ # Create a user and make sure we can authenticate with it
+ zum.addUser( 'user1', 'user1 at example.com', 'password' )
+ zum.addUser( 'user2', 'user2 at example.com', 'other' )
+
+ self.assertRaises(ValueError,
+ zum.updateUser, 'user1', 'user2 at example.com')
+
def test_enumerateUsersWithOptionalMangling(self):
zum = self._makeOne()
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_doctests.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_doctests.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_doctests.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_exportimport.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_exportimport.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/tests/test_exportimport.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2005 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt 2011-06-21 09:02:46 UTC (rev 121961)
@@ -17,6 +17,11 @@
<h3> Current Roles <a href="?adding=1">(Add a role)</a></h3>
+<p>
+ Note that adding or removing a role here does not have much effect
+ if you do not do the same in the root of the site (at the bottom of
+ the Security tab at manage_access).
+</p>
<table width="100%" cellpadding="2" cellspacing="0">
<tr>
@@ -62,7 +67,7 @@
<td colspan="3">
<input type="hidden" name="role_ids:list:default" value="" />
<input type="submit" name="manage_removeRoles:method"
- value=" Remove Roles " />
+ value=" Remove Role Assignment " />
</td>
</tr>
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/__init__.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/__init__.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/__init__.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/conformance.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/conformance.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/conformance.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/pastc.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/pastc.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/pastc.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_Caching.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_Caching.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_Caching.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_MoreCaching.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_MoreCaching.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_MoreCaching.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PluggableAuthService.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PluggableAuthService.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PluggableAuthService.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PropertiedUser.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PropertiedUser.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_PropertiedUser.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserFolder.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserFolder.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserFolder.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserPropertySheet.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserPropertySheet.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_UserPropertySheet.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -42,7 +42,7 @@
_STRING_VALUE = 'string'
_INT_VALUE = 42
_FLOAT_VALUE = 9.8
- _LONG_VALUE = 1000000000000
+ _LONG_VALUE = 10000000000000000000
_DATE_VALUE = DateTime()
_LIST_VALUE = [ 'a', 'b', 'c' ]
_TUPLE_VALUE = ( 'd', 'e', 'f' )
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_exportimport.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_exportimport.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_exportimport.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2005 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_utils.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_utils.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/test_utils.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/utils.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/utils.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/tests/utils.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/utils.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/utils.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/utils.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
# Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1 +1 @@
-1.6.2dev
+1.6.6dev
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/zcml.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/zcml.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/zcml.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2007 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2007 Zope Foundation and Contributors.
#
# 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.
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/bootstrap.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/bootstrap.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/bootstrap.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/buildout.cfg
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/buildout.cfg 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/buildout.cfg 2011-06-21 09:02:46 UTC (rev 121961)
@@ -1,21 +1,26 @@
[buildout]
parts = zope2 instance test
develop = .
+eggs =
+ plone.recipe.zope2instance <= 3.9.999
+ five.localsitemanager <= 1.0
+ Products.GenericSetup <= 1.4.999
+ Products.PluginRegistry
+ Products.PluggableAuthService
[zope2]
recipe = plone.recipe.zope2install
-url = http://www.zope.org/Products/Zope/2.11.1/Zope-2.11.1-final.tgz
+url = http://www.zope.org/Products/Zope/2.11.4/Zope-2.11.4-final.tgz
+smart-recompile = True
[instance]
-recipe = plone.recipe.zope2instance
+recipe = plone.recipe.zope2instance <= 3.9.999
zope2-location = ${zope2:location}
user = admin:admin
-eggs = Products.PluginRegistry
- Products.GenericSetup
- Products.PluggableAuthService
+eggs = ${buildout:eggs}
[test]
-recipe = collective.recipe.z2testrunner
-zope2part = instance
-packages = Products.PluggableAuthService
-defaults = ['-c']
+recipe = zc.recipe.testrunner
+eggs = ${buildout:eggs}
+extra-paths = ${zope2:location}/lib/python
+defaults = ['-cv', '--module', '^Products.PluggableAuthService']
Modified: Products.PluggableAuthService/branches/shh-16-masquerading/setup.py
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/setup.py 2011-06-21 06:47:57 UTC (rev 121960)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/setup.py 2011-06-21 09:02:46 UTC (rev 121961)
@@ -11,12 +11,10 @@
f = open(os.path.join(package, name))
return f.read()
-_boundary = '\n' + ('-' * 60) + '\n\n'
+_boundary = '\n\n'
README = ( _package_doc('README.txt')
+ _boundary
+ _package_doc('doc/CHANGES.txt')
- + _boundary
- + "Download\n========"
)
setup(name='Products.%s' % NAME,
@@ -35,7 +33,7 @@
"Authentication/Directory",
],
keywords='web application server zope zope2',
- author="Zope Corporation and contributors",
+ author="Zope Foundation and Contributors",
author_email="zope-cmf at zope.org",
url="http://pypi.python.org/pypi/Products.PluggableAuthService",
license="ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)",
More information about the checkins
mailing list