particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tasks respect disabled channels

Browse source 
Fixed: https://pagure.io/koji/issue/3006
This commit is contained in:
Jana Čupová 2021-09-15 10:10:16 +02:00 • committed by Tomas Kopecek
parent 2af3e40129
commit ff4e518fd8
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hub/kojihub.py
View file

@ -562,7 +562,11 @@ def make_task(method, arglist, **opts):
policy_data['user_id'] = opts['owner'] policy_data['user_id'] = opts['owner']
if 'channel' in opts: if 'channel' in opts:
policy_data['req_channel'] = opts['channel'] policy_data['req_channel'] = opts['channel']
req_channel_id = get_channel_id(opts['channel'], strict=True) channel_info = get_channel(opts['channel'], strict=True)
if channel_info['enabled']:
req_channel_id = channel_info['id']
else:
raise koji.GenericError('Channel %s is disabled.' % opts['channel'])
policy_data.update(policy_data_from_task_args(method, arglist)) policy_data.update(policy_data_from_task_args(method, arglist))
ruleset = context.policy.get('channel') ruleset = context.policy.get('channel')
@ -574,7 +578,11 @@ def make_task(method, arglist, **opts):
try: try:
parts = result.split() parts = result.split()
if parts[0] == "use": if parts[0] == "use":
opts['channel_id'] = get_channel_id(parts[1], strict=True) channel_info = get_channel(parts[1], strict=True)
if channel_info['enabled']:
opts['channel_id'] = channel_info['id']
else:
raise koji.GenericError('Channel %s is disabled.' % parts[1])
elif parts[0] == "parent": elif parts[0] == "parent":
if not opts.get('parent'): if not opts.get('parent'):
logger.error("Invalid channel policy result (no parent task): %s", logger.error("Invalid channel policy result (no parent task): %s",
@ -2446,7 +2454,9 @@ def get_ready_hosts():
c.execute(q) c.execute(q)
hosts = [dict(zip(aliases, row)) for row in c.fetchall()] hosts = [dict(zip(aliases, row)) for row in c.fetchall()]
for host in hosts: for host in hosts:
q = """SELECT channel_id FROM host_channels WHERE host_id=%(id)s AND active IS TRUE""" q = """SELECT channel_id FROM host_channels
JOIN channels ON host_channels.channel_id = channels.id
WHERE host_id=%(id)s AND active IS TRUE AND enabled IS TRUE"""
c.execute(q, host) c.execute(q, host)
host['channels'] = [row[0] for row in c.fetchall()] host['channels'] = [row[0] for row in c.fetchall()]
return hosts return hosts