root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

imagebuildah.Executor/StageExecutor: check numeric --from= values 

When we look up a stage that's referred to in a COPY --from argument,
treat the string as a stage number not only if it parses as one, as we
checked before, but now also require that the number correspond to one
of the stages that would be completed before the one into which the
content will be copied.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2025-08-08 10:16:17 -04:00
parent 03da7d83c2
commit fd498cbf5d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imagebuildah/executor.go
View File

@ -862,7 +862,7 @@ func (b *Executor) Build(ctx context.Context, stages imagebuilder.Stages) (image
logrus.Debugf("stage %d name: %q resolves to %q", stageIndex, stageName, baseWithArg) logrus.Debugf("stage %d name: %q resolves to %q", stageIndex, stageName, baseWithArg)
stageName = baseWithArg stageName = baseWithArg
// If --from=<index> convert index to name // If --from=<index> convert index to name
if index, err := strconv.Atoi(stageName); err == nil { if index, err := strconv.Atoi(stageName); err == nil && index >= 0 && index < stageIndex {
stageName = stages[index].Name stageName = stages[index].Name
} }
// Check if selected base is not an additional // Check if selected base is not an additional

4
imagebuildah/stage_executor.go
View File

@ -467,7 +467,7 @@ func (s *StageExecutor) performCopy(excludes []string, copies ...imagebuilder.Co
// exists and if stage short_name matches any // exists and if stage short_name matches any
// additionalContext replace stage with additional // additionalContext replace stage with additional
// build context. // build context.
if index, err := strconv.Atoi(from); err == nil { if index, err := strconv.Atoi(from); err == nil && index >= 0 && index < s.index {
from = s.stages[index].Name from = s.stages[index].Name
} }
if foundContext, ok := s.executor.additionalBuildContexts[from]; ok { if foundContext, ok := s.executor.additionalBuildContexts[from]; ok {
@ -1395,7 +1395,7 @@ func (s *StageExecutor) Execute(ctx context.Context, base string) (imgID string,
// also account if the index is given instead // also account if the index is given instead
// of name so convert index in --from=<index> // of name so convert index in --from=<index>
// to name. // to name.
if index, err := strconv.Atoi(from); err == nil { if index, err := strconv.Atoi(from); err == nil && index >= 0 && index < s.index {
from = s.stages[index].Name from = s.stages[index].Name
} }
// If additional buildContext contains this // If additional buildContext contains this