modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-08 15:53:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow to submit owner when NO_AUTH

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-03-27 13:28:06 +02:00
parent 48808547f7
commit ec0ed91d45
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module_build_service/utils.py
View File

@@ -731,6 +731,9 @@ def validate_optional_params(params):
raise ValidationError('The request contains parameters specific to Copr builder: {} even though {} is used'
.format(", ".join(forbidden_params), conf.system))
if not conf.no_auth and "owner" in params:
raise ValidationError("The request contains 'owner' parameter, however NO_AUTH is not allowed")
def scm_url_schemes(terse=False):
"""

8
module_build_service/views.py
View File

@@ -100,6 +100,9 @@ class ModuleBuildAPI(MethodView):
else:
handler = SCMHandler(request)
if conf.no_auth and handler.username == "anonymous" and "owner" in handler.data:
handler.username = handler.data["owner"]
if conf.allowed_groups and not (conf.allowed_groups & handler.groups):
raise Forbidden("%s is not in any of %r, only %r" % (
handler.username, conf.allowed_groups, handler.groups))
@@ -189,7 +192,7 @@ class SCMHandler(BaseHandler):
if isinstance(branch, unicode):
branch = branch.encode('utf-8')
optional_params = {k: v for k, v in self.data.items() if k not in ["scmurl", "branch"]}
optional_params = {k: v for k, v in self.data.items() if k not in ["owner", "scmurl", "branch"]}
return submit_module_build_from_scm(self.username, url, branch,
allow_local_url=False, optional_params=optional_params)
@@ -209,7 +212,8 @@ class YAMLFileHandler(BaseHandler):
def post(self):
r = request.files["yaml"]
return submit_module_build_from_yaml(self.username, r.read(), optional_params=self.data)
optional_params = {k: v for k, v in self.data.items() if k not in ["owner"]}
return submit_module_build_from_yaml(self.username, r.read(), optional_params=optional_params)
def register_api_v1():