Log message for revision 71821: Forwardport from 2.10 branch: Log message for revision 71819: - Fixed Collector #2190: Calls to zope.security.management.checkPermission aren't rerouted to Zope 2's security policy. NOTE: If you already have a Zope 2.10 instance running, you will either have to recreate it or add the following lines to the end of the etc/site.zcml file:: <securityPolicy component="Products.Five.security.FiveSecurityPolicy" />
Changed: U Zope/trunk/doc/CHANGES.txt _U Zope/trunk/lib/python/Products/ U Zope/trunk/lib/python/ZPublisher/Publish.py U Zope/trunk/skel/etc/site.zcml -=- Modified: Zope/trunk/doc/CHANGES.txt =================================================================== --- Zope/trunk/doc/CHANGES.txt 2007-01-08 17:24:53 UTC (rev 71820) +++ Zope/trunk/doc/CHANGES.txt 2007-01-08 17:34:19 UTC (rev 71821) @@ -8,6 +8,17 @@ Restructuring + - Fixed Collector #2190: Calls to + zope.security.management.checkPermission aren't rerouted to + Zope 2's security policy. + + NOTE: If you already have a Zope 2.10 instance running, you + will either have to recreate it or add the following lines to + the end of the etc/site.zcml file:: + + <securityPolicy + component="Products.Five.security.FiveSecurityPolicy" /> + - Fixed Collector #2223: Evaluation of booleans in TALES and the 'default' variable. Property changes on: Zope/trunk/lib/python/Products ___________________________________________________________________ Name: svn:externals - Five -r 70998 svn://svn.zope.org/repos/main/Products.Five/trunk + Five -r 71820 svn://svn.zope.org/repos/main/Products.Five/trunk Modified: Zope/trunk/lib/python/ZPublisher/Publish.py =================================================================== --- Zope/trunk/lib/python/ZPublisher/Publish.py 2007-01-08 17:24:53 UTC (rev 71820) +++ Zope/trunk/lib/python/ZPublisher/Publish.py 2007-01-08 17:34:19 UTC (rev 71821) @@ -22,6 +22,7 @@ from mapply import mapply from zExceptions import Redirect from zope.publisher.browser import setDefaultSkin +from zope.security.management import newInteraction, endInteraction class Retry(Exception): """Raise this to retry a request @@ -74,6 +75,9 @@ response=None try: + # TODO pass request here once BaseRequest implements IParticipation + newInteraction() + request.processInputs() request_get=request.get @@ -119,6 +123,7 @@ if transactions_manager: transactions_manager.commit() + endInteraction() return response except: @@ -154,6 +159,7 @@ finally: if transactions_manager: transactions_manager.abort() + endInteraction() # Only reachable if Retry is raised and request supports retry. newrequest=request.retry() @@ -168,6 +174,7 @@ else: if transactions_manager: transactions_manager.abort() + endInteraction() raise Modified: Zope/trunk/skel/etc/site.zcml =================================================================== --- Zope/trunk/skel/etc/site.zcml 2007-01-08 17:24:53 UTC (rev 71820) +++ Zope/trunk/skel/etc/site.zcml 2007-01-08 17:34:19 UTC (rev 71821) @@ -3,25 +3,25 @@ xmlns:meta="http://namespaces.zope.org/meta" xmlns:five="http://namespaces.zope.org/five"> + <meta:provides feature="devmode" /> + <include package="Products.Five" /> <meta:redefinePermission from="zope2.Public" to="zope.Public" /> <!-- Load the meta --> - <include files="package-includes/*-meta.zcml" /> <five:loadProducts file="meta.zcml"/> - <!-- Load the configuration --> - <include files="package-includes/*-configure.zcml" /> <five:loadProducts /> - <!-- Load the configuration overrides--> - - <includeOverrides files="package-includes/*-overrides.zcml" /> <five:loadProductsOverrides /> + + <securityPolicy + component="Products.Five.security.FiveSecurityPolicy" /> + </configure> _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins