oops

Signed-off-by: Andrew Thornton <art27@cantab.net>

Author: zeripath

services/migrations/common.go

@@ -26,7 +26,7 @@ func hasBaseURL(toCheck, baseURL string) bool {
 	if len(baseURL) > 0 && baseURL[len(baseURL)-1] != '/' {
 		baseURL += "/"
 	}
-	return strings.HasPrefix(toCheck, baseURL+"/")
+	return strings.HasPrefix(toCheck, baseURL)
 }
 
 // CheckAndEnsureSafePR will check that a give PR is safe
@@ -35,15 +35,15 @@ func CheckAndEnsureSafePR(pr *base.PullRequest, commonCloneBaseURL string, g bas
 	// SECURITY: the patchURL must be checked to have the same baseURL as the current to prevent open redirect
 	if pr.PatchURL != "" && !hasBaseURL(pr.PatchURL, commonCloneBaseURL) {
 		// TODO: Should we check that this url has the expected format for a patch url?
-		WarnAndNotice("PR #%d in %s has invalid PatchURL: %s", pr.Number, g, pr.PatchURL)
+		WarnAndNotice("PR #%d in %s has invalid PatchURL: %s baseURL: %s", pr.Number, g, pr.PatchURL, commonCloneBaseURL)
 		pr.PatchURL = ""
 		valid = false
 	}
 
 	// SECURITY: the headCloneURL must be checked to have the same baseURL as the current to prevent open redirect
 	if pr.Head.CloneURL != "" && !hasBaseURL(pr.Head.CloneURL, commonCloneBaseURL) {
 		// TODO: Should we check that this url has the expected format for a patch url?
-		WarnAndNotice("PR #%d in %s has invalid HeadCloneURL: %s", pr.Number, g, pr.Head.CloneURL)
+		WarnAndNotice("PR #%d in %s has invalid HeadCloneURL: %s baseURL: %s", pr.Number, g, pr.Head.CloneURL, commonCloneBaseURL)
 		pr.Head.CloneURL = ""
 		valid = false
 	}