Validate the state completion value before saving

Thanks to Manoel Brunnen (@mbru) for the report and debug
information. GitLab issue #557.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-04-03 18:28:25 -04:00
parent d5efd53b5b
commit 5f877cdc22
4 changed files with 42 additions and 5 deletions

View File

@@ -30,6 +30,8 @@
* Fix index list API view. Add index create, delete, detail API tests.
GitLab issue #564. Thanks to the Stéphane (@shoyu) for the report and debug
information.
* Validate the state completion value before saving. Thanks to Manoel Brunnen
(@mbru) for the report and debug information. GitLab issue #557.
3.1.9 (2018-11-01)
==================

View File

@@ -156,6 +156,7 @@ Backward incompatible changes
Bugs fixed or issues closed
---------------------------
* :gitlab-issue:`557` Break workflows with invalid input
* :gitlab-issue:`559` IndexTestCase.test_dual_level_dual_document_index failure
* :gitlab-issue:`562` events.links.link_user_notifications_list should use
reverse

View File

@@ -208,6 +208,19 @@ class WorkflowState(models.Model):
).distinct()
def save(self, *args, **kwargs):
# Solve issue #557 "Break workflows with invalid input"
# without using a migration.
# Remove blank=True, remove this, and create a migration in the next
# minor version.
try:
self.completion = int(self.completion)
except (TypeError, ValueError):
self.completion = 0
#if not self.completion:
# self.completion = 0
if self.initial:
self.workflow.states.all().update(initial=False)
return super(WorkflowState, self).save(*args, **kwargs)

View File

@@ -135,13 +135,17 @@ class DocumentStateStateViewTestCase(WorkflowTestMixin, GenericViewTestCase):
super(DocumentStateStateViewTestCase, self).setUp()
self.login_user()
def _request_workflow_state_create_view(self):
def _request_workflow_state_create_view(self, extra_data=None):
data = {
'label': TEST_WORKFLOW_STATE_LABEL,
'completion': TEST_WORKFLOW_STATE_COMPLETION,
}
if extra_data:
data.update(extra_data)
return self.post(
viewname='document_states:setup_workflow_state_create',
args=(self.workflow.pk,), data={
'label': TEST_WORKFLOW_STATE_LABEL,
'completion': TEST_WORKFLOW_STATE_COMPLETION,
}
args=(self.workflow.pk,), data=data
)
def test_create_workflow_state_no_access(self):
@@ -164,6 +168,23 @@ class DocumentStateStateViewTestCase(WorkflowTestMixin, GenericViewTestCase):
TEST_WORKFLOW_STATE_COMPLETION
)
def test_create_workflow_state_invalid_completion_with_access(self):
self._create_workflow()
self.grant_access(obj=self.workflow, permission=permission_workflow_edit)
response = self._request_workflow_state_create_view(
extra_data={'completion': ''}
)
self.assertEquals(response.status_code, 302)
self.assertEquals(WorkflowState.objects.count(), 1)
self.assertEquals(
WorkflowState.objects.all()[0].label, TEST_WORKFLOW_STATE_LABEL
)
self.assertEquals(
WorkflowState.objects.all()[0].completion, 0
)
def _request_workflow_state_delete_view(self):
return self.post(
viewname='document_states:setup_workflow_state_delete',