various fixes

Author: wxiaoguang

routers/web/repo/wiki.go

@@ -93,18 +93,18 @@ func findEntryForFile(commit *git.Commit, target string) (*git.TreeEntry, error)
 }
 
 func findWikiRepoCommit(ctx *context.Context) (*git.Repository, *git.Commit, error) {
-	wikiGitRepo, errCommit := gitrepo.OpenWikiRepository(ctx, ctx.Repo.Repository)
-	if errCommit != nil {
-		ctx.ServerError("OpenRepository", errCommit)
-		return nil, nil, errCommit
+	wikiGitRepo, errGitRepo := gitrepo.OpenWikiRepository(ctx, ctx.Repo.Repository)
+	if errGitRepo != nil {
+		ctx.ServerError("OpenRepository", errGitRepo)
+		return nil, nil, errGitRepo
 	}
 
 	commit, errCommit := wikiGitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultWikiBranch)
 	if git.IsErrNotExist(errCommit) {
 		// if the default branch recorded in database is out of sync, then re-sync it
 		gitRepoDefaultBranch, errBranch := wikiGitRepo.GetDefaultBranch()
 		if errBranch != nil {
-			return wikiGitRepo, nil, errCommit
+			return wikiGitRepo, nil, errBranch
 		}
 		// update the default branch in the database
 		errDb := repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, DefaultWikiBranch: gitRepoDefaultBranch}, "default_wiki_branch")

services/repository/migrate.go

@@ -33,7 +33,7 @@ func cloneWiki(ctx context.Context, u *user_model.User, opts migration.MigrateOp
 	}
 
 	if err := util.RemoveAll(wikiPath); err != nil {
-		return "", fmt.Errorf("failed to remove existingi wiki dir %q, err: %w", wikiPath, err)
+		return "", fmt.Errorf("failed to remove existing wiki dir %q, err: %w", wikiPath, err)
 	}
 
 	cleanIncompleteWikiPath := func() {
@@ -67,7 +67,7 @@ func cloneWiki(ctx context.Context, u *user_model.User, opts migration.MigrateOp
 	defaultBranch, err := wikiRepo.GetDefaultBranch()
 	if err != nil {
 		cleanIncompleteWikiPath()
-		return "", fmt.Errorf("failed to get wiki repo defaul brach for %q, err: %w", wikiPath, err)
+		return "", fmt.Errorf("failed to get wiki repo defaul branch for %q, err: %w", wikiPath, err)
 	}
 
 	return defaultBranch, nil

services/wiki/wiki.go

@@ -360,6 +360,9 @@ func DeleteWiki(ctx context.Context, repo *repo_model.Repository) error {
 }
 
 func ChangeDefaultWikiBranch(ctx context.Context, repo *repo_model.Repository, newBranch string) error {
+	if !git.IsValidRefPattern(newBranch) {
+		return fmt.Errorf("invalid branch name: %s", newBranch)
+	}
 	return db.WithTx(ctx, func(ctx context.Context) error {
 		repo.DefaultWikiBranch = newBranch
 		if err := repo_model.UpdateRepositoryCols(ctx, repo, "default_wiki_branch"); err != nil {