From e9ebe2250df0ac419f2f7eab26cd16a4f1d4cc66 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Nov 10 2022 14:47:44 +0000
Subject: build policy


New 'build' policy replacing 'build_from_srpm' and 'build_from_repo_id'.

Related: https://pagure.io/koji/issue/3323

Author:    Tomas Kopecek <tkopecek@redhat.com>

---

diff --git a/builder/kojid b/builder/kojid
index cbf900c..ce2698d 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -1032,17 +1032,22 @@ class BuildTask(BaseTaskHandler):
             'task_id': self.id,
             'build_tag': build_tag,  # id
             'skip_tag': bool(self.opts.get('skip_tag')),
+            'scratch': opts.get('scratch'),
+            'from_scm': SCM.is_scm_url(src),
+            'repo_id': opts.get('repo_id'),
         }
         if target_info:
             policy_data['target'] = target_info['name']
         if not self.opts.get('skip_tag'):
             policy_data['tag'] = dest_tag  # id
+        # backward-compatible deprecated policies (TODO: remove in 1.33)
         if not SCM.is_scm_url(src) and not opts.get('scratch'):
             # let hub policy decide
             self.session.host.assertPolicy('build_from_srpm', policy_data)
         if opts.get('repo_id') is not None:
             # use of this option is governed by policy
             self.session.host.assertPolicy('build_from_repo_id', policy_data)
+        self.session.host.assertPolicy('build_rpm', policy_data)
         if not repo_info:
             repo_info = self.getRepo(build_tag, builds=opts.get('wait_builds'),
                                      wait=opts.get('wait_repo'))  # (subtask)
diff --git a/docs/source/access_controls.rst b/docs/source/access_controls.rst
index d770f8d..7283bdd 100644
--- a/docs/source/access_controls.rst
+++ b/docs/source/access_controls.rst
@@ -51,9 +51,12 @@ Examples of access control polices are:
 * cg_import: control which content generator imports are allowed
 * vm: control which windows build tasks are allowed
 * dist_repo: control which distRepo tasks are allowed
-* build_from_srpm: control whether builds from srpm are allowed
+* build_rpm: control whether builds are allowed, this is superceding older ``build_from_srpm``
+             to handle all task types. ``build_from_srpm`` and ``build_from_repo_id`` are now
+             deprecated and will be removed in koji 1.33. Default policy allows everything.
+* build_from_srpm [deprecated]: control whether builds from srpm are allowed
 * build_from_scm: control whether builds from the SCM are allowed and the behavior of the SCM
-* build_from_repo_id: control whether builds from user-specified repos ids are allowed
+* build_from_repo_id [deprecated]: control whether builds from user-specified repos ids are allowed
 
 Note that not all policies are access control policies.
 The ``channel`` and ``volume`` policies are used to control which channels tasks go to
diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py
index 746b5b2..d14c1e1 100644
--- a/hub/kojixmlrpc.py
+++ b/hub/kojixmlrpc.py
@@ -557,6 +557,9 @@ def load_plugins(opts):
 
 
 _default_policies = {
+    'build_rpm': '''
+            all :: allow
+            ''',
     'build_from_srpm': '''
             has_perm admin :: allow
             all :: deny Only admin can do this via default policy