Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
File Transfer Service
fts-rest
Commits
61026d0f
Commit
61026d0f
authored
Aug 28, 2020
by
Mihai Patrascoiu
Browse files
[
FTS-1666
]: Enforce params::job_metadata field is JSON object
parent
400b3f12
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/fts3rest/fts3rest/lib/JobBuilder.py
View file @
61026d0f
...
...
@@ -101,6 +101,12 @@ def _validate_url(url):
if
not
url
.
hostname
:
raise
ValueError
(
'Missing host (%s)'
%
url
.
geturl
())
def
_metadata
(
data
):
try
:
return
json
.
loads
(
data
)
except
:
return
{
"label"
:
str
(
data
)}
def
_safe_flag
(
flag
):
"""
...
...
@@ -306,6 +312,11 @@ class JobBuilder(object):
for
k
,
v
in
params
.
iteritems
():
if
v
is
None
and
k
in
DEFAULT_PARAMS
:
params
[
k
]
=
DEFAULT_PARAMS
[
k
]
# Enforce JSON type for 'job_metadata'
if
params
[
'job_metadata'
]
is
not
None
:
params
[
'job_metadata'
]
=
_metadata
(
params
[
'job_metadata'
])
return
params
def
_build_internal_job_params
(
self
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment