Skip to content

Commit d2e93e0

Browse files
Merge pull request #1285 from aguidirh/ocpbugs-55489
OCPBUGS-55489: removes unintended exec permissions
2 parents bed940f + 5d4493a commit d2e93e0

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

v2/internal/pkg/archive/unarchive.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func createFileWithProgress(parentDir string, header *tar.Header, reader *tar.Re
178178
}
179179
proxyReader := bar.ProxyReader(reader)
180180
defer proxyReader.Close()
181-
return writeFile(descriptor, proxyReader, header.FileInfo().Mode()|0755)
181+
return writeFile(descriptor, proxyReader, header.FileInfo().Mode())
182182
}
183183

184184
func writeFile(filePath string, reader io.Reader, perm os.FileMode) error {

v2/internal/pkg/delete/delete_images.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (o DeleteImages) WriteDeleteMetaData(ctx context.Context, images []v2alpha1
7575
if err != nil {
7676
o.Log.Error(deleteImagesErrMsg, err)
7777
}
78-
err = os.WriteFile(filename, ymlData, 0755)
78+
err = os.WriteFile(filename, ymlData, 0644) //nolint:gosec
7979
if err != nil {
8080
o.Log.Error(deleteImagesErrMsg, err)
8181
}
@@ -98,7 +98,7 @@ func (o DeleteImages) WriteDeleteMetaData(ctx context.Context, images []v2alpha1
9898
if err != nil {
9999
o.Log.Error("%v ", err)
100100
}
101-
err = os.WriteFile(discYamlFile, discYamlData, 0755)
101+
err = os.WriteFile(discYamlFile, discYamlData, 0644) //nolint:gosec
102102
if err != nil {
103103
o.Log.Error(deleteImagesErrMsg, err)
104104
}

v2/internal/pkg/imagebuilder/catalog_builder.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ import (
1515
v1 "github.com/google/go-containerregistry/pkg/v1"
1616
"github.com/google/go-containerregistry/pkg/v1/layout"
1717
"github.com/google/go-containerregistry/pkg/v1/tarball"
18+
"github.com/otiai10/copy"
19+
1820
"github.com/openshift/oc-mirror/v2/internal/pkg/api/v2alpha1"
1921
"github.com/openshift/oc-mirror/v2/internal/pkg/image"
2022
"github.com/openshift/oc-mirror/v2/internal/pkg/log"
2123
"github.com/openshift/oc-mirror/v2/internal/pkg/mirror"
22-
"github.com/otiai10/copy"
2324
)
2425

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

0 commit comments

Comments
 (0)