Merge pull request #8 from rabadin/add-perm-feat

feat: add option to set permissions on the downloaded files

cmd/download.go

@@ -13,6 +13,7 @@ func init() {
 	downloadCmd.Flags().String("dir", ".", "Target directory where to store the files")
 	downloadCmd.Flags().StringArray("tag", []string{}, "Only download the resources with the given tag")
 	downloadCmd.Flags().StringArray("notag", []string{}, "Only download the resources without the given tag")
+	downloadCmd.Flags().String("perm", "", "Optional permissions for the downloaded files (e.g. '644')")
 }
 
 var downloadCmd = &cobra.Command{
@@ -33,6 +34,8 @@ func runFetch(cmd *cobra.Command, args []string) {
 	FatalIfNotNil(err)
 	notags, err := cmd.Flags().GetStringArray("notag")
 	FatalIfNotNil(err)
-	err = lock.Download(dir, tags, notags)
+	perm, err := cmd.Flags().GetString("perm")
+	FatalIfNotNil(err)
+	err = lock.Download(dir, tags, notags, perm)
 	FatalIfNotNil(err)
 }

internal/lock.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strconv"
 
 	toml "github.com/pelletier/go-toml/v2"
 )
@@ -71,12 +72,30 @@ func (l *Lock) DeleteResource(path string) {
 	l.conf.Resource = newStatements
 }
 
+const NoFileMode = os.FileMode(0)
+
+// strToFileMode converts a string to a os.FileMode.
+func strToFileMode(perm string) (os.FileMode, error) {
+	if perm == "" {
+		return NoFileMode, nil
+	}
+	parsed, err := strconv.ParseUint(perm, 8, 32)
+	if err != nil {
+		return NoFileMode, err
+	}
+	return os.FileMode(parsed), nil
+}
+
 // Download gets all the resources in this lock file and moves them to
 // the destination directory.
-func (l *Lock) Download(dir string, tags []string, notags []string) error {
+func (l *Lock) Download(dir string, tags []string, notags []string, perm string) error {
 	if stat, err := os.Stat(dir); err != nil || !stat.IsDir() {
 		return fmt.Errorf("'%s' is not a directory", dir)
 	}
+	mode, err := strToFileMode(perm)
+	if err != nil {
+		return fmt.Errorf("'%s' is not a valid permission definition", perm)
+	}
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -133,7 +152,7 @@ func (l *Lock) Download(dir string, tags []string, notags []string) error {
 	for _, r := range filteredResources {
 		resource := r
 		go func() {
-			err := resource.Download(dir, ctx)
+			err := resource.Download(dir, mode, ctx)
 			errorCh <- err
 		}()
 	}

internal/lock_test.go

@@ -72,6 +72,29 @@ func TestDuplicateResource(t *testing.T) {
 	assert.Contains(t, err.Error(), "already present")
 }
 
+func TestStrToFileMode(t *testing.T) {
+	cases := []struct {
+		Input    string
+		Err      bool
+		Expected string
+	}{
+		{"", false, NoFileMode.String()},
+		{"bogus", true, ""},
+		{"666", false, "-rw-rw-rw-"},
+		{"741", false, "-rwxr----x"},
+	}
+	for _, c := range cases {
+		t.Run(c.Input, func(t *testing.T) {
+			res, err := strToFileMode(c.Input)
+			if c.Err {
+				assert.NotNil(t, err)
+			} else {
+				assert.Equal(t, res.String(), c.Expected)
+			}
+		})
+	}
+}
+
 func TestDownload(t *testing.T) {
 	httpContent := []byte(`abcdef`)
 	handler := func(w http.ResponseWriter, r *http.Request) {
@@ -86,10 +109,12 @@ func TestDownload(t *testing.T) {
 		[[Resource]]
 		Urls = ['http://localhost:%d/test.html']
 		Integrity = 'sha256-vvV+x/U6bUC+tkCngKY5yDvCmsipgW8fxsXG3Nk8RyE='`, port))
+	perm := "467"
+	strPerm := "-r--rw-rwx"
 	lock, err := NewLock(path, false)
 	assert.Nil(t, err)
 	dir := tmpDir(t)
-	err = lock.Download(dir, []string{}, []string{})
+	err = lock.Download(dir, []string{}, []string{}, perm)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -100,4 +125,9 @@ func TestDownload(t *testing.T) {
 		t.Fatal(err)
 	}
 	assert.Equal(t, httpContent, content)
+	stats, err := os.Stat(resFile)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, stats.Mode().Perm().String(), strPerm)
 }

internal/resource.go

@@ -78,7 +78,7 @@ func GetUrltoTempFile(u string, ctx context.Context) (string, error) {
 	return getUrl(u, fileName, ctx)
 }
 
-func (l *Resource) Download(dir string, ctx context.Context) error {
+func (l *Resource) Download(dir string, mode os.FileMode, ctx context.Context) error {
 	ok := false
 	algo, err := getAlgoFromIntegrity(l.Integrity)
 	if err != nil {
@@ -102,10 +102,14 @@ func (l *Resource) Download(dir string, ctx context.Context) error {
 		} else {
 			localName = path.Base(u)
 		}
-		err = os.Rename(lpath, filepath.Join(dir, localName))
+		resPath := filepath.Join(dir, localName)
+		err = os.Rename(lpath, resPath)
 		if err != nil {
 			return err
 		}
+		if mode != NoFileMode {
+			os.Chmod(resPath, mode.Perm())
+		}
 		ok = true
 	}
 	if !ok {