Merge pull request #602 from bmeneguele/fix-fork-findproject

fix project lookup during fork
zaquestion · Feb 25, 2021 · 80edd01 · 80edd01
2 parents fac8ea2 + aafaffb
commit 80edd01
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/internal/gitlab/gitlab.go b/internal/gitlab/gitlab.go
@@ -246,6 +246,14 @@ func Fork(project string, opts *gitlab.ForkProjectOptions, useHTTP bool, wait bo
 	}
 	target, err := FindProject(namespace + name)
 	if err == nil {
+		// Check if it was forked from the same project being requested
+		if target.ForkedFromProject != nil &&
+			target.ForkedFromProject.PathWithNamespace != project {
+			errMsg := fmt.Sprintf("\"%s\" fork name already taken for a different project", name)
+			return "", errors.New(errMsg)
+		}
+
+		// Project already forked and found
 		urlToRepo := target.SSHURLToRepo
 		if useHTTP {
 			urlToRepo = target.HTTPURLToRepo