Skip to content

[release-4.20] OCPBUGS-63030: removes unintended exec permissions #1291

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

Open
wants to merge 2 commits into
base: release-4.20
Choose a base branch
from
Open

[release-4.20] OCPBUGS-63030: removes unintended exec permissions #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a324015
OCPBUGS-55489: removes unintended exec permissions
aguidirh Oct 2, 2025
9e53684
ignoring gosec for files which requires read perm
aguidirh Oct 3, 2025
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
2 changes: 1 addition & 1 deletion v2/internal/pkg/archive/unarchive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func createFileWithProgress(parentDir string, header *tar.Header, reader *tar.Re
}
proxyReader := bar.ProxyReader(reader)
defer proxyReader.Close()
return writeFile(descriptor, proxyReader, header.FileInfo().Mode()|0755)
return writeFile(descriptor, proxyReader, header.FileInfo().Mode())
}

func writeFile(filePath string, reader io.Reader, perm os.FileMode) error {
Expand Down
4 changes: 2 additions & 2 deletions v2/internal/pkg/delete/delete_images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (o DeleteImages) WriteDeleteMetaData(ctx context.Context, images []v2alpha1
if err != nil {
o.Log.Error(deleteImagesErrMsg, err)
}
err = os.WriteFile(filename, ymlData, 0755)
err = os.WriteFile(filename, ymlData, 0644) //nolint:gosec
if err != nil {
o.Log.Error(deleteImagesErrMsg, err)
}
Expand All @@ -98,7 +98,7 @@ func (o DeleteImages) WriteDeleteMetaData(ctx context.Context, images []v2alpha1
if err != nil {
o.Log.Error("%v ", err)
}
err = os.WriteFile(discYamlFile, discYamlData, 0755)
err = os.WriteFile(discYamlFile, discYamlData, 0644) //nolint:gosec
if err != nil {
o.Log.Error(deleteImagesErrMsg, err)
}
Expand Down
5 changes: 3 additions & 2 deletions v2/internal/pkg/imagebuilder/catalog_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ import (
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/layout"
"github.com/google/go-containerregistry/pkg/v1/tarball"
"github.com/otiai10/copy"

"github.com/openshift/oc-mirror/v2/internal/pkg/api/v2alpha1"
"github.com/openshift/oc-mirror/v2/internal/pkg/image"
"github.com/openshift/oc-mirror/v2/internal/pkg/log"
"github.com/openshift/oc-mirror/v2/internal/pkg/mirror"
"github.com/otiai10/copy"
)

const (
Expand Down Expand Up @@ -125,7 +126,7 @@ func (c GCRCatalogBuilder) RebuildCatalog(ctx context.Context, catalogCopyRef v2
if err != nil {
return fmt.Errorf("error building catalog %s : %v", catalogCopyRef.Origin, err)
}
err = os.WriteFile(filepath.Join(filteredDir, "digest"), []byte(digest), 0755)
err = os.WriteFile(filepath.Join(filteredDir, "digest"), []byte(digest), 0644) //nolint:gosec
if err != nil {
return err
}
Expand Down