Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

ISICO-15108: javascript validation done on updating w/d #3805

Merged
merged 5 commits into from
Nov 25, 2023
Merged

ISICO-15108: javascript validation done on updating w/d #3805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32602ed
ISICO-15108: javascript validation done on updating w/d
sarmuru2 Oct 10, 2023
3389967
ISICO-14902: NPE while checking EvaluatorType is fixed
sarmuru2 Oct 11, 2023
6c90644
ISICO-14902: unused variables removed
sarmuru2 Oct 11, 2023
1c80862
ISICO-15108: javascript validation added in the constraint violation …
sarmuru2 Oct 13, 2023
6df9a82
ISICO-15108: getExpression() is used for switch javascript code
sarmuru2 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
import java.lang.annotation.Target;
import java.text.ParseException;
import java.time.format.DateTimeParseException;
import java.util.Map;
import java.util.Optional;

import javax.script.ScriptException;
import javax.validation.Constraint;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
Expand All @@ -30,6 +32,7 @@
import com.netflix.conductor.common.metadata.tasks.TaskDef;
import com.netflix.conductor.common.metadata.tasks.TaskType;
import com.netflix.conductor.common.metadata.workflow.WorkflowTask;
import com.netflix.conductor.core.events.ScriptEvaluator;
import com.netflix.conductor.core.utils.DateTimeUtils;

import static com.netflix.conductor.core.execution.tasks.Terminate.getTerminationStatusParameter;
Expand Down Expand Up @@ -166,9 +169,34 @@ private boolean isDecisionTaskValid(
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;
}

if (workflowTask.getCaseExpression() != null) {
try {
validateScriptExpression(
workflowTask.getCaseExpression(), workflowTask.getInputParameters());
} catch (Exception ee) {
String message =
String.format(
ee.getMessage() + ", taskType: DECISION taskName %s",
workflowTask.getName());
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;
}
}

return valid;
}

private void validateScriptExpression(
String expression, Map<String, Object> inputParameters) {
try {
Object returnValue = ScriptEvaluator.eval(expression, inputParameters);
} catch (ScriptException e) {
throw new IllegalArgumentException(
String.format("Expression is not well formatted: %s", e.getMessage()));
}
}

private boolean isSwitchTaskValid(
WorkflowTask workflowTask, ConstraintValidatorContext context) {
boolean valid = true;
Expand Down Expand Up @@ -209,6 +237,21 @@ private boolean isSwitchTaskValid(
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;
}

if ("javascript".equals(workflowTask.getEvaluatorType())
&& workflowTask.getExpression() != null) {
try {
validateScriptExpression(
workflowTask.getExpression(), workflowTask.getInputParameters());
} catch (Exception ee) {
String message =
String.format(
ee.getMessage() + ", taskType: SWITCH taskName %s",
workflowTask.getName());
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;
}
}
return valid;
}

Expand Down
69 changes: 62 additions & 7 deletions core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@
*/
package com.netflix.conductor.service;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

import javax.validation.ConstraintViolationException;

Expand All @@ -35,6 +29,7 @@
import com.netflix.conductor.common.metadata.workflow.WorkflowDef;
import com.netflix.conductor.common.metadata.workflow.WorkflowDefSummary;
import com.netflix.conductor.common.metadata.workflow.WorkflowTask;
import com.netflix.conductor.common.model.BulkResponse;
import com.netflix.conductor.core.config.ConductorProperties;
import com.netflix.conductor.core.exception.NotFoundException;
import com.netflix.conductor.dao.EventHandlerDAO;
Expand Down Expand Up @@ -282,6 +277,66 @@ public void testUpdateWorkflowDef() {
verify(metadataDAO, times(1)).updateWorkflowDef(workflowDef);
}

@Test(expected = ConstraintViolationException.class)
public void testUpdateWorkflowDefWithCaseExpression() {
WorkflowDef workflowDef = new WorkflowDef();
workflowDef.setName("somename");
workflowDef.setOwnerEmail("sample@test.com");
List<WorkflowTask> tasks = new ArrayList<>();
WorkflowTask workflowTask = new WorkflowTask();
workflowTask.setTaskReferenceName("hello");
workflowTask.setName("hello");
workflowTask.setType("DECISION");

WorkflowTask caseTask = new WorkflowTask();
caseTask.setTaskReferenceName("casetrue");
caseTask.setName("casetrue");

List<WorkflowTask> caseTaskList = new ArrayList<>();
caseTaskList.add(caseTask);

Map<String, List<WorkflowTask>> decisionCases = new HashMap();
decisionCases.put("true", caseTaskList);

workflowTask.setDecisionCases(decisionCases);
workflowTask.setCaseExpression("1 >0abcd");
tasks.add(workflowTask);
workflowDef.setTasks(tasks);
when(metadataDAO.getTaskDef(any())).thenReturn(new TaskDef());
BulkResponse bulkResponse =
metadataService.updateWorkflowDef(Collections.singletonList(workflowDef));
}

@Test(expected = ConstraintViolationException.class)
public void testUpdateWorkflowDefWithJavscriptEvaluator() {
WorkflowDef workflowDef = new WorkflowDef();
workflowDef.setName("somename");
workflowDef.setOwnerEmail("sample@test.com");
List<WorkflowTask> tasks = new ArrayList<>();
WorkflowTask workflowTask = new WorkflowTask();
workflowTask.setTaskReferenceName("hello");
workflowTask.setName("hello");
workflowTask.setType("SWITCH");
workflowTask.setEvaluatorType("javascript");
workflowTask.setExpression("1>abcd");
WorkflowTask caseTask = new WorkflowTask();
caseTask.setTaskReferenceName("casetrue");
caseTask.setName("casetrue");

List<WorkflowTask> caseTaskList = new ArrayList<>();
caseTaskList.add(caseTask);

Map<String, List<WorkflowTask>> decisionCases = new HashMap();
decisionCases.put("true", caseTaskList);

workflowTask.setDecisionCases(decisionCases);
tasks.add(workflowTask);
workflowDef.setTasks(tasks);
when(metadataDAO.getTaskDef(any())).thenReturn(new TaskDef());
BulkResponse bulkResponse =
metadataService.updateWorkflowDef(Collections.singletonList(workflowDef));
}

@Test(expected = ConstraintViolationException.class)
public void testRegisterWorkflowDefNoName() {
try {
Expand Down