dashboard / erock/git-pr / feat: range diff #16 rss

accepted · opened on 2024-08-19T21:12:53Z by erock
Help
checkout latest patchset:
ssh pr.pico.sh print pr-16 | git am -3
checkout any patchset in a patch request:
ssh pr.pico.sh print ps-X | git am -3
add changes to patch request:
git format-patch main --stdout | ssh pr.pico.sh pr add 16
add review to patch request:
git format-patch main --stdout | ssh pr.pico.sh pr add --review 16
accept PR:
ssh pr.pico.sh pr accept 16
close PR:
ssh pr.pico.sh pr close 16
Timeline Patchsets
+5 -0 filehandlers/assets/handler.go link
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
diff --git a/filehandlers/assets/handler.go b/filehandlers/assets/handler.go
index 22edce6..1c32d82 100644
--- a/filehandlers/assets/handler.go
+++ b/filehandlers/assets/handler.go
@@ -268,6 +268,11 @@ func (h *UploadAssetHandler) Write(s ssh.Session, entry *utils.FileEntry) (strin
 
 	project := getProject(s)
 	projectName := shared.GetProjectName(entry)
+	err = shared.ValidateProjectName(projectName)
+	if err != nil {
+		return "", err
+	}
+
 	logger = logger.With("project", projectName)
 
 	// find, create, or update project if we haven't already done it
+6 -1 pgs/cli.go link
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/pgs/cli.go b/pgs/cli.go
index 0af5802..8e82241 100644
--- a/pgs/cli.go
+++ b/pgs/cli.go
@@ -374,8 +374,13 @@ func (c *Cmd) unlink(projectName string) error {
 func (c *Cmd) link(projectName, linkTo string) error {
 	c.Log.Info("user running `link` command", "user", c.User.Name, "project", projectName, "link", linkTo)
 
+	err := shared.ValidateProjectName(projectName)
+	if err != nil {
+		return err
+	}
+
 	projectDir := linkTo
-	_, err := c.Dbpool.FindProjectByName(c.User.ID, linkTo)
+	_, err = c.Dbpool.FindProjectByName(c.User.ID, linkTo)
 	if err != nil {
 		e := fmt.Errorf("(%s) project doesn't exist", linkTo)
 		return e
+7 -0 shared/bucket.go link
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
diff --git a/shared/bucket.go b/shared/bucket.go
index 1257b55..4c28d94 100644
--- a/shared/bucket.go
+++ b/shared/bucket.go
@@ -17,6 +17,13 @@ func GetAssetBucketName(userID string) string {
 	return fmt.Sprintf("static-%s", userID)
 }
 
+func ValidateProjectName(projectName string) error {
+	if projectName == "pico-private" {
+		return fmt.Errorf("%s is an invalid project name", projectName)
+	}
+	return nil
+}
+
 func GetProjectName(entry *utils.FileEntry) string {
 	if entry.Mode.IsDir() && strings.Count(entry.Filepath, string(os.PathSeparator)) == 0 {
 		return entry.Filepath