[Erp5-report] r25333 - /erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py

[nobody at svn.erp5.org]

Author: ivan
Date: Wed Jan 28 14:42:26 2009
New Revision: 25333

URL: http://svn.erp5.org?rev=25333&view=rev
Log:
Restore security manager to original one instead to no security manager (Anonymous User).
Fix import section.

Modified:
    erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py

Modified: erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py?rev=25333&r1=25332&r2=25333&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py [utf8] Wed Jan 28 14:42:26 2009
@@ -38,9 +38,8 @@
 from cStringIO import StringIO
 from UserDict import UserDict
 import xmlrpclib, socket, sys, traceback, urllib, urllib2, base64, cgi
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
-import zLOG
-import cookielib
+from AccessControl.SecurityManagement import newSecurityManager, getSecurityManager, setSecurityManager
+import zLOG, cookielib
 from urlparse import urlparse, urlunparse
 from base64 import encodestring, decodestring
 from urllib import quote, unquote
@@ -85,8 +84,9 @@
 
 def _setSuperSecurityManager(self):
   """ Change to super user account. """
-  user = self.getWrappedOwner()
-  newSecurityManager(self.REQUEST, user)
+  original_security_manager = getSecurityManager()
+  newSecurityManager(self.REQUEST, self.getWrappedOwner())
+  return original_security_manager
 
 class GeneratorCall(UserDict):
   """ Class use to generate/interpret XML-RPC call for the wizard. """
@@ -521,7 +521,7 @@
     global installation_status
     if use_super_manager:
       # set current security manager to owner of site
-      _setSuperSecurityManager(self.getPortalObject())
+      original_security_manager = _setSuperSecurityManager(self.getPortalObject())
 
     portal = self.getPortalObject()
     bt5_files = server_response.get("filedata", [])
@@ -579,7 +579,7 @@
     LOG("Wizard", INFO,
               "Completed installation for %s" %' '.join(bt5_filenames))
     if use_super_manager:
-      noSecurityManager()
+      setSecurityManager(original_security_manager)
 
   ######################################################
   ##               Navigation                         ##
@@ -828,10 +828,10 @@
   security.declareProtected(Permissions.View, 'getExpressConfigurationPreference')
   def getExpressConfigurationPreference(self, preference_id, default = None):
     """ Get Express configuration preference """
-    _setSuperSecurityManager(self.getPortalObject())
+    original_security_manager = _setSuperSecurityManager(self.getPortalObject())
     portal_preferences = getToolByName(self, 'portal_preferences')
     preference_value = portal_preferences.getPreference(preference_id, default)
-    noSecurityManager()
+    setSecurityManager(original_security_manager)
     return preference_value
 
   security.declareProtected(Permissions.ModifyPortalContent, 'setExpressConfigurationPreference')