all: ensure cache files and directories are readable by all

creachadair · creachadair · commit 2213bb231190 · 2024-09-04T16:05:17.000-07:00
- go.mod: update gocache to commit 6c4617815112
- Fix permissions on cache directories and files.
diff --git a/cmd/go-cache-plugin/setup.go b/cmd/go-cache-plugin/setup.go
@@ -102,7 +102,7 @@ func initModProxy(env *command.Env, s3c *s3util.Client) (_ http.Handler, cleanup
 	}
 
 	modCachePath := filepath.Join(flags.CacheDir, "module")
-	if err := os.MkdirAll(modCachePath, 0700); err != nil {
+	if err := os.MkdirAll(modCachePath, 0755); err != nil {
 		return nil, nil, fmt.Errorf("create module cache: %w", err)
 	}
 	cacher := &modproxy.S3Cacher{
@@ -146,7 +146,7 @@ func initRevProxy(env *command.Env, s3c *s3util.Client, g *taskgroup.Group) (htt
 	}
 
 	revCachePath := filepath.Join(flags.CacheDir, "revproxy")
-	if err := os.MkdirAll(revCachePath, 0700); err != nil {
+	if err := os.MkdirAll(revCachePath, 0755); err != nil {
 		return nil, fmt.Errorf("create revproxy cache: %w", err)
 	}
 	hosts := strings.Split(serveFlags.RevProxy, ",")
diff --git a/go.mod b/go.mod
@@ -6,9 +6,9 @@ require (
 	github.com/aws/aws-sdk-go-v2/config v1.27.28
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0
 	github.com/creachadair/atomicfile v0.3.5
-	github.com/creachadair/command v0.1.13
+	github.com/creachadair/command v0.1.14
 	github.com/creachadair/flax v0.0.1
-	github.com/creachadair/gocache v0.0.0-20240828204135-c17fe2fd53a6
+	github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112
 	github.com/creachadair/mds v0.18.1
 	github.com/creachadair/mhttp v0.0.0-20240904023549-156b88d21c62
 	github.com/creachadair/taskgroup v0.9.1
diff --git a/go.sum b/go.sum
@@ -42,12 +42,12 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/creachadair/atomicfile v0.3.5 h1:i93bxeaH/rQR6XfJslola3XkOM1nEP3eIexuk9SWcSc=
 github.com/creachadair/atomicfile v0.3.5/go.mod h1:m7kIY2OUMygtETnMYe141rubsG4b+EusFLinlxxdHYM=
-github.com/creachadair/command v0.1.13 h1:UDKPF3QYPRS/quZPVYZ7sW1JLxLLOgiyVSLQ+7wwI2o=
-github.com/creachadair/command v0.1.13/go.mod h1:YKwUE49nAi8qxLl8jCQ0GMPvwdxmIBkJW3LqxgZ7ljk=
+github.com/creachadair/command v0.1.14 h1:lvAPKPrFU8ECyRQ4MEDCw5UEHhSOIYs5knLLNXvpYyI=
+github.com/creachadair/command v0.1.14/go.mod h1:JyiZVgQzhzPWa8DdE6Hfl+IOi7DMpXToBEvQCQoST7c=
 github.com/creachadair/flax v0.0.1 h1:it+joEf9aEUalaV7XWll/pk6zA4/FbNvMImW9q/lS8o=
 github.com/creachadair/flax v0.0.1/go.mod h1:K8bFvn8hMdAljQkaKNc7I3os5Wk36JxkyCkfdZ7S8d4=
-github.com/creachadair/gocache v0.0.0-20240828204135-c17fe2fd53a6 h1:SCF2S1aWvuFD+Vus1HGkbhaP8+ZX0VC8yWyWynlDqTg=
-github.com/creachadair/gocache v0.0.0-20240828204135-c17fe2fd53a6/go.mod h1:iqnJUdWeHbNfn8xWEkLWGQnOo3dqjkZPH9Rk0rjVk0U=
+github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112 h1:FSlFO2eztBGGzp67D2z/eeNe5U+AZyj4g/CjKf0AHbo=
+github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112/go.mod h1:vkGW73GdzBPQZJdFlPBZVzFcG7lTxIgDY0+U30mp3xs=
 github.com/creachadair/mds v0.18.1 h1:lq2JufNm5Vfkdolf9Z+2shiw7r8XJgLSZniLHUFYJcI=
 github.com/creachadair/mds v0.18.1/go.mod h1:4b//mUiL8YldH6TImXjmW45myzTLNS1LLjOmrk888eg=
 github.com/creachadair/mhttp v0.0.0-20240904023549-156b88d21c62 h1:6OEfFAgnbvhEDAR83DBUbvImn68DH2NpqcXrwID9Vbs=
diff --git a/lib/modproxy/modproxy.go b/lib/modproxy/modproxy.go
@@ -183,7 +183,7 @@ func (c *S3Cacher) putLocal(ctx context.Context, name, path string, data io.Read
 	if _, err := os.Stat(path); err == nil {
 		return true, nil
 	}
-	nw, err := atomicfile.WriteAll(path, data, 0600)
+	nw, err := atomicfile.WriteAll(path, data, 0644)
 	c.putLocalBytes.Add(nw)
 	if err != nil {
 		c.putLocalError.Add(1)
@@ -282,7 +282,7 @@ func (c *S3Cacher) makeKey(hash string) string {
 func (c *S3Cacher) makePath(name string) (hash, path string, err error) {
 	hash = hashName(name)
 	path = filepath.Join(c.Local, hash[:2], hash)
-	err = os.MkdirAll(filepath.Dir(path), 0700)
+	err = os.MkdirAll(filepath.Dir(path), 0755)
 	if err != nil {
 		c.pathError.Add(1)
 	}
diff --git a/lib/revproxy/cache.go b/lib/revproxy/cache.go
@@ -35,10 +35,10 @@ func (s *Server) cacheLoadLocal(hash string) ([]byte, http.Header, error) {
 // response headers, followed by "\n\n", followed by the response body.
 func (s *Server) cacheStoreLocal(hash string, hdr http.Header, body []byte) error {
 	path := s.makePath(hash)
-	if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil {
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
 		return err
 	}
-	return atomicfile.Tx(s.makePath(hash), 0600, func(f *atomicfile.File) error {
+	return atomicfile.Tx(s.makePath(hash), 0644, func(f *atomicfile.File) error {
 		return writeCacheObject(f, hdr, body)
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func initModProxy(env command.Env, s3c s3util.Client) (_ http.Handler, cleanup`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`modCachePath := filepath.Join(flags.CacheDir, "module")`
`105`		`- if err := os.MkdirAll(modCachePath, 0700); err != nil {`
	`105`	`+ if err := os.MkdirAll(modCachePath, 0755); err != nil {`
`106`	`106`	`return nil, nil, fmt.Errorf("create module cache: %w", err)`
`107`	`107`	`}`
`108`	`108`	`cacher := &modproxy.S3Cacher{`
`@@ -146,7 +146,7 @@ func initRevProxy(env command.Env, s3c s3util.Client, g *taskgroup.Group) (htt`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`revCachePath := filepath.Join(flags.CacheDir, "revproxy")`
`149`		`- if err := os.MkdirAll(revCachePath, 0700); err != nil {`
	`149`	`+ if err := os.MkdirAll(revCachePath, 0755); err != nil {`
`150`	`150`	`return nil, fmt.Errorf("create revproxy cache: %w", err)`
`151`	`151`	`}`
`152`	`152`	`hosts := strings.Split(serveFlags.RevProxy, ",")`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ func (s *Server) cacheLoadLocal(hash string) ([]byte, http.Header, error) {`
`35`	`35`	`// response headers, followed by "\n\n", followed by the response body.`
`36`	`36`	`func (s *Server) cacheStoreLocal(hash string, hdr http.Header, body []byte) error {`
`37`	`37`	`path := s.makePath(hash)`
`38`		`- if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil {`
	`38`	`+ if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {`
`39`	`39`	`return err`
`40`	`40`	`}`
`41`		`- return atomicfile.Tx(s.makePath(hash), 0600, func(f *atomicfile.File) error {`
	`41`	`+ return atomicfile.Tx(s.makePath(hash), 0644, func(f *atomicfile.File) error {`
`42`	`42`	`return writeCacheObject(f, hdr, body)`
`43`	`43`	`})`
`44`	`44`	`}`