PR#3496: kiwi: handle include protocols
Merges #3496 https://pagure.io/koji/pull-request/3496 Fixes: #3495 https://pagure.io/koji/issue/3495 kiwi includes doesn't handle prefixes correctly
This commit is contained in:
commit
07d8dd5cfd
2 changed files with 14 additions and 0 deletions
|
|
@ -282,6 +282,13 @@ option. Similarly to other image tasks, alternative architecture failures can be
|
|||
ignored for successful build by ``--can-fail`` option. ``--arch`` can be used to
|
||||
limit build tag architectures.
|
||||
|
||||
There are some limitation to used kiwi configuration:
|
||||
|
||||
* ``include`` node can use only ``this://`` protocol. Other types like ``file://``
|
||||
or ``https://`` could reach out of the repo preventing reproducible build.
|
||||
* All repositories from description (and included files) are removed and replaced
|
||||
by buildroot repo and other repositories specified by ``--repo`` option.
|
||||
|
||||
Driver Update Disks building
|
||||
============================
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import xml.dom.minidom
|
|||
from fnmatch import fnmatch
|
||||
|
||||
import koji
|
||||
import koji.util
|
||||
from koji.tasks import ServerExit
|
||||
from __main__ import BaseBuildTask, BuildImageTask, BuildRoot, SCM
|
||||
|
||||
|
|
@ -199,6 +200,12 @@ class KiwiCreateImageTask(BaseBuildTask):
|
|||
# doing it recursively)
|
||||
for inc_node in image.getElementsByTagName('include'):
|
||||
path = inc_node.getAttribute('from')
|
||||
if path.startswith('this://'):
|
||||
path = koji.util.joinpath(desc_path, path[7:])
|
||||
else:
|
||||
# we want to reject other protocols, e.g. file://, https://
|
||||
# reachingoutside of repo
|
||||
raise koji.GenericError(f"Unhandled include protocol in include path: {path}.")
|
||||
inc = xml.dom.minidom.parse(path) # nosec
|
||||
# every included xml has image root element again
|
||||
for node in inc.getElementsByTagName('image').childNodes:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue