Skip to content

Commit 60f7738

Browse files
Merge pull request #460 from rissh/sysdump-gzip-refactor
[#458] fix(sysdump): ensure AppArmor tar is gzipped in sysdump
2 parents e7b1e60 + 47ddbfe commit 60f7738

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

recommend/registry/registry.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ func extractTar(tarname string, tempDir string) ([]string, []string) {
250250
}
251251
dl = append(dl, tgt)
252252
case tar.TypeReg:
253-
f, err := os.OpenFile(filepath.Clean(tgt), os.O_CREATE|os.O_RDWR, os.FileMode(hdr.Mode))
253+
f, err := os.OpenFile(filepath.Clean(tgt), os.O_CREATE|os.O_RDWR, os.FileMode(hdr.Mode)) //#nosec G115 // hdr.mode bits are trusted here
254254
if err != nil {
255255
log.WithError(err).WithFields(log.Fields{
256256
"target": tgt,

sysdump/sysdump.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func copyFromPod(srcPath string, d string, c *k8s.Client) error {
277277
for _, pod := range pods.Items {
278278
destPath := path.Join(d, fmt.Sprintf("%s_apparmor.tar.gz", pod.Name))
279279
reader, outStream := io.Pipe()
280-
cmdArr := []string{"tar", "cf", "-", srcPath}
280+
cmdArr := []string{"tar", "czf", "-", srcPath}
281281
req := c.K8sClientset.CoreV1().RESTClient().
282282
Get().
283283
Namespace(pod.Namespace).

0 commit comments

Comments
 (0)