Skip to content

erp5
erp5
Commit 7518e634 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Merge remote-tracking branch 'upstream/master' into zope4py2

parents a274cdfd b39b5e7b
Hide whitespace changes
Inline Side-by-side
Showing with 372 additions and 40 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_checkConsistency.py 0 → 100644
View file @ 7518e634
"""Check consistency of an accounting transaction.
This verifies the constraints defined in constraints and also "temporary" constraints,
such as "client is validated" or "accounting period is open" that are currently defined
in workflow script.
This is intentded to be used in custom scripts creating accounting transactions and
validating them.
"""
context.Base_checkConsistency()
accounting_workflow = context.getPortalObject().portal_workflow.accounting_workflow
accounting_workflow.script_validateTransactionLines(
{
'object': context,
'kwargs': {},
'transition': accounting_workflow.transition_deliver_action
})
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_checkConsistency.xml 0 → 100644
View file @ 7518e634
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>AccountingTransaction_checkConsistency</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/TestTemplateItem/portal_components/test.erp5.testAccounting.py
View file @ 7518e634
......@@ -1147,6 +1147,33 @@ class TestTransactionValidation(AccountingTestCase):
self.portal.portal_workflow.doActionFor(accounting_transaction,
'stop_action')
def test_AccountingTransaction_checkConsistency(self):
accounting_transaction = self._makeOne(
portal_type='Accounting Transaction',
start_date=DateTime('2008/12/31'),
destination_section_value=self.organisation_module.supplier,
lines=(dict(id='line_with_wrong_quantity',
source_value=self.account_module.goods_purchase,
source_debit=400),
dict(source_value=self.account_module.receivable,
source_credit=500)))
self.assertRaisesRegexp(
ValidationFailed,
'Transaction is not balanced',
accounting_transaction.AccountingTransaction_checkConsistency,
)
accounting_transaction.line_with_wrong_quantity.setSourceDebit(500)
self.assertRaisesRegexp(
ValidationFailed,
'Date is not in a started Accounting Period',
accounting_transaction.AccountingTransaction_checkConsistency,
)
accounting_transaction.setStartDate(DateTime('2007/11/11'))
accounting_transaction.AccountingTransaction_checkConsistency()
class TestClosingPeriod(AccountingTestCase):
"""Various tests for closing the period.
......
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/script_validateTransaction.py
View file @ 7518e634
......@@ -28,7 +28,7 @@ transaction.Base_checkConsistency()
skip_period_validation = state_change['kwargs'].get(
'skip_period_validation', 0)
transition = state_change['transition']
if transition.id in ('plan_action', 'confirm_action') :
if transition.getReference() in ('plan_action', 'confirm_action') :
skip_period_validation = 1
source_section = transaction.getSourceSectionValue(
......
bt5/erp5_interface_post/DocumentTemplateItem/portal_components/document.erp5.InternetMessagePost.py
View file @ 7518e634
......@@ -45,7 +45,7 @@ class InternetMessagePost(Item, MailMessageMixin):
def _getMessage(self):
return email.message_from_string(self.getData())
security.declareProtected(Permissions.AccessContentsInformation, 'stripMessageId')
def stripMessageId(self, message_id):
"""
In rfc5322 headers, message-ids may follow the syntax "<msg-id>" in
......@@ -59,11 +59,10 @@ class InternetMessagePost(Item, MailMessageMixin):
message_id = message_id[:-1]
return message_id
security.declareProtected(Permissions.AccessContentsInformation, 'getReference')
def getReference(self):
return self.stripMessageId(self.getSourceReference())
def _setReference(self, value):
"""
Raise if given value is different from current value,
......
bt5/erp5_open_trade/DocumentTemplateItem/portal_components/document.erp5.OpenOrderLine.py
View file @ 7518e634
......@@ -62,6 +62,7 @@ class OpenOrderLine(SupplyLine):
, PropertySheet.Comment
)
security.declareProtected(Permissions.AccessContentsInformation, 'getTotalQuantity')
def getTotalQuantity(self, default=0):
"""Returns the total quantity for this open order line.
If the order line contains cells, the total quantity of cells are
......@@ -72,6 +73,7 @@ class OpenOrderLine(SupplyLine):
self.getCellValueList(base_id='path')])
return self.getQuantity(default)
security.declareProtected(Permissions.AccessContentsInformation, 'getTotalPrice')
def getTotalPrice(self):
"""Returns the total price for this open order line.
If the order line contains cells, the total price of cells are
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_checkCacheModificationDateConsistency.py
View file @ 7518e634
from DateTime import DateTime
appcache_reference = context.getLayoutProperty("configuration_manifest_url")
getDocumentValue = context.getDocumentValue
error_list = []
if appcache_reference:
appcache_manifest = getDocumentValue(appcache_reference)
appcache_manifest = context.getDocumentValue(appcache_reference)
if not appcache_manifest:
return ['Error: Web Site %s references a non existant appcache %s' % (context.getRelativeUrl(),appcache_reference)]
url_list = context.Base_getListFileFromAppcache()
url_list = [url for url in context.Base_getListFileFromAppcache() if url]
# Check that the manifest is newer than all cached resources.
appcache_manifest_modification_date = appcache_manifest.getObject().getModificationDate()
for url in url_list:
if url:
referenced_document = getDocumentValue(url)
if referenced_document is not None and (
referenced_document.getModificationDate() >
appcache_manifest_modification_date):
if url_list:
for referenced_document in context.getDocumentValueList(reference=url_list):
if referenced_document.getModificationDate() > appcache_manifest_modification_date:
error_list.append(
"Document {} is newer than cache manifest".format(url))
"Document {} is newer than cache manifest".format(referenced_document.getReference()))
if error_list and fixit:
text_list = appcache_manifest.getTextContent().split('\n')
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_getTranslationDataTextContent.py
View file @ 7518e634
......@@ -13,12 +13,18 @@ Base_translateString = context.Base_translateString
translatable_message_set = set([])
web_page_reference_list = context.Base_getTranslationSourceFileList(only_html=1)
web_page_by_reference = {}
if web_page_reference_list:
web_page_list = [
b.getObject() for b in
context.getDocumentValueList(reference=web_page_reference_list)]
web_page_by_reference = {wp.getReference(): wp.getTextContent() for wp in web_page_list}
for web_page_reference in web_page_reference_list:
# Web pages can be in web page module ...
web_page = context.getDocumentValue(web_page_reference)
if web_page is not None:
web_page_text_content = web_page.getTextContent()
else:
web_page_text_content = web_page_by_reference.get(web_page_reference)
if web_page_text_content is None:
# ... or in skin folders
web_page = context.restrictedTraverse(web_page_reference, None)
if web_page is not None and hasattr(web_page, 'PrincipiaSearchSource'):
......
bt5/erp5_web_service/DocumentTemplateItem/portal_components/document.erp5.FTPConnector.py
View file @ 7518e634
......@@ -66,6 +66,7 @@ class FTPConnector(XMLObject):
# XXX Must manage in the future ftp and ftps protocol
raise NotImplementedError("Protocol %s is not yet implemented" %(self.getUrlProtocol(),))
security.declareProtected(Permissions.AccessContentsInformation, 'renameFile')
def renameFile(self, old_path, new_path):
""" Move a file """
conn = self.getConnection()
......@@ -74,6 +75,7 @@ class FTPConnector(XMLObject):
finally:
conn.logout()
security.declareProtected(Permissions.AccessContentsInformation, 'removeFile')
def removeFile(self, filepath):
"""Delete the file"""
conn = self.getConnection()
......@@ -82,6 +84,7 @@ class FTPConnector(XMLObject):
finally:
conn.logout()
security.declareProtected(Permissions.AccessContentsInformation, 'listFiles')
def listFiles(self, path=".", sort_on=None):
""" List file of a directory """
conn = self.getConnection()
......@@ -90,6 +93,7 @@ class FTPConnector(XMLObject):
finally:
conn.logout()
security.declareProtected(Permissions.AccessContentsInformation, 'getFile')
def getFile(self, filepath, binary=True):
""" Try to get a file on the remote server """
conn = self.getConnection()
......@@ -101,6 +105,7 @@ class FTPConnector(XMLObject):
finally:
conn.logout()
security.declareProtected(Permissions.AccessContentsInformation, 'putFile')
def putFile(self, filename, data, remotepath='.', confirm=True):
""" Send file to the remote server """
conn = self.getConnection()
......@@ -125,6 +130,7 @@ class FTPConnector(XMLObject):
finally:
conn.logout()
security.declareProtected(Permissions.AccessContentsInformation, 'createDirectory')
def createDirectory(self, path, mode=0o777):
"""Create a directory `path`, with file mode `mode`.
......@@ -136,6 +142,7 @@ class FTPConnector(XMLObject):
finally:
conn.logout()
security.declareProtected(Permissions.AccessContentsInformation, 'removeDirectory')
def removeDirectory(self, path):
"""Create a directory `path`, with file mode `mode`.
......
product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/call_active_sense.xml
View file @ 7518e634
......@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/activeSense</string> </value>
<value> <string>string:${object_url}/Alarm_activeSense</string> </value>
</item>
</dictionary>
</pickle>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_activeSense.py 0 → 100644
View file @ 7518e634
from Products.ERP5Type.Message import translateString
context.activeSense()
return context.Base_redirect(
form_id,
keep_items={'portal_status_message': translateString('Active Sense Called.')})
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_activeSense.xml 0 → 100644
View file @ 7518e634
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>form_id=\'\', **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Alarm_activeSense</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ComponentTool_viewLiveTestDialog/your_run_only.xml
View file @ 7518e634
......@@ -205,7 +205,7 @@
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
<value> <int>80</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
......@@ -227,6 +227,10 @@
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>input_type</string> </key>
<value> <string>text</string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ComponentTool_viewLiveTestDialog/your_test.xml
View file @ 7518e634
......@@ -205,7 +205,7 @@
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
<value> <int>80</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/ExternalMethod/function_property.xml
View file @ 7518e634
......@@ -6,6 +6,14 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/ExternalMethod/module_property.xml
View file @ 7518e634
......@@ -6,6 +6,14 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
......
product/ERP5/tests/testERP5Callable.py 0 → 100644
View file @ 7518e634
# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2014 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.
#
##############################################################################
import unittest
import sys
import traceback
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
"""Test for ERP5 callables, is ERP5 documents to be used in portal_skins
or portal_workflow
"""
class TestERP5PythonScript(ERP5TypeTestCase):
def getBusinessTemplateList(self):
return 'erp5_core',
def afterSetUp(self):
folder = self.portal.portal_skins.custom
folder.manage_addProduct['ERP5'].addPythonScriptThroughZMI(
id=self.id()
)
self.script = folder.get(self.id())
self.commit()
def beforeTearDown(self):
self.abort()
self.portal.portal_skins.custom.manage_delObjects([self.id()])
self.tic()
def test_manage_addPythonScriptThroughZMI(self):
resp = self.publish(
'/{}/portal_skins/manage_addProduct/ERP5/addPythonScriptThroughZMIForm'.format(self.portal.getId()),
basic='ERP5TypeTestCase:',
handle_errors=False,
)
self.assertIn('ERP5 Python Scripts', resp.getBody())
self.assertIn('addPythonScriptThroughZMI', resp.getBody())
def test_call(self):
self.script.setBody('return "Hello"')
self.assertEqual(self.script(), "Hello")
self.script.setParameterSignature('who')
self.script.setBody('return "Hello " + who')
self.assertEqual(self.script("world"), "Hello world")
try:
self.script(123)
except TypeError:
_, _, tb = sys.exc_info()
# python script code is visible in traceback
self.assertEqual(
traceback.format_tb(tb)[-1],
' File "ERP5 Python Script", line 1, in %s\n'
' return "Hello " + who\n' % self.id()
)
else:
self.fail('Exception not raised')
class TestERP5WorkflowScript(ERP5TypeTestCase):
def getBusinessTemplateList(self):
return 'erp5_core',
def afterSetUp(self):
wf = self.portal.portal_workflow.newContent(
portal_type='Workflow',
id=self.id()
)
self.script = wf.newContent(
portal_type='Workflow Script',
reference='test_script',
)
self.commit()
def beforeTearDown(self):
self.abort()
self.portal.portal_workflow.manage_delObjects([self.id()])
self.tic()
def test_default_params(self):
self.assertEqual(self.script.getParameterSignature(), 'state_change')
def test_call(self):
self.script.setBody('return "Hello " + state_change')
self.assertEqual(self.script("world"), "Hello world")
try:
self.script(123)
except TypeError:
_, _, tb = sys.exc_info()
# python script code is visible in traceback
self.assertEqual(
traceback.format_tb(tb)[-1],
' File "ERP5 Workflow Script", line 1, in script_test_script\n'
' return "Hello " + state_change\n'
)
else:
self.fail('Exception not raised')
product/ERP5/tests/testSecurity.py
View file @ 7518e634
......@@ -72,21 +72,19 @@ class TestSecurityMixin(ERP5TypeTestCase):
i.e. those who have a docstring but have no security declaration.
"""
self._prepareDocumentList()
white_method_id_list = ['om_icons',]
allowed_method_id_list = ['om_icons',]
app = self.portal.aq_parent
meta_type_dict = {}
error_dict = {}
for idx, obj in app.ZopeFind(app, search_sub=1):
meta_type_set = set([None])
error_set = set()
for _, obj in app.ZopeFind(app, search_sub=1):
meta_type = getattr(obj, 'meta_type', None)
if meta_type is None:
if meta_type in meta_type_set:
continue
if meta_type in meta_type_dict:
continue
meta_type_dict[meta_type] = True
meta_type_set.add(meta_type)
if '__roles__' in obj.__class__.__dict__:
continue
for method_id in dir(obj):
if method_id.startswith('_') or method_id in white_method_id_list or not callable(getattr(obj, method_id, None)):
if method_id.startswith('_') or method_id in allowed_method_id_list or not callable(getattr(obj, method_id, None)):
continue
method = getattr(obj, method_id)
if isinstance(method, MethodType) and \
......@@ -96,16 +94,19 @@ class TestSecurityMixin(ERP5TypeTestCase):
method.__module__:
if method.__module__ == 'Products.ERP5Type.Accessor.WorkflowState' and method.func_code.co_name == 'serialize':
continue
func_code = method.func_code
error_dict[(func_code.co_filename, func_code.co_firstlineno, method_id)] = True
error_list = error_dict.keys()
if os.environ.get('erp5_debug_mode', None):
pass
else:
error_list = filter(lambda x:'/erp5/' in x[0], error_list)
func_code = method.__code__
error_set.add((func_code.co_filename, func_code.co_firstlineno, method_id))
error_list = []
for filename, lineno, method_id in sorted(error_set):
# ignore security problems with non ERP5 documents, unless running in debug mode.
if os.environ.get('erp5_debug_mode') or '/erp5/' in filename or '<portal_components' in filename:
error_list.append('%s:%s %s' % (filename, lineno, method_id))
else:
print('Ignoring missing security definition for %s in %s:%s ' % (method_id, filename, lineno))
if error_list:
message = '\nThe following %s methods have a docstring but have no security assertions.\n\t%s' \
% (len(error_list), '\n\t'.join(['%s:%s %s' % x for x in sorted(error_list)]))
% (len(error_list), '\n\t'.join(error_list))
self.fail(message)
def test_workflow_transition_protection(self):
......
product/ERP5Type/patches/python.py
View file @ 7518e634
......@@ -158,7 +158,7 @@ def patch_linecache():
return data.splitlines(True) if data is not None else ()
if basename(filename) == 'Script (Python)':
if basename(filename) in ('Script (Python)', 'ERP5 Python Script', 'ERP5 Workflow Script'):
try:
script = module_globals['script']
if script._p_jar.opened:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7