pkg: make status world-readablestaging

These files may be inspected externally, mainly for the CI use case.

Signed-off-by: Ophestra <cat@gensokyo.uk>

5 files changed, 37 insertions, 27 deletions

diff --git a/pkg/archive_test.go b/pkg/archive_test.go
index 2847fca3..1ca631ee 100644
--- a/pkg/archive_test.go
+++ b/pkg/archive_test.go
@@ -204,8 +204,8 @@ func TestArchiveArtifact(t *testing.T) {
 			"identifier": {Mode: fs.ModeDir | 0700},
 			"identifier/iyvWY0irMoW4AVRnG_du07d_nAEUtbHdeiaAYRdp-vf3wstM9u67IokOsPfU9eyM": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/CBPcoVHuVUTVRCMbRl8J30RSSzm_tyfuXaZ-HlZsanY1sY50meOVmgaWDrGKbx9F")},
 
-			"status": {Mode: fs.ModeDir | 0700},
-			"status/iyvWY0irMoW4AVRnG_du07d_nAEUtbHdeiaAYRdp-vf3wstM9u67IokOsPfU9eyM": {Mode: 0400, Data: []byte(statusHeader + `drwx------ block
+			"status": {Mode: fs.ModeDir | 0711},
+			"status/iyvWY0irMoW4AVRnG_du07d_nAEUtbHdeiaAYRdp-vf3wstM9u67IokOsPfU9eyM": {Mode: 0444, Data: []byte(statusHeader + `drwx------ block
 -rw------- block/uevent (0 bytes)
 drwx------ devices
 drwx------ devices/empty
diff --git a/pkg/clean_test.go b/pkg/clean_test.go
index e31d52aa..3b5d0b3b 100644
--- a/pkg/clean_test.go
+++ b/pkg/clean_test.go
@@ -52,7 +52,7 @@ func TestClean(t *testing.T) {
 
 			"lock":       {Mode: 0644},
 			"variant":    {Mode: 0400},
-			"status":     {Mode: fs.ModeDir | 0700},
+			"status":     {Mode: fs.ModeDir | 0711},
 			"substitute": {Mode: fs.ModeDir | 0700},
 			"fault":      {Mode: fs.ModeDir | 0700},
 			"work":       {Mode: fs.ModeDir | 0700},
@@ -73,7 +73,7 @@ func TestClean(t *testing.T) {
 
 			"lock":       {Mode: 0644},
 			"variant":    {Mode: 0400},
-			"status":     {Mode: fs.ModeDir | 0700},
+			"status":     {Mode: fs.ModeDir | 0711},
 			"substitute": {Mode: fs.ModeDir | 0700},
 			"fault":      {Mode: fs.ModeDir | 0700},
 			"work":       {Mode: fs.ModeDir | 0700},
@@ -127,7 +127,7 @@ func TestClean(t *testing.T) {
 
 			"lock":    {Mode: 0644},
 			"variant": {Mode: 0400},
-			"status":  {Mode: fs.ModeDir | 0700},
+			"status":  {Mode: fs.ModeDir | 0711},
 
 			"substitute": {Mode: fs.ModeDir | 0700},
 			"substitute/dP-6_wIDRRouOaOF-nkBy-IaUbLdYHbOUTrptu7j_qfW01mnHSjYJ0oykUmvUd2x": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/UjZSrgz7_B7XMd9fHU7jM33UZhWlFgX0rz7JZbCBYR28bCS7jr_CAJdcDhi52ruE")},
@@ -205,9 +205,9 @@ func TestClean(t *testing.T) {
 			"lock":    {Mode: 0644},
 			"variant": {Mode: 0400},
 
-			"status": {Mode: fs.ModeDir | 0700},
-			"status/xxQ43VMIS1WHMSEFnUdBNd6pulbtgiTorP_mtJpEsZENYhGBiDEL6Y2D8yqn0Sra": {Mode: 0400, Data: []byte(statusHeader + "kept")},
-			"status/td1tf1kb3z8iUFg2k1xlHeTTEz3xR4e77WSWdv2JhjmZyY6iuvodhdT8BblDOi0E": {Mode: 0400, Data: []byte(statusHeader + "kept")},
+			"status": {Mode: fs.ModeDir | 0711},
+			"status/xxQ43VMIS1WHMSEFnUdBNd6pulbtgiTorP_mtJpEsZENYhGBiDEL6Y2D8yqn0Sra": {Mode: 0444, Data: []byte(statusHeader + "kept")},
+			"status/td1tf1kb3z8iUFg2k1xlHeTTEz3xR4e77WSWdv2JhjmZyY6iuvodhdT8BblDOi0E": {Mode: 0444, Data: []byte(statusHeader + "kept")},
 
 			"substitute": {Mode: fs.ModeDir | 0700},
 			"substitute/td1tf1kb3z8iUFg2k1xlHeTTEz3xR4e77WSWdv2JhjmZyY6iuvodhdT8BblDOi0E": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/CyDnDvF-LaeGPcSW70tPosNCoclByWkTjznUUF1DcgzlIwkN9yzz1ZFME1TlPj6W")},
diff --git a/pkg/pkg.go b/pkg/pkg.go
index 75e0d1b1..e3d32028 100644
--- a/pkg/pkg.go
+++ b/pkg/pkg.go
@@ -206,7 +206,7 @@ func (t *TContext) prepareStatus(writeHeader bool) error {
 	if t.status, t.statusErr = os.OpenFile(
 		t.statusPath.String(),
 		syscall.O_CREAT|syscall.O_EXCL|syscall.O_WRONLY,
-		0400,
+		0444,
 	); t.statusErr != nil {
 		return t.statusErr
 	}
@@ -2798,7 +2798,6 @@ func Open(
 		dirSubstitute,
 		dirIdentifier,
 		dirChecksum,
-		dirStatus,
 		dirFault,
 		dirWork,
 	} {
@@ -2810,6 +2809,17 @@ func Open(
 		}
 	}
 
+	for _, name := range []string{
+		dirStatus,
+	} {
+		if err := os.MkdirAll(
+			base.Append(name).String(),
+			0711,
+		); err != nil && !errors.Is(err, os.ErrExist) {
+			return nil, err
+		}
+	}
+
 	c := Cache{
 		parent: ctx,
 
diff --git a/pkg/pkg_test.go b/pkg/pkg_test.go
index 38227cca..2d5fdf8e 100644
--- a/pkg/pkg_test.go
+++ b/pkg/pkg_test.go
@@ -1514,10 +1514,10 @@ func TestCache(t *testing.T) {
 			"identifier/heRgWhNJmhm898V68kw0ta76t4rP1o29tYW_TrdyBWXGfo37K3QWA7Z-JkLXAwcn": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/UjZSrgz7_B7XMd9fHU7jM33UZhWlFgX0rz7JZbCBYR28bCS7jr_CAJdcDhi52ruE")},
 			"identifier/q-VoVBI3IjcWTqwIokpi3y05CP113CHgHslc-XWnhOvDULwzVc3q9Y5xOCm_YyLZ": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/UjZSrgz7_B7XMd9fHU7jM33UZhWlFgX0rz7JZbCBYR28bCS7jr_CAJdcDhi52ruE")},
 
-			"status": {Mode: fs.ModeDir | 0700},
+			"status": {Mode: fs.ModeDir | 0711},
 			"status/q-VoVBI3IjcWTqwIokpi3y05CP113CHgHslc-XWnhOvDULwzVc3q9Y5xOCm_YyLZ": {Mode: fs.ModeSymlink | 0777, Data: []byte("dP-6_wIDRRouOaOF-nkBy-IaUbLdYHbOUTrptu7j_qfW01mnHSjYJ0oykUmvUd2x")},
-			"status/heRgWhNJmhm898V68kw0ta76t4rP1o29tYW_TrdyBWXGfo37K3QWA7Z-JkLXAwcn": {Mode: 0400, Data: []byte(statusHeader + "destroyed")},
-			"status/dP-6_wIDRRouOaOF-nkBy-IaUbLdYHbOUTrptu7j_qfW01mnHSjYJ0oykUmvUd2x": {Mode: 0400, Data: []byte(statusHeader + "destroyed")},
+			"status/heRgWhNJmhm898V68kw0ta76t4rP1o29tYW_TrdyBWXGfo37K3QWA7Z-JkLXAwcn": {Mode: 0444, Data: []byte(statusHeader + "destroyed")},
+			"status/dP-6_wIDRRouOaOF-nkBy-IaUbLdYHbOUTrptu7j_qfW01mnHSjYJ0oykUmvUd2x": {Mode: 0444, Data: []byte(statusHeader + "destroyed")},
 
 			"substitute": {Mode: fs.ModeDir | 0700},
 			"substitute/dP-6_wIDRRouOaOF-nkBy-IaUbLdYHbOUTrptu7j_qfW01mnHSjYJ0oykUmvUd2x": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/UjZSrgz7_B7XMd9fHU7jM33UZhWlFgX0rz7JZbCBYR28bCS7jr_CAJdcDhi52ruE")},
@@ -1618,10 +1618,10 @@ func TestCache(t *testing.T) {
 			"identifier/ofaXbB5gIza_7W4Rzo5XDe_8FwlCPKWn3TBcmGgFAkkTWMl5GXGmOzX89Jd2Mk2A": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/OLBgp1GsljhM2TJ-sbHjaiH9txEUvgdDTAzHv2P24donTt6_529l-9Ua0vFImLlb")},
 			"identifier/8VL-egZySw-RbnHZtxGWdf5Z2v9S9CihrdFwa54Bc5EYMQcEgWEem7QrdCTWlCb8": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/fHkl_RuHOoc4rso__nV-qreikovd6Yhrq5mpBlkf5hmPGaxDlik2bYOQ4dhUQjtl")},
 
-			"status": {Mode: fs.ModeDir | 0700},
-			"status/8VL-egZySw-RbnHZtxGWdf5Z2v9S9CihrdFwa54Bc5EYMQcEgWEem7QrdCTWlCb8": {Mode: 0400, Data: []byte("\x00")},
-			"status/9_LKKy-vVT9DxQj-SkqSJFZAc0Yehan3LhldTw8fOIP4XX_DrvkpcPkBV5_46e2q": {Mode: 0400, Data: []byte(statusHeader + "Lrwxrwxrwx result linkname /proc/nonexistent\n")},
-			"status/kHH2amyzTN_EpsOyKEOenCROONllTrWAXAwVXOKzx3TgM95-y9ipiz0vkRE-ujBf": {Mode: 0400, Data: []byte(statusHeader)},
+			"status": {Mode: fs.ModeDir | 0711},
+			"status/8VL-egZySw-RbnHZtxGWdf5Z2v9S9CihrdFwa54Bc5EYMQcEgWEem7QrdCTWlCb8": {Mode: 0444, Data: []byte("\x00")},
+			"status/9_LKKy-vVT9DxQj-SkqSJFZAc0Yehan3LhldTw8fOIP4XX_DrvkpcPkBV5_46e2q": {Mode: 0444, Data: []byte(statusHeader + "Lrwxrwxrwx result linkname /proc/nonexistent\n")},
+			"status/kHH2amyzTN_EpsOyKEOenCROONllTrWAXAwVXOKzx3TgM95-y9ipiz0vkRE-ujBf": {Mode: 0444, Data: []byte(statusHeader)},
 
 			"substitute": {Mode: fs.ModeDir | 0700},
 			"substitute/socGRnhdsJlJ4Z01ZwHFZdLzFH0rWvoaJrylcUKtvhBdGsE7VoYl-vdUuvfK8B4I": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/MGWmEfjut2QE2xPJwTsmUzpff4BN_FEnQ7T0j7gvUCCiugJQNwqt9m151fm9D1yU")},
@@ -1764,10 +1764,10 @@ func TestCache(t *testing.T) {
 			"identifier/kHH2amyzTN_EpsOyKEOenCROONllTrWAXAwVXOKzx3TgM95-y9ipiz0vkRE-ujBf": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/MGWmEfjut2QE2xPJwTsmUzpff4BN_FEnQ7T0j7gvUCCiugJQNwqt9m151fm9D1yU")},
 			"identifier/mXlNz_v77nW7jstn_rJn4RL7dCQlkakM0y-HjO6tkDubtzaj-wCmW1hIr2Gk64_O": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/fHkl_RuHOoc4rso__nV-qreikovd6Yhrq5mpBlkf5hmPGaxDlik2bYOQ4dhUQjtl")},
 
-			"status": {Mode: fs.ModeDir | 0700},
-			"status/8VL-egZySw-RbnHZtxGWdf5Z2v9S9CihrdFwa54Bc5EYMQcEgWEem7QrdCTWlCb8": {Mode: 0400, Data: []byte("\x00")},
-			"status/9_LKKy-vVT9DxQj-SkqSJFZAc0Yehan3LhldTw8fOIP4XX_DrvkpcPkBV5_46e2q": {Mode: 0400, Data: []byte(statusHeader + "Lrwxrwxrwx result linkname /proc/nonexistent\n")},
-			"status/kHH2amyzTN_EpsOyKEOenCROONllTrWAXAwVXOKzx3TgM95-y9ipiz0vkRE-ujBf": {Mode: 0400, Data: []byte(statusHeader)},
+			"status": {Mode: fs.ModeDir | 0711},
+			"status/8VL-egZySw-RbnHZtxGWdf5Z2v9S9CihrdFwa54Bc5EYMQcEgWEem7QrdCTWlCb8": {Mode: 0444, Data: []byte("\x00")},
+			"status/9_LKKy-vVT9DxQj-SkqSJFZAc0Yehan3LhldTw8fOIP4XX_DrvkpcPkBV5_46e2q": {Mode: 0444, Data: []byte(statusHeader + "Lrwxrwxrwx result linkname /proc/nonexistent\n")},
+			"status/kHH2amyzTN_EpsOyKEOenCROONllTrWAXAwVXOKzx3TgM95-y9ipiz0vkRE-ujBf": {Mode: 0444, Data: []byte(statusHeader)},
 
 			"substitute": {Mode: fs.ModeDir | 0700},
 			"substitute/MccYezQ4pshkeBV4w_aAEIwvZdKHL3OAgAkR3ouZ43EF94Ur1HBHaN7njPfJAj50": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/fHkl_RuHOoc4rso__nV-qreikovd6Yhrq5mpBlkf5hmPGaxDlik2bYOQ4dhUQjtl")},
diff --git a/pkg/tar_test.go b/pkg/tar_test.go
index 28fec2d2..58ec3aed 100644
--- a/pkg/tar_test.go
+++ b/pkg/tar_test.go
@@ -100,9 +100,9 @@ Lrwxrwxrwx lib/libedac.so linkname /proc/nonexistent/libedac.so
 			"identifier/82-Dwiovp_DGXPBmnmrTk4XtsduvTBBXxnJTBgyp6avsUhjcqmL9yKQLxkwJJM0x": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantEncode)},
 			"identifier/ld6DxwiP2Gj47Ue2L_pFv6NrOth8nkU5W1voMyivd2aVROrorGqPlpbyHUnU1AvI": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantEncode)},
 
-			"status": {Mode: fs.ModeDir | 0700},
-			"status/82-Dwiovp_DGXPBmnmrTk4XtsduvTBBXxnJTBgyp6avsUhjcqmL9yKQLxkwJJM0x": {Mode: 0400, Data: []byte(statusHeader + wantStatus)},
-			"status/ld6DxwiP2Gj47Ue2L_pFv6NrOth8nkU5W1voMyivd2aVROrorGqPlpbyHUnU1AvI": {Mode: 0400, Data: []byte(statusHeader + wantStatus)},
+			"status": {Mode: fs.ModeDir | 0711},
+			"status/82-Dwiovp_DGXPBmnmrTk4XtsduvTBBXxnJTBgyp6avsUhjcqmL9yKQLxkwJJM0x": {Mode: 0444, Data: []byte(statusHeader + wantStatus)},
+			"status/ld6DxwiP2Gj47Ue2L_pFv6NrOth8nkU5W1voMyivd2aVROrorGqPlpbyHUnU1AvI": {Mode: 0444, Data: []byte(statusHeader + wantStatus)},
 
 			"substitute": {Mode: fs.ModeDir | 0700},
 
@@ -128,9 +128,9 @@ Lrwxrwxrwx lib/libedac.so linkname /proc/nonexistent/libedac.so
 			"identifier/82-Dwiovp_DGXPBmnmrTk4XtsduvTBBXxnJTBgyp6avsUhjcqmL9yKQLxkwJJM0x": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantExpandEncode)},
 			"identifier/fsMFOV4_LoYWbC8GNqL2zjbpzNzT80vPWbSw4L47caKVIta333WIW2TZXoSW8ntH": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantExpandEncode)},
 
-			"status": {Mode: fs.ModeDir | 0700},
-			"status/82-Dwiovp_DGXPBmnmrTk4XtsduvTBBXxnJTBgyp6avsUhjcqmL9yKQLxkwJJM0x": {Mode: 0400, Data: []byte(statusHeader + wantStatusExpand)},
-			"status/fsMFOV4_LoYWbC8GNqL2zjbpzNzT80vPWbSw4L47caKVIta333WIW2TZXoSW8ntH": {Mode: 0400, Data: []byte(statusHeader + wantStatusExpand)},
+			"status": {Mode: fs.ModeDir | 0711},
+			"status/82-Dwiovp_DGXPBmnmrTk4XtsduvTBBXxnJTBgyp6avsUhjcqmL9yKQLxkwJJM0x": {Mode: 0444, Data: []byte(statusHeader + wantStatusExpand)},
+			"status/fsMFOV4_LoYWbC8GNqL2zjbpzNzT80vPWbSw4L47caKVIta333WIW2TZXoSW8ntH": {Mode: 0444, Data: []byte(statusHeader + wantStatusExpand)},
 
 			"substitute": {Mode: fs.ModeDir | 0700},