Merge and invert dependency.

Merge SlapOSCloudSecurity into SlapOSSecurity and put them in slapos_cloud,
in order to have correct dependency resolution.

master/bt5/slapos_cloud/ExtensionTemplateItem/SlapOSCloudSecurity.py

-###############################################################################
-#
-# Copyright (c) 2012 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly advised to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-from AccessControl.SecurityManagement import getSecurityManager, \
-             setSecurityManager, newSecurityManager
-from AccessControl import Unauthorized
-
-def restrictMethodAsShadowUser(self, shadow_document=None, callable_object=None,
-    argument_list=None, argument_dict=None):
-  """
-  Restrict the security access of a method to the unaccessible shadow user
-  associated to the current user.
-  """
-  if argument_list is None:
-    argument_list = []
-  if argument_dict is None:
-    argument_dict = {}
-  if shadow_document is None or callable_object is None:
-    raise TypeError('shadow_document and callable_object cannot be None')
-  relative_url = shadow_document.getRelativeUrl()
-  if shadow_document.getPortalType() not in ('Person', 'Software Instance',
-      'Computer'):
-    raise Unauthorized("%s portal type %r is not supported" % (relative_url,
-      shadow_document.getPortalType()))
-  else:
-    # Switch to the shadow user temporarily, so that the behavior would not
-    # change even if this method is invoked by random users.
-    acl_users = shadow_document.getPortalObject().acl_users
-    reference = shadow_document.getReference()
-    if reference is None:
-      raise Unauthorized('%r is not configured' % relative_url)
-    real_user = acl_users.getUserById(reference)
-    if real_user is None:
-      raise Unauthorized('%s is not loggable user' % relative_url)
-    sm = getSecurityManager()
-    shadow_user = acl_users.getUserById('SHADOW-' + reference)
-    if shadow_user is None:
-      raise Unauthorized('Shadow of %s is not loggable user' % relative_url)
-    newSecurityManager(None, shadow_user)
-    try:
-      return callable_object(*argument_list, **argument_dict)
-    finally:
-      # Restore the original user.
-      setSecurityManager(sm)
-

master/bt5/slapos_erp5/ExtensionTemplateItem/SlapOSSecurity.py → master/bt5/slapos_cloud/ExtensionTemplateItem/SlapOSSecurity.py

 ###############################################################################
 #
-# Copyright (c) 2002-2011 Nexedi SA and Contributors. All Rights Reserved.
+# Copyright (c) 2012 Nexedi SA and Contributors. All Rights Reserved.
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsibility of assessing all potential
 # consequences resulting from its eventual inadequacies and bugs
 # End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
+# guarantees and support are strongly advised to contract a Free Software
 # Service Company
 #
 # This program is Free Software; you can redistribute it and/or
@@ -26,6 +26,9 @@
 ##############################################################################
 
 from Products.ERP5Security.ERP5GroupManager import ConsistencyError
+from AccessControl.SecurityManagement import getSecurityManager, \
+             setSecurityManager, newSecurityManager
+from AccessControl import Unauthorized
 
 def getComputerSecurityCategory(self, base_category_list, user_name, 
                                 object, portal_type):
@@ -85,3 +88,40 @@ def getSoftwareInstanceSecurityCategory(self, base_category_list, user_name,
 
   return category_list
 
+def restrictMethodAsShadowUser(self, shadow_document=None, callable_object=None,
+    argument_list=None, argument_dict=None):
+  """
+  Restrict the security access of a method to the unaccessible shadow user
+  associated to the current user.
+  """
+  if argument_list is None:
+    argument_list = []
+  if argument_dict is None:
+    argument_dict = {}
+  if shadow_document is None or callable_object is None:
+    raise TypeError('shadow_document and callable_object cannot be None')
+  relative_url = shadow_document.getRelativeUrl()
+  if shadow_document.getPortalType() not in ('Person', 'Software Instance',
+      'Computer'):
+    raise Unauthorized("%s portal type %r is not supported" % (relative_url,
+      shadow_document.getPortalType()))
+  else:
+    # Switch to the shadow user temporarily, so that the behavior would not
+    # change even if this method is invoked by random users.
+    acl_users = shadow_document.getPortalObject().acl_users
+    reference = shadow_document.getReference()
+    if reference is None:
+      raise Unauthorized('%r is not configured' % relative_url)
+    real_user = acl_users.getUserById(reference)
+    if real_user is None:
+      raise Unauthorized('%s is not loggable user' % relative_url)
+    sm = getSecurityManager()
+    shadow_user = acl_users.getUserById('SHADOW-' + reference)
+    if shadow_user is None:
+      raise Unauthorized('Shadow of %s is not loggable user' % relative_url)
+    newSecurityManager(None, shadow_user)
+    try:
+      return callable_object(*argument_list, **argument_dict)
+    finally:
+      # Restore the original user.
+      setSecurityManager(sm)

master/bt5/slapos_cloud/bt/revision

-103
\ No newline at end of file
+104
\ No newline at end of file

master/bt5/slapos_cloud/bt/template_extension_id_list

-SlapOSCloudSecurity
\ No newline at end of file
+SlapOSSecurity
\ No newline at end of file

master/bt5/slapos_erp5/bt/revision

-20
\ No newline at end of file
+21
\ No newline at end of file

master/bt5/slapos_erp5/bt/template_extension_id_list

-SlapOSSecurity
\ No newline at end of file