Patch image-tools for extraction perms as non-root

ahkumar · Jun 13, 2018 · bdd3942 · bdd3942
1 parent 520625e
commit bdd3942
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/mlocal/frags/Makefile.stub b/mlocal/frags/Makefile.stub
@@ -143,6 +143,7 @@ collect:
 dep:
 	@printf " GO DEPS\n"
 	$(V)(dep ensure -vendor-only >/dev/null 2>&1 || true)
+	$(V)(patch --silent ../vendor/github.com/opencontainers/image-tools/image/manifest.go ../patches/image_tools_manifest.go.patch)
 
 .PHONY: test
 test:

diff --git a/patches/image_tools_manifest.go.patch b/patches/image_tools_manifest.go.patch
@@ -0,0 +1,17 @@
+275a276,282
+> 	// SINGULARITY_PATCH
+> 	// Add u+w if we aren't root to allow extractions
+> 	extraPerms := os.FileMode(0000)
+> 	if os.Getuid() != 0 {
+> 		extraPerms = 0600
+> 	}
+> 
+287c294
+< 			err = os.MkdirAll(path, info.Mode())
+---
+> 			err = os.MkdirAll(path, info.Mode()|extraPerms)
+294c301
+< 		f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, info.Mode())
+---
+> 		f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, info.Mode()|extraPerms)
+