Skip to content

[release-4.6] Bug 1920626: narrow scope of rhsm transient bind mount #211

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
openshift-merge-robot merged 1 commit into from
Jan 28, 2021
Merged

[release-4.6] Bug 1920626: narrow scope of rhsm transient bind mount #211

Show file tree
Hide file tree
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
65 changes: 5 additions & 60 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package main

import (
"fmt"
"io"
"io/ioutil"
"math/rand"
"os"
"os/signal"
Expand All @@ -17,10 +15,10 @@ import (

"k8s.io/component-base/logs"

"github.com/openshift/library-go/pkg/serviceability"

"github.com/openshift/builder/pkg/build/builder"
"github.com/openshift/builder/pkg/version"
"github.com/openshift/library-go/pkg/serviceability"
s2ifs "github.com/openshift/source-to-image/pkg/util/fs"
)

func main() {
Expand Down Expand Up @@ -51,14 +49,15 @@ func main() {

clusterCASrc := fmt.Sprintf("%s/ca.crt", builder.SecretCertsMountPath)
clusterCADst := fmt.Sprintf("%s/cluster.crt", tlsCertRoot)
err := CopyFileIfExists(clusterCASrc, clusterCADst)
fs := s2ifs.NewFileSystem()
err := fs.Copy(clusterCASrc, clusterCADst, map[string]string{})
if err != nil {
fmt.Printf("Error setting up cluster CA cert: %v", err)
os.Exit(1)
}

runtimeCASrc := fmt.Sprintf("%s/certs.d", builder.ConfigMapCertsMountPath)
err = CopyDirIfExists(runtimeCASrc, runtimeCertRoot)
err = fs.CopyContents(runtimeCASrc, runtimeCertRoot, map[string]string{})
if err != nil {
fmt.Printf("Error setting up service CA cert: %v", err)
os.Exit(1)
Expand All @@ -71,60 +70,6 @@ func main() {
}
}

// CopyDirIfExists recursively copies a directory to the destination path.
// If the source directory does not exist, no error is returned.
// If the destination directory exists, any contents with matching file names
// will be overwritten.
func CopyDirIfExists(src, dst string) error {
srcInfo, err := os.Stat(src)
if os.IsNotExist(err) {
return nil
}
if err = os.MkdirAll(dst, srcInfo.Mode()); err != nil {
return err
}
dirInfo, err := ioutil.ReadDir(src)
for _, info := range dirInfo {
srcPath := filepath.Join(src, info.Name())
dstPath := filepath.Join(dst, info.Name())
if info.IsDir() {
err = CopyDirIfExists(srcPath, dstPath)
} else {
err = CopyFileIfExists(srcPath, dstPath)
}
if err != nil {
return err
}
}
return nil
}

// CopyFileIfExists copies the source file to the given destination, if the source file exists.
// If the destination file exists, it will be overwritten and will not copy file attributes.
func CopyFileIfExists(src, dst string) error {
_, err := os.Stat(src)
if os.IsNotExist(err) {
return nil
}
in, err := os.Open(src)
if err != nil {
return err
}
defer in.Close()

out, err := os.Create(dst)
if err != nil {
return err
}
defer out.Close()

_, err = io.Copy(out, in)
if err != nil {
return err
}
return out.Close()
}

// CommandFor returns the appropriate command for this base name,
// or the OpenShift CLI command.
func CommandFor(basename string) *cobra.Command {
Expand Down
21 changes: 17 additions & 4 deletions pkg/build/builder/daemonless.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (

"github.com/openshift/builder/pkg/build/builder/cmd/dockercfg"
builderutil "github.com/openshift/builder/pkg/build/builder/util"
s2ifs "github.com/openshift/source-to-image/pkg/util/fs"
)

var (
Expand Down Expand Up @@ -212,10 +213,22 @@ func buildDaemonlessImage(sc types.SystemContext, store storage.Store, isolation
}

var transientMounts []string
if st, err := os.Stat("/run/secrets"); err == nil && st.IsDir() {
// Add a bind of /run/secrets, to pass along anything that the
// runtime mounted from the node into our /run/secrets.
transientMounts = append(transientMounts, "/run/secrets:/run/secrets:ro,nodev,noexec,nosuid")
if st, err := os.Stat("/run/secrets/rhsm"); err == nil && st.IsDir() {
// Add a bind of /run/secrets/rhsm, to pass along anything that the
// runtime mounted from the node into our /run/secrets/rhsm.
log.V(0).Infof("Adding transient rw bind mount for /run/secrets/rhsm")
tmpDir, err := ioutil.TempDir("/tmp", "rhsm-copy")
if err != nil {
log.V(0).Infof("Error creating tmpdir to set up /run/secrets/rhsm in build container: %s", err.Error())
return err
}
fs := s2ifs.NewFileSystem()
err = fs.CopyContents("/run/secrets/rhsm", tmpDir, map[string]string{})
if err != nil {
log.V(0).Infof("Error copying /run/secrets/rhsm to tmpdir %s: %s", tmpDir, err.Error())
return err
}
transientMounts = append(transientMounts, fmt.Sprintf("%s:/run/secrets/rhsm:rw,nodev,noexec,nosuid", tmpDir))
}

// Use a profile provided in the image instead of the default provided
Expand Down