Mailing List Archive

Log message for revision 40142:
Added suppport for exporting / importing a PAS and its content via the GenericSetup file export framework (if present).



Changed:
U PluggableAuthService/trunk/PluggableAuthService.py
U PluggableAuthService/trunk/doc/CHANGES.txt
A PluggableAuthService/trunk/exportimport.py
A PluggableAuthService/trunk/tests/test_exportimport.py
U PluggableAuthService/trunk/version.txt

-=-
Modified: PluggableAuthService/trunk/PluggableAuthService.py
===================================================================
--- PluggableAuthService/trunk/PluggableAuthService.py 2005-11-15 18:54:01 UTC (rev 40141)
+++ PluggableAuthService/trunk/PluggableAuthService.py 2005-11-15 21:10:43 UTC (rev 40142)
@@ -42,6 +42,16 @@
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from ZTUtils import Batch
from App.class_init import default__class_init__ as InitializeClass
+
+try:
+ from OFS.interfaces import IObjectManager
+ from OFS.interfaces import ISimpleItem
+ from OFS.interfaces import IPropertyManager
+except ImportError: # BBB
+ from Products.Five.interfaces import IObjectManager
+ from Products.Five.interfaces import ISimpleItem
+ from Products.Five.interfaces import IPropertyManager
+
from Products.PluginRegistry.PluginRegistry import PluginRegistry
import Products

@@ -1098,7 +1108,7 @@
resetter.resetCredentials(request, response)

classImplements( PluggableAuthService
- , IPluggableAuthService
+ , (IPluggableAuthService, IObjectManager, IPropertyManager)
)

InitializeClass( PluggableAuthService )

Modified: PluggableAuthService/trunk/doc/CHANGES.txt
===================================================================
--- PluggableAuthService/trunk/doc/CHANGES.txt 2005-11-15 18:54:01 UTC (rev 40141)
+++ PluggableAuthService/trunk/doc/CHANGES.txt 2005-11-15 21:10:43 UTC (rev 40142)
@@ -4,6 +4,9 @@

New Features

+ - Added suppport for exporting / importing a PAS and its content via
+ the GenericSetup file export framework.
+
- Made ZODBRoleManager plugin check grants to the principal's groups,
as well as those made to the principal directly.


Added: PluggableAuthService/trunk/exportimport.py
===================================================================
--- PluggableAuthService/trunk/exportimport.py 2005-11-15 18:54:01 UTC (rev 40141)
+++ PluggableAuthService/trunk/exportimport.py 2005-11-15 21:10:43 UTC (rev 40142)
@@ -0,0 +1,57 @@
+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Filesystem exporter / importer adapters.
+
+$Id$
+"""
+
+from zope.interface import implements
+from Products.GenericSetup.interfaces import IContentFactory
+from Products.GenericSetup.interfaces import IContentFactoryName
+from Products.GenericSetup.interfaces import IFilesystemExporter
+from Products.GenericSetup.interfaces import IFilesystemImporter
+from Products.GenericSetup.utils import _getDottedName
+
+#
+# setup_tool handlers
+#
+def exportPAS(context):
+ IFilesystemExporter(context.getSite()).export(context, 'PAS', True)
+
+def importPAS(context):
+ IFilesystemImporter(context.getSite()).import_(context, 'PAS', True)
+
+
+class PAS_PR_ContentFactory(object):
+
+ implements(IContentFactory)
+
+ def __init__(self, context):
+ self.context = context
+
+ def __call__(self, object_id):
+ from Products.PluginRegistry.PluginRegistry import PluginRegistry
+ registry = PluginRegistry(())
+ registry._setId(object_id)
+ self.context._setObject(object_id, registry)
+ return registry
+
+class PAS_CF_Namer(object):
+
+ implements(IContentFactoryName)
+
+ def __init__(self, context):
+ self.context = context
+
+ def __call__(self):
+ return 'plugins'


Property changes on: PluggableAuthService/trunk/exportimport.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native

Added: PluggableAuthService/trunk/tests/test_exportimport.py
===================================================================
--- PluggableAuthService/trunk/tests/test_exportimport.py 2005-11-15 18:54:01 UTC (rev 40141)
+++ PluggableAuthService/trunk/tests/test_exportimport.py 2005-11-15 21:10:43 UTC (rev 40142)
@@ -0,0 +1,362 @@
+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors. All Rights
+# Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this
+# distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE
+#
+##############################################################################
+""" Unit tests for GenericSetup-based export / import of PAS.
+
+$Id$
+"""
+import unittest
+from csv import reader
+from ConfigParser import ConfigParser
+from StringIO import StringIO
+
+try:
+ import Products.GenericSetup
+except ImportError: # No GenericSetup, so no tests
+
+ print 'XXXX: No GenericSetup!'
+ def test_suite():
+ return unittest.TestSuite()
+
+else:
+ from Products.GenericSetup.tests.common import BaseRegistryTests
+ from Products.GenericSetup.utils import _getDottedName
+
+ from zope.interface import Interface
+ from zope.app.tests.placelesssetup import PlacelessSetup
+
+ class _TestBase(PlacelessSetup, BaseRegistryTests):
+
+ def _initPAS(self, plugin_type_info=(), plugins={}):
+ from OFS.Folder import Folder
+ from OFS.SimpleItem import SimpleItem
+ from Products.PluggableAuthService.PluggableAuthService \
+ import addPluggableAuthService
+
+ app = Folder()
+ app.getPhysicalPath = lambda: ()
+ app.getPhysicalRoot = lambda: app
+
+ addPluggableAuthService(app)
+ pas = app._getOb('acl_users')
+
+ return app, pas
+
+ class Test_exportPAS(_TestBase):
+
+ def _setUpAdapters(self):
+ from zope.app.tests import ztapi
+
+ try:
+ from OFS.interfaces import IObjectManager
+ from OFS.interfaces import ISimpleItem
+ from OFS.interfaces import IPropertyManager
+ except ImportError: # BBB
+ from Products.Five.interfaces import IObjectManager
+ from Products.Five.interfaces import ISimpleItem
+ from Products.Five.interfaces import IPropertyManager
+
+ from Products.GenericSetup.interfaces import IContentFactoryName
+ from Products.GenericSetup.interfaces import ICSVAware
+ from Products.GenericSetup.interfaces import IDAVAware
+ from Products.GenericSetup.interfaces import IFilesystemExporter
+ from Products.GenericSetup.interfaces import IINIAware
+ from Products.GenericSetup.content import \
+ FolderishExporterImporter
+ from Products.GenericSetup.content import \
+ SimpleINIAware
+ from Products.GenericSetup.content import \
+ CSVAwareFileAdapter
+ from Products.GenericSetup.content import \
+ INIAwareFileAdapter
+ from Products.GenericSetup.content import \
+ DAVAwareFileAdapter
+
+ from Products.PluginRegistry.interfaces import IPluginRegistry
+ from Products.PluginRegistry.exportimport \
+ import PluginRegistryFileExportImportAdapter
+
+ from Products.PluggableAuthService.exportimport \
+ import PAS_CF_Namer
+
+ ztapi.provideAdapter(IObjectManager,
+ IFilesystemExporter,
+ FolderishExporterImporter,
+ )
+
+ ztapi.provideAdapter(IPropertyManager,
+ IINIAware,
+ SimpleINIAware,
+ )
+
+ ztapi.provideAdapter(ICSVAware,
+ IFilesystemExporter,
+ CSVAwareFileAdapter,
+ )
+
+ ztapi.provideAdapter(IINIAware,
+ IFilesystemExporter,
+ INIAwareFileAdapter,
+ )
+
+ ztapi.provideAdapter(IDAVAware,
+ IFilesystemExporter,
+ DAVAwareFileAdapter,
+ )
+
+ ztapi.provideAdapter(IPluginRegistry,
+ IFilesystemExporter,
+ PluginRegistryFileExportImportAdapter,
+ )
+
+ ztapi.provideAdapter(IPluginRegistry,
+ IContentFactoryName,
+ PAS_CF_Namer,
+ )
+
+ def test_empty(self):
+ from Products.GenericSetup.utils import _getDottedName
+ from Products.GenericSetup.tests.common import DummyExportContext
+ from Products.PluginRegistry.PluginRegistry import PluginRegistry
+ from Products.PluggableAuthService.exportimport import exportPAS
+
+ self._setUpAdapters()
+ app, pas = self._initPAS()
+ context = DummyExportContext(pas)
+ exportPAS(context)
+
+ self.assertEqual(len(context._wrote), 3)
+ filename, text, content_type = context._wrote[0]
+ self.assertEqual(filename, 'PAS/.objects')
+ self.assertEqual(content_type, 'text/comma-separated-values')
+ self.assertEqual(text.splitlines(),
+ _EMPTY_PAS_OBJECTS.splitlines())
+
+ filename, text, content_type = context._wrote[1]
+ self.assertEqual(filename, 'PAS/.properties')
+ self.assertEqual(content_type, 'text/plain')
+ lines = filter(None, [x.strip() for x in text.splitlines()])
+ self.assertEqual(len(lines), 2)
+ self.assertEqual(lines[0], '[DEFAULT]')
+ self.assertEqual(lines[1], 'title =')
+
+ filename, text, content_type = context._wrote[2]
+ self.assertEqual(filename, 'PAS/pluginregistry.xml')
+ self.assertEqual(content_type, 'text/xml')
+
+ def test_with_contents(self):
+ from Products.GenericSetup.tests.common import DummyExportContext
+ from Products.GenericSetup.tests.faux_objects \
+ import TestCSVAware
+ from Products.GenericSetup.utils import _getDottedName
+ from Products.PluginRegistry.PluginRegistry import PluginRegistry
+ from Products.PluggableAuthService.exportimport import exportPAS
+
+ self._setUpAdapters()
+ app, pas = self._initPAS()
+ csv_aware = TestCSVAware()
+ csv_aware._setId('csv_plugin')
+ pas._setObject('csv_plugin', csv_aware)
+ context = DummyExportContext(pas)
+ exportPAS(context)
+
+ self.assertEqual(len(context._wrote), 4)
+ filename, text, content_type = context._wrote[0]
+ self.assertEqual(filename, 'PAS/.objects')
+ self.assertEqual(content_type, 'text/comma-separated-values')
+
+ objects = [x for x in reader(StringIO(text))]
+ self.assertEqual(len(objects), 2)
+
+ object_id, type_name = objects[0]
+ self.assertEqual(object_id, 'plugins')
+ self.assertEqual(type_name, 'plugins') # adapter-driven
+
+ object_id, type_name = objects[1]
+ self.assertEqual(object_id, 'csv_plugin')
+ self.assertEqual(type_name, _getDottedName(csv_aware.__class__))
+
+ filename, text, content_type = context._wrote[1]
+ self.assertEqual(filename, 'PAS/.properties')
+ self.assertEqual(content_type, 'text/plain')
+ lines = filter(None, [x.strip() for x in text.splitlines()])
+ self.assertEqual(len(lines), 2)
+ self.assertEqual(lines[0], '[DEFAULT]')
+ self.assertEqual(lines[1], 'title =')
+
+ filename, text, content_type = context._wrote[2]
+ self.assertEqual(filename, 'PAS/pluginregistry.xml')
+ self.assertEqual(content_type, 'text/xml')
+
+ filename, text, content_type = context._wrote[3]
+ self.assertEqual(filename, 'PAS/csv_plugin.csv')
+ self.assertEqual(content_type, 'text/comma-separated-values')
+
+ class Test_importPAS(_TestBase):
+
+ def _setUpAdapters(self):
+ from zope.app.tests import ztapi
+
+ try:
+ from OFS.interfaces import IObjectManager
+ from OFS.interfaces import IPropertyManager
+ from OFS.interfaces import ISimpleItem
+ except ImportError: # BBB
+ from Products.Five.interfaces import IObjectManager
+ from Products.Five.interfaces import IPropertyManager
+ from Products.Five.interfaces import ISimpleItem
+
+ from Products.GenericSetup.interfaces import IContentFactory
+ from Products.GenericSetup.interfaces import ICSVAware
+ from Products.GenericSetup.interfaces import IDAVAware
+ from Products.GenericSetup.interfaces import IFilesystemImporter
+ from Products.GenericSetup.interfaces import IINIAware
+
+ from Products.GenericSetup.content import \
+ FolderishExporterImporter
+ from Products.GenericSetup.content import \
+ SimpleINIAware
+ from Products.GenericSetup.content import \
+ CSVAwareFileAdapter
+ from Products.GenericSetup.content import \
+ INIAwareFileAdapter
+ from Products.GenericSetup.content import \
+ DAVAwareFileAdapter
+
+ from Products.PluginRegistry.interfaces import IPluginRegistry
+ from Products.PluginRegistry.exportimport \
+ import PluginRegistryFileExportImportAdapter
+
+ from Products.PluggableAuthService.interfaces.authservice \
+ import IPluggableAuthService
+ from Products.PluggableAuthService.exportimport \
+ import PAS_PR_ContentFactory
+
+ ztapi.provideAdapter(IObjectManager,
+ IFilesystemImporter,
+ FolderishExporterImporter,
+ )
+
+ ztapi.provideAdapter(IPropertyManager,
+ IINIAware,
+ SimpleINIAware,
+ )
+
+ ztapi.provideAdapter(ICSVAware,
+ IFilesystemImporter,
+ CSVAwareFileAdapter,
+ )
+
+ ztapi.provideAdapter(IINIAware,
+ IFilesystemImporter,
+ INIAwareFileAdapter,
+ )
+
+ ztapi.provideAdapter(IDAVAware,
+ IFilesystemImporter,
+ DAVAwareFileAdapter,
+ )
+
+ ztapi.provideAdapter(IPluginRegistry,
+ IFilesystemImporter,
+ PluginRegistryFileExportImportAdapter,
+ )
+
+ ztapi.provideAdapter(IPluggableAuthService,
+ IContentFactory,
+ PAS_PR_ContentFactory,
+ name='plugins',
+ )
+
+ def test_empty_modifying_plugin_types(self):
+ from Products.GenericSetup.tests.common import DummyImportContext
+ from Products.GenericSetup.utils import _getDottedName
+ from Products.PluginRegistry.PluginRegistry import PluginRegistry
+ from Products.PluggableAuthService.exportimport import importPAS
+
+ self._setUpAdapters()
+ app, pas = self._initPAS()
+
+ context = DummyImportContext(pas)
+ context._files['PAS/.objects'] = _EMPTY_PAS_OBJECTS
+ context._files['PAS/.properties'] = _EMPTY_PAS_PROPERTIES
+ context._files['PAS/pluginregistry.xml'
+ ] = _EMPTY_PLUGINREGISTRY_EXPORT
+
+ self.failUnless(pas.plugins.listPluginTypeInfo())
+ importPAS(context)
+ self.failIf(pas.plugins.listPluginTypeInfo())
+
+ def test_empty_adding_plugins(self):
+ from Products.GenericSetup.tests.common import DummyImportContext
+ from Products.GenericSetup.tests.faux_objects \
+ import TestCSVAware, KNOWN_CSV
+ from Products.GenericSetup.utils import _getDottedName
+ from Products.PluginRegistry.PluginRegistry import PluginRegistry
+ from Products.PluggableAuthService.exportimport import importPAS
+
+ self._setUpAdapters()
+ app, pas = self._initPAS()
+
+ context = DummyImportContext(pas)
+ context._files['PAS/.objects'] = _PAS_WITH_CSV_PLUGIN_OBJECTS
+ context._files['PAS/.properties'] = _EMPTY_PAS_PROPERTIES
+ context._files['PAS/pluginregistry.xml'
+ ] = _EMPTY_PLUGINREGISTRY_EXPORT
+ context._files['PAS/csv_plugin.csv'
+ ] = KNOWN_CSV
+
+ self.assertEqual(len(pas.objectIds()), 1)
+ self.failUnless('plugins' in pas.objectIds())
+
+ importPAS(context)
+
+ self.assertEqual(len(pas.objectIds()), 2)
+ self.failUnless('plugins' in pas.objectIds())
+ self.failUnless('csv_plugin' in pas.objectIds())
+
+ csv_plugin = pas._getOb('csv_plugin')
+ self.failUnless(csv_plugin.__class__ is TestCSVAware)
+ self.assertEqual(csv_plugin._was_put.getvalue().strip(),
+ KNOWN_CSV.strip())
+
+
+ _EMPTY_PAS_OBJECTS = """\
+plugins,plugins
+"""
+
+ _PAS_WITH_CSV_PLUGIN_OBJECTS = """\
+plugins,plugins
+csv_plugin,Products.GenericSetup.tests.faux_objects.TestCSVAware
+"""
+
+ _EMPTY_PAS_PROPERTIES = """\
+[DEFAULT]
+title =
+"""
+
+ _EMPTY_PLUGINREGISTRY_EXPORT = """\
+<?xml version="1.0"?>
+<plugin-registry>
+</plugin-registry>
+"""
+
+ def test_suite():
+ return unittest.TestSuite((
+ unittest.makeSuite( Test_exportPAS ),
+ unittest.makeSuite( Test_importPAS ),
+ ))
+
+if __name__ == "__main__":
+ unittest.main(defaultTest='test_suite')


Property changes on: PluggableAuthService/trunk/tests/test_exportimport.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native

Modified: PluggableAuthService/trunk/version.txt
===================================================================
--- PluggableAuthService/trunk/version.txt 2005-11-15 18:54:01 UTC (rev 40141)
+++ PluggableAuthService/trunk/version.txt 2005-11-15 21:10:43 UTC (rev 40142)
@@ -1 +1 @@
-PluggableAuthService-1.0.4
+PluggableAuthService-1.1b2+

_______________________________________________
Zope-CVS maillist - Zope-CVS@zope.org
http://mail.zope.org/mailman/listinfo/zope-cvs

Zope CVS instructions: http://dev.zope.org/CVS