modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-11-03 22:05:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separate multipart/form-data logic from YAML handling logic.

Browse Source 
Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
Merlin Mathesius
2019-02-07 13:57:17 -06:00
parent 1258294984
commit fcac146230
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module_build_service/views.py
View File

@@ -172,7 +172,7 @@ class ModuleBuildAPI(AbstractQueryableBuildAPI):
# Additional POST and DELETE handlers for modules follow.
@validate_api_version()
def post(self, api_version):
if "multipart/form-data" in request.headers.get("Content-Type", ""):
if hasattr(request, 'files') and "yaml" in request.files:
handler = YAMLFileHandler(request)
else:
handler = SCMHandler(request)
@@ -314,7 +314,14 @@ class ImportModuleAPI(MethodView):
class BaseHandler(object):
def __init__(self, request):
self.username, self.groups = module_build_service.auth.get_user(request)
self.data = None
if "multipart/form-data" in request.headers.get("Content-Type", ""):
self.data = request.form.to_dict()
else:
try:
self.data = json.loads(request.get_data().decode("utf-8"))
except Exception:
log.error('Invalid JSON submitted')
raise ValidationError('Invalid JSON submitted')
@property
def optional_params(self):
@@ -373,11 +380,6 @@ class BaseHandler(object):
class SCMHandler(BaseHandler):
def __init__(self, request):
super(SCMHandler, self).__init__(request)
try:
self.data = json.loads(request.get_data().decode("utf-8"))
except Exception:
log.error('Invalid JSON submitted')
raise ValidationError('Invalid JSON submitted')
def validate(self, skip_branch=False, skip_optional_params=False):
if "scmurl" not in self.data:
@@ -415,7 +417,6 @@ class YAMLFileHandler(BaseHandler):
if not conf.yaml_submit_allowed:
raise Forbidden("YAML submission is not enabled")
super(YAMLFileHandler, self).__init__(request)
self.data = request.form.to_dict()
def validate(self):
if "yaml" not in request.files: