Skip to content

bib: fix anaconda-iso mTLS key extraction #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ondrejbudai merged 1 commit into from
Dec 12, 2025
Merged

bib: fix anaconda-iso mTLS key extraction #404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions cmd/image-builder/bib_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ func bibManifestFromCobraFor(imgref, buildImgref, installerPayloadRef, imgTypeSt
if useLibrepo {
rpmDownloader = osbuild.RpmDownloaderLibrepo
}
var mTLS *mTLSConfig
mg, err := manifestgen.New(repos, &manifestgen.Options{
// XXX: hack to skip repo loading for the bootc image.
// We need to add a SkipRepositories or similar to
Expand All @@ -172,6 +173,15 @@ func bibManifestFromCobraFor(imgref, buildImgref, installerPayloadRef, imgTypeSt
RpmDownloader: rpmDownloader,
Depsolve: func(solver *depsolvednf.Solver, cacheDir string, depsolveWarningsOutput io.Writer, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string]depsolvednf.DepsolveResult, error) {
depsolveResult, err = manifestgen.DefaultDepsolve(solver, cacheDir, depsolveWarningsOutput, packageSets, d, arch)
// extracting needs to happen while container is mounted
depsolvedRepos := make(map[string][]rpmmd.RepoConfig)
for k, v := range depsolveResult {
depsolvedRepos[k] = v.Repos
}
mTLS, err = extractTLSKeys(depsolvedRepos)
if err != nil {
return nil, err
}
return depsolveResult, err
},
// this turns (blueprint validation) warnings into
Expand All @@ -191,15 +201,6 @@ func bibManifestFromCobraFor(imgref, buildImgref, installerPayloadRef, imgTypeSt
return nil, nil, err
}

depsolvedRepos := make(map[string][]rpmmd.RepoConfig)
for k, v := range depsolveResult {
depsolvedRepos[k] = v.Repos
}
mTLS, err := extractTLSKeys(depsolvedRepos)
if err != nil {
return nil, nil, err
}

return manifest, mTLS, nil
}

Expand Down
Loading