Skip to content

added decryption before task json validation #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DavidjohnBlodgett wants to merge 3 commits into from
Closed

added decryption before task json validation #363

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac69eb8
added decryption before task json validation
Oct 20, 2016
31dd3e1
per request, moved decryption outside task JSON validator
Oct 26, 2016
dbc3e7d
added a missing decrypt that was failing the posting of a workflow
Oct 26, 2016
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
8 changes: 6 additions & 2 deletions lib/task.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ di.annotate(factory,
'Services.Environment',
'Services.Waterline',
'TaskOption.Validator',
di.Injector
di.Injector,
'Sanitizer'
)
);

Expand All @@ -43,7 +44,8 @@ function factory(
env,
waterline,
validator,
injector
injector,
sanitizer
) {

var TaskStates = Constants.Task.States;
Expand Down Expand Up @@ -304,6 +306,7 @@ function factory(
//TODO: Remove the judgement and enable the code block after task-schema is fully
//ready
if (self.schema) {
sanitizer.decrypt(self.options);
validator.validate(self.definition.schemaRef, self.options);
}
})
Expand Down Expand Up @@ -447,6 +450,7 @@ function factory(
//Do schema validation but skip the option that requires context because the
//full context is not ready right now.
try {
sanitizer.decrypt(self.options);
validator.validateContextSkipped(self.definition.schemaRef, self.options);
}
catch (err) {
Expand Down