* Use correct variable name. * doer is never nil here. * Use status code constants. * Replaced generic map with concrete struct. * Fixed windows lint. * Removed unused method. * Changed error codes. Co-authored-by: techknowlogick <techknowlogick@gitea.io>tags/v1.15.0-rc1
@@ -179,7 +179,7 @@ Gitea or set your environment appropriately.`, "") | |||
GitObjectDirectory: os.Getenv(private.GitObjectDirectory), | |||
GitQuarantinePath: os.Getenv(private.GitQuarantinePath), | |||
GitPushOptions: pushOptions(), | |||
ProtectedBranchID: prID, | |||
PullRequestID: prID, | |||
IsDeployKey: isDeployKey, | |||
} | |||
@@ -362,11 +362,7 @@ func (repo *Repository) GetBranchProtection(branchName string) (*ProtectedBranch | |||
} | |||
// IsProtectedBranch checks if branch is protected | |||
func (repo *Repository) IsProtectedBranch(branchName string, doer *User) (bool, error) { | |||
if doer == nil { | |||
return true, nil | |||
} | |||
func (repo *Repository) IsProtectedBranch(branchName string) (bool, error) { | |||
protectedBranch := &ProtectedBranch{ | |||
RepoID: repo.ID, | |||
BranchName: branchName, | |||
@@ -379,27 +375,6 @@ func (repo *Repository) IsProtectedBranch(branchName string, doer *User) (bool, | |||
return has, nil | |||
} | |||
// IsProtectedBranchForPush checks if branch is protected for push | |||
func (repo *Repository) IsProtectedBranchForPush(branchName string, doer *User) (bool, error) { | |||
if doer == nil { | |||
return true, nil | |||
} | |||
protectedBranch := &ProtectedBranch{ | |||
RepoID: repo.ID, | |||
BranchName: branchName, | |||
} | |||
has, err := x.Get(protectedBranch) | |||
if err != nil { | |||
return true, err | |||
} else if has { | |||
return !protectedBranch.CanUserPush(doer.ID), nil | |||
} | |||
return false, nil | |||
} | |||
// updateApprovalWhitelist checks whether the user whitelist changed and returns a whitelist with | |||
// the users from newWhitelist which have explicit read or write access to the repo. | |||
func updateApprovalWhitelist(repo *Repository, currentWhitelist, newWhitelist []int64) (whitelist []int64, err error) { |
@@ -54,7 +54,7 @@ type HookOptions struct { | |||
GitAlternativeObjectDirectories string | |||
GitQuarantinePath string | |||
GitPushOptions GitPushOptions | |||
ProtectedBranchID int64 | |||
PullRequestID int64 | |||
IsDeployKey bool | |||
} | |||
@@ -58,7 +58,6 @@ type ServCommandResults struct { | |||
// ErrServCommand is an error returned from ServCommmand. | |||
type ErrServCommand struct { | |||
Results ServCommandResults | |||
Type string | |||
Err string | |||
StatusCode int | |||
} |
@@ -124,8 +124,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName) | |||
if err != nil { | |||
log.Error("Unable to get repository: %s/%s Error: %v", ownerName, repoName, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -133,8 +133,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
gitRepo, err := git.OpenRepository(repo.RepoPath()) | |||
if err != nil { | |||
log.Error("Unable to get git repository for: %s/%s Error: %v", ownerName, repoName, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -164,8 +164,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
branchName := strings.TrimPrefix(refFullName, git.BranchPrefix) | |||
if branchName == repo.DefaultBranch && newCommitID == git.EmptySHA { | |||
log.Warn("Forbidden: Branch: %s is the default branch in %-v and cannot be deleted", branchName, repo) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("branch %s is the default branch and cannot be deleted", branchName), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("branch %s is the default branch and cannot be deleted", branchName), | |||
}) | |||
return | |||
} | |||
@@ -173,8 +173,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
protectBranch, err := models.GetProtectedBranchBy(repo.ID, branchName) | |||
if err != nil { | |||
log.Error("Unable to get protected branch: %s in %-v Error: %v", branchName, repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -191,8 +191,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
// 1. Detect and prevent deletion of the branch | |||
if newCommitID == git.EmptySHA { | |||
log.Warn("Forbidden: Branch: %s in %-v is protected from deletion", branchName, repo) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("branch %s is protected from deletion", branchName), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("branch %s is protected from deletion", branchName), | |||
}) | |||
return | |||
} | |||
@@ -202,14 +202,14 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
output, err := git.NewCommand("rev-list", "--max-count=1", oldCommitID, "^"+newCommitID).RunInDirWithEnv(repo.RepoPath(), env) | |||
if err != nil { | |||
log.Error("Unable to detect force push between: %s and %s in %-v Error: %v", oldCommitID, newCommitID, repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Fail to detect force push: %v", err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Fail to detect force push: %v", err), | |||
}) | |||
return | |||
} else if len(output) > 0 { | |||
log.Warn("Forbidden: Branch: %s in %-v is protected from force push", branchName, repo) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("branch %s is protected from force push", branchName), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("branch %s is protected from force push", branchName), | |||
}) | |||
return | |||
@@ -222,15 +222,15 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
if err != nil { | |||
if !isErrUnverifiedCommit(err) { | |||
log.Error("Unable to check commits from %s to %s in %-v: %v", oldCommitID, newCommitID, repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Unable to check commits from %s to %s: %v", oldCommitID, newCommitID, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to check commits from %s to %s: %v", oldCommitID, newCommitID, err), | |||
}) | |||
return | |||
} | |||
unverifiedCommit := err.(*errUnverifiedCommit).sha | |||
log.Warn("Forbidden: Branch: %s in %-v is protected from unverified commit %s", branchName, repo, unverifiedCommit) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("branch %s is protected from unverified commit %s", branchName, unverifiedCommit), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("branch %s is protected from unverified commit %s", branchName, unverifiedCommit), | |||
}) | |||
return | |||
} | |||
@@ -248,8 +248,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
if err != nil { | |||
if !models.IsErrFilePathProtected(err) { | |||
log.Error("Unable to check file protection for commits from %s to %s in %-v: %v", oldCommitID, newCommitID, repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Unable to check file protection for commits from %s to %s: %v", oldCommitID, newCommitID, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to check file protection for commits from %s to %s: %v", oldCommitID, newCommitID, err), | |||
}) | |||
return | |||
} | |||
@@ -270,49 +270,49 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
// 6. If we're not allowed to push directly | |||
if !canPush { | |||
// Is this is a merge from the UI/API? | |||
if opts.ProtectedBranchID == 0 { | |||
if opts.PullRequestID == 0 { | |||
// 6a. If we're not merging from the UI/API then there are two ways we got here: | |||
// | |||
// We are changing a protected file and we're not allowed to do that | |||
if changedProtectedfiles { | |||
log.Warn("Forbidden: Branch: %s in %-v is protected from changing file %s", branchName, repo, protectedFilePath) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("branch %s is protected from changing file %s", branchName, protectedFilePath), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("branch %s is protected from changing file %s", branchName, protectedFilePath), | |||
}) | |||
return | |||
} | |||
// Or we're simply not able to push to this protected branch | |||
log.Warn("Forbidden: User %d is not allowed to push to protected branch: %s in %-v", opts.UserID, branchName, repo) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("Not allowed to push to protected branch %s", branchName), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("Not allowed to push to protected branch %s", branchName), | |||
}) | |||
return | |||
} | |||
// 6b. Merge (from UI or API) | |||
// Get the PR, user and permissions for the user in the repository | |||
pr, err := models.GetPullRequestByID(opts.ProtectedBranchID) | |||
pr, err := models.GetPullRequestByID(opts.PullRequestID) | |||
if err != nil { | |||
log.Error("Unable to get PullRequest %d Error: %v", opts.ProtectedBranchID, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Unable to get PullRequest %d Error: %v", opts.ProtectedBranchID, err), | |||
log.Error("Unable to get PullRequest %d Error: %v", opts.PullRequestID, err) | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to get PullRequest %d Error: %v", opts.PullRequestID, err), | |||
}) | |||
return | |||
} | |||
user, err := models.GetUserByID(opts.UserID) | |||
if err != nil { | |||
log.Error("Unable to get User id %d Error: %v", opts.UserID, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Unable to get User id %d Error: %v", opts.UserID, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to get User id %d Error: %v", opts.UserID, err), | |||
}) | |||
return | |||
} | |||
perm, err := models.GetUserRepoPermission(repo, user) | |||
if err != nil { | |||
log.Error("Unable to get Repo permission of repo %s/%s of User %s", repo.OwnerName, repo.Name, user.Name, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Unable to get Repo permission of repo %s/%s of User %s: %v", repo.OwnerName, repo.Name, user.Name, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to get Repo permission of repo %s/%s of User %s: %v", repo.OwnerName, repo.Name, user.Name, err), | |||
}) | |||
return | |||
} | |||
@@ -321,16 +321,16 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
allowedMerge, err := pull_service.IsUserAllowedToMerge(pr, perm, user) | |||
if err != nil { | |||
log.Error("Error calculating if allowed to merge: %v", err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Error calculating if allowed to merge: %v", err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Error calculating if allowed to merge: %v", err), | |||
}) | |||
return | |||
} | |||
if !allowedMerge { | |||
log.Warn("Forbidden: User %d is not allowed to push to protected branch: %s in %-v and is not allowed to merge pr #%d", opts.UserID, branchName, repo, pr.Index) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("Not allowed to push to protected branch %s", branchName), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("Not allowed to push to protected branch %s", branchName), | |||
}) | |||
return | |||
} | |||
@@ -343,8 +343,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
// Now if we're not an admin - we can't overwrite protected files so fail now | |||
if changedProtectedfiles { | |||
log.Warn("Forbidden: Branch: %s in %-v is protected from changing file %s", branchName, repo, protectedFilePath) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("branch %s is protected from changing file %s", branchName, protectedFilePath), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("branch %s is protected from changing file %s", branchName, protectedFilePath), | |||
}) | |||
return | |||
} | |||
@@ -353,14 +353,14 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { | |||
if err := pull_service.CheckPRReadyToMerge(pr, true); err != nil { | |||
if models.IsErrNotAllowedToMerge(err) { | |||
log.Warn("Forbidden: User %d is not allowed push to protected branch %s in %-v and pr #%d is not ready to be merged: %s", opts.UserID, branchName, repo, pr.Index, err.Error()) | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": fmt.Sprintf("Not allowed to push to protected branch %s and pr #%d is not ready to be merged: %s", branchName, opts.ProtectedBranchID, err.Error()), | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: fmt.Sprintf("Not allowed to push to protected branch %s and pr #%d is not ready to be merged: %s", branchName, opts.PullRequestID, err.Error()), | |||
}) | |||
return | |||
} | |||
log.Error("Unable to check if mergable: protected branch %s in %-v and pr #%d. Error: %v", opts.UserID, branchName, repo, pr.Index, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Unable to get status of pull request %d. Error: %v", opts.ProtectedBranchID, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to get status of pull request %d. Error: %v", opts.PullRequestID, err), | |||
}) | |||
return | |||
} | |||
@@ -549,8 +549,8 @@ func SetDefaultBranch(ctx *gitea_context.PrivateContext) { | |||
repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName) | |||
if err != nil { | |||
log.Error("Failed to get repository: %s/%s Error: %v", ownerName, repoName, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"Err": fmt.Sprintf("Failed to get repository: %s/%s Error: %v", ownerName, repoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Failed to get repository: %s/%s Error: %v", ownerName, repoName, err), | |||
}) | |||
return | |||
} | |||
@@ -561,16 +561,16 @@ func SetDefaultBranch(ctx *gitea_context.PrivateContext) { | |||
repo.DefaultBranch = branch | |||
gitRepo, err := git.OpenRepository(repo.RepoPath()) | |||
if err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"Err": fmt.Sprintf("Failed to get git repository: %s/%s Error: %v", ownerName, repoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Failed to get git repository: %s/%s Error: %v", ownerName, repoName, err), | |||
}) | |||
return | |||
} | |||
if err := gitRepo.SetDefaultBranch(repo.DefaultBranch); err != nil { | |||
if !git.IsErrUnsupportedVersion(err) { | |||
gitRepo.Close() | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"Err": fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err), | |||
}) | |||
return | |||
} | |||
@@ -578,10 +578,10 @@ func SetDefaultBranch(ctx *gitea_context.PrivateContext) { | |||
gitRepo.Close() | |||
if err := repo.UpdateDefaultBranch(); err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"Err": fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err), | |||
}) | |||
return | |||
} | |||
ctx.PlainText(200, []byte("success")) | |||
ctx.PlainText(http.StatusOK, []byte("success")) | |||
} |
@@ -10,6 +10,7 @@ import ( | |||
"code.gitea.io/gitea/models" | |||
"code.gitea.io/gitea/modules/context" | |||
"code.gitea.io/gitea/modules/private" | |||
"code.gitea.io/gitea/modules/timeutil" | |||
) | |||
@@ -18,8 +19,8 @@ func UpdatePublicKeyInRepo(ctx *context.PrivateContext) { | |||
keyID := ctx.ParamsInt64(":id") | |||
repoID := ctx.ParamsInt64(":repoid") | |||
if err := models.UpdatePublicKeyUpdated(keyID); err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -27,18 +28,18 @@ func UpdatePublicKeyInRepo(ctx *context.PrivateContext) { | |||
deployKey, err := models.GetDeployKeyByRepo(keyID, repoID) | |||
if err != nil { | |||
if models.IsErrDeployKeyNotExist(err) { | |||
ctx.PlainText(200, []byte("success")) | |||
ctx.PlainText(http.StatusOK, []byte("success")) | |||
return | |||
} | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
deployKey.UpdatedUnix = timeutil.TimeStampNow() | |||
if err = models.UpdateDeployKeyCols(deployKey, "updated_unix"); err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -53,8 +54,8 @@ func AuthorizedPublicKeyByContent(ctx *context.PrivateContext) { | |||
publicKey, err := models.SearchPublicKeyByContent(content) | |||
if err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} |
@@ -23,8 +23,8 @@ import ( | |||
// It doesn't wait before each message will be processed | |||
func SendEmail(ctx *context.PrivateContext) { | |||
if setting.MailService == nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": "Mail service is not enabled.", | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: "Mail service is not enabled.", | |||
}) | |||
return | |||
} | |||
@@ -35,8 +35,8 @@ func SendEmail(ctx *context.PrivateContext) { | |||
json := jsoniter.ConfigCompatibleWithStandardLibrary | |||
if err := json.NewDecoder(rd).Decode(&mail); err != nil { | |||
log.Error("%v", err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err, | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -48,8 +48,8 @@ func SendEmail(ctx *context.PrivateContext) { | |||
if err != nil { | |||
err := fmt.Sprintf("Failed to get user information: %v", err) | |||
log.Error(err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err, | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err, | |||
}) | |||
return | |||
} | |||
@@ -68,8 +68,8 @@ func SendEmail(ctx *context.PrivateContext) { | |||
if err != nil { | |||
err := fmt.Sprintf("Failed to find users: %v", err) | |||
log.Error(err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err, | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err, | |||
}) | |||
return | |||
} |
@@ -30,15 +30,15 @@ func FlushQueues(ctx *context.PrivateContext) { | |||
log.Error("Flushing request timed-out with error: %v", err) | |||
} | |||
}() | |||
ctx.JSON(http.StatusAccepted, map[string]interface{}{ | |||
"err": "Flushing", | |||
ctx.JSON(http.StatusAccepted, private.Response{ | |||
Err: "Flushing", | |||
}) | |||
return | |||
} | |||
err := queue.GetManager().FlushAll(ctx, opts.Timeout) | |||
if err != nil { | |||
ctx.JSON(http.StatusRequestTimeout, map[string]interface{}{ | |||
"err": fmt.Sprintf("%v", err), | |||
ctx.JSON(http.StatusRequestTimeout, private.Response{ | |||
Err: fmt.Sprintf("%v", err), | |||
}) | |||
} | |||
ctx.PlainText(http.StatusOK, []byte("success")) | |||
@@ -59,8 +59,8 @@ func ResumeLogging(ctx *context.PrivateContext) { | |||
// ReleaseReopenLogging releases and reopens logging files | |||
func ReleaseReopenLogging(ctx *context.PrivateContext) { | |||
if err := log.ReleaseReopen(); err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Error during release and reopen: %v", err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Error during release and reopen: %v", err), | |||
}) | |||
return | |||
} | |||
@@ -73,8 +73,8 @@ func RemoveLogger(ctx *context.PrivateContext) { | |||
name := ctx.Params("name") | |||
ok, err := log.GetLogger(group).DelLogger(name) | |||
if err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Failed to remove logger: %s %s %v", group, name, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Failed to remove logger: %s %s %v", group, name, err), | |||
}) | |||
return | |||
} | |||
@@ -134,8 +134,8 @@ func AddLogger(ctx *context.PrivateContext) { | |||
byteConfig, err := json.Marshal(opts.Config) | |||
if err != nil { | |||
log.Error("Failed to marshal log configuration: %v %v", opts.Config, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Failed to marshal log configuration: %v %v", opts.Config, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Failed to marshal log configuration: %v %v", opts.Config, err), | |||
}) | |||
return | |||
} | |||
@@ -143,8 +143,8 @@ func AddLogger(ctx *context.PrivateContext) { | |||
if err := log.NewNamedLogger(opts.Group, bufferLen, opts.Name, opts.Mode, config); err != nil { | |||
log.Error("Failed to create new named logger: %s %v", config, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": fmt.Sprintf("Failed to create new named logger: %s %v", config, err), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: fmt.Sprintf("Failed to create new named logger: %s %v", config, err), | |||
}) | |||
return | |||
} |
@@ -11,12 +11,13 @@ import ( | |||
"code.gitea.io/gitea/modules/context" | |||
"code.gitea.io/gitea/modules/graceful" | |||
"code.gitea.io/gitea/modules/private" | |||
) | |||
// Restart is not implemented for Windows based servers as they can't fork | |||
func Restart(ctx *context.PrivateContext) { | |||
ctx.JSON(http.StatusNotImplemented, map[string]interface{}{ | |||
"err": "windows servers cannot be gracefully restarted - shutdown and restart manually", | |||
ctx.JSON(http.StatusNotImplemented, private.Response{ | |||
Err: "windows servers cannot be gracefully restarted - shutdown and restart manually", | |||
}) | |||
} | |||
@@ -6,9 +6,11 @@ package private | |||
import ( | |||
"io/ioutil" | |||
"net/http" | |||
myCtx "code.gitea.io/gitea/modules/context" | |||
"code.gitea.io/gitea/modules/migrations" | |||
"code.gitea.io/gitea/modules/private" | |||
jsoniter "github.com/json-iterator/go" | |||
) | |||
@@ -17,8 +19,8 @@ func RestoreRepo(ctx *myCtx.PrivateContext) { | |||
json := jsoniter.ConfigCompatibleWithStandardLibrary | |||
bs, err := ioutil.ReadAll(ctx.Req.Body) | |||
if err != nil { | |||
ctx.JSON(500, map[string]string{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -29,8 +31,8 @@ func RestoreRepo(ctx *myCtx.PrivateContext) { | |||
Units []string | |||
}{} | |||
if err = json.Unmarshal(bs, ¶ms); err != nil { | |||
ctx.JSON(500, map[string]string{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -42,10 +44,10 @@ func RestoreRepo(ctx *myCtx.PrivateContext) { | |||
params.RepoName, | |||
params.Units, | |||
); err != nil { | |||
ctx.JSON(500, map[string]string{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
} else { | |||
ctx.Status(200) | |||
ctx.Status(http.StatusOK) | |||
} | |||
} |
@@ -23,8 +23,8 @@ import ( | |||
func ServNoCommand(ctx *context.PrivateContext) { | |||
keyID := ctx.ParamsInt64(":keyid") | |||
if keyID <= 0 { | |||
ctx.JSON(http.StatusBadRequest, map[string]interface{}{ | |||
"err": fmt.Sprintf("Bad key id: %d", keyID), | |||
ctx.JSON(http.StatusBadRequest, private.Response{ | |||
Err: fmt.Sprintf("Bad key id: %d", keyID), | |||
}) | |||
} | |||
results := private.KeyAndOwner{} | |||
@@ -32,14 +32,14 @@ func ServNoCommand(ctx *context.PrivateContext) { | |||
key, err := models.GetPublicKeyByID(keyID) | |||
if err != nil { | |||
if models.IsErrKeyNotExist(err) { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"err": fmt.Sprintf("Cannot find key: %d", keyID), | |||
ctx.JSON(http.StatusUnauthorized, private.Response{ | |||
Err: fmt.Sprintf("Cannot find key: %d", keyID), | |||
}) | |||
return | |||
} | |||
log.Error("Unable to get public key: %d Error: %v", keyID, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
@@ -49,20 +49,20 @@ func ServNoCommand(ctx *context.PrivateContext) { | |||
user, err := models.GetUserByID(key.OwnerID) | |||
if err != nil { | |||
if models.IsErrUserNotExist(err) { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"err": fmt.Sprintf("Cannot find owner with id: %d for key: %d", key.OwnerID, keyID), | |||
ctx.JSON(http.StatusUnauthorized, private.Response{ | |||
Err: fmt.Sprintf("Cannot find owner with id: %d for key: %d", key.OwnerID, keyID), | |||
}) | |||
return | |||
} | |||
log.Error("Unable to get owner with id: %d for public key: %d Error: %v", key.OwnerID, keyID, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"err": err.Error(), | |||
ctx.JSON(http.StatusInternalServerError, private.Response{ | |||
Err: err.Error(), | |||
}) | |||
return | |||
} | |||
if !user.IsActive || user.ProhibitLogin { | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": "Your account is disabled.", | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: "Your account is disabled.", | |||
}) | |||
return | |||
} | |||
@@ -106,18 +106,16 @@ func ServCommand(ctx *context.PrivateContext) { | |||
owner, err := models.GetUserByName(results.OwnerName) | |||
if err != nil { | |||
log.Error("Unable to get repository owner: %s/%s Error: %v", results.OwnerName, results.RepoName, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Unable to get repository owner: %s/%s %v", results.OwnerName, results.RepoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Unable to get repository owner: %s/%s %v", results.OwnerName, results.RepoName, err), | |||
}) | |||
return | |||
} | |||
if !owner.IsOrganization() && !owner.IsActive { | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"results": results, | |||
"type": "ForbiddenError", | |||
"err": "Repository cannot be accessed, you could retry it later", | |||
ctx.JSON(http.StatusForbidden, private.ErrServCommand{ | |||
Results: results, | |||
Err: "Repository cannot be accessed, you could retry it later", | |||
}) | |||
return | |||
} | |||
@@ -132,20 +130,18 @@ func ServCommand(ctx *context.PrivateContext) { | |||
if "git-upload-pack" == verb { | |||
// User is fetching/cloning a non-existent repository | |||
log.Error("Failed authentication attempt (cannot find repository: %s/%s) from %s", results.OwnerName, results.RepoName, ctx.RemoteAddr()) | |||
ctx.JSON(http.StatusNotFound, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrRepoNotExist", | |||
"err": fmt.Sprintf("Cannot find repository: %s/%s", results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusNotFound, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Cannot find repository: %s/%s", results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
} | |||
} else { | |||
log.Error("Unable to get repository: %s/%s Error: %v", results.OwnerName, results.RepoName, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Unable to get repository: %s/%s %v", results.OwnerName, results.RepoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Unable to get repository: %s/%s %v", results.OwnerName, results.RepoName, err), | |||
}) | |||
return | |||
} | |||
@@ -157,20 +153,18 @@ func ServCommand(ctx *context.PrivateContext) { | |||
results.RepoID = repo.ID | |||
if repo.IsBeingCreated() { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": "Repository is being created, you could retry after it finished", | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: "Repository is being created, you could retry after it finished", | |||
}) | |||
return | |||
} | |||
// We can shortcut at this point if the repo is a mirror | |||
if mode > models.AccessModeRead && repo.IsMirror { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrMirrorReadOnly", | |||
"err": fmt.Sprintf("Mirror Repository %s/%s is read-only", results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusForbidden, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Mirror Repository %s/%s is read-only", results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
@@ -180,18 +174,16 @@ func ServCommand(ctx *context.PrivateContext) { | |||
key, err := models.GetPublicKeyByID(keyID) | |||
if err != nil { | |||
if models.IsErrKeyNotExist(err) { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrKeyNotExist", | |||
"err": fmt.Sprintf("Cannot find key: %d", keyID), | |||
ctx.JSON(http.StatusNotFound, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Cannot find key: %d", keyID), | |||
}) | |||
return | |||
} | |||
log.Error("Unable to get public key: %d Error: %v", keyID, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Unable to get key: %d Error: %v", keyID, err), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Unable to get key: %d Error: %v", keyID, err), | |||
}) | |||
return | |||
} | |||
@@ -201,10 +193,9 @@ func ServCommand(ctx *context.PrivateContext) { | |||
// If repo doesn't exist, deploy key doesn't make sense | |||
if !repoExist && key.Type == models.KeyTypeDeploy { | |||
ctx.JSON(http.StatusNotFound, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrRepoNotExist", | |||
"err": fmt.Sprintf("Cannot find repository %s/%s", results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusNotFound, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Cannot find repository %s/%s", results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
@@ -221,18 +212,16 @@ func ServCommand(ctx *context.PrivateContext) { | |||
deployKey, err = models.GetDeployKeyByRepo(key.ID, repo.ID) | |||
if err != nil { | |||
if models.IsErrDeployKeyNotExist(err) { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrDeployKeyNotExist", | |||
"err": fmt.Sprintf("Public (Deploy) Key: %d:%s is not authorized to %s %s/%s.", key.ID, key.Name, modeString, results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusNotFound, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Public (Deploy) Key: %d:%s is not authorized to %s %s/%s.", key.ID, key.Name, modeString, results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
log.Error("Unable to get deploy for public (deploy) key: %d in %-v Error: %v", key.ID, repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Unable to get Deploy Key for Public Key: %d:%s in %s/%s.", key.ID, key.Name, results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Unable to get Deploy Key for Public Key: %d:%s in %s/%s.", key.ID, key.Name, results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
@@ -252,25 +241,23 @@ func ServCommand(ctx *context.PrivateContext) { | |||
user, err = models.GetUserByID(key.OwnerID) | |||
if err != nil { | |||
if models.IsErrUserNotExist(err) { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrUserNotExist", | |||
"err": fmt.Sprintf("Public Key: %d:%s owner %d does not exist.", key.ID, key.Name, key.OwnerID), | |||
ctx.JSON(http.StatusUnauthorized, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Public Key: %d:%s owner %d does not exist.", key.ID, key.Name, key.OwnerID), | |||
}) | |||
return | |||
} | |||
log.Error("Unable to get owner: %d for public key: %d:%s Error: %v", key.OwnerID, key.ID, key.Name, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Unable to get Owner: %d for Deploy Key: %d:%s in %s/%s.", key.OwnerID, key.ID, key.Name, ownerName, repoName), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Unable to get Owner: %d for Deploy Key: %d:%s in %s/%s.", key.OwnerID, key.ID, key.Name, ownerName, repoName), | |||
}) | |||
return | |||
} | |||
if !user.IsActive || user.ProhibitLogin { | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"err": "Your account is disabled.", | |||
ctx.JSON(http.StatusForbidden, private.Response{ | |||
Err: "Your account is disabled.", | |||
}) | |||
return | |||
} | |||
@@ -283,10 +270,9 @@ func ServCommand(ctx *context.PrivateContext) { | |||
// Don't allow pushing if the repo is archived | |||
if repoExist && mode > models.AccessModeRead && repo.IsArchived { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrRepoIsArchived", | |||
"err": fmt.Sprintf("Repo: %s/%s is archived.", results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusUnauthorized, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Repo: %s/%s is archived.", results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
@@ -295,10 +281,9 @@ func ServCommand(ctx *context.PrivateContext) { | |||
if repoExist && (mode > models.AccessModeRead || repo.IsPrivate || setting.Service.RequireSignInView) { | |||
if key.Type == models.KeyTypeDeploy { | |||
if deployKey.Mode < mode { | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrUnauthorized", | |||
"err": fmt.Sprintf("Deploy Key: %d:%s is not authorized to %s %s/%s.", key.ID, key.Name, modeString, results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusUnauthorized, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Deploy Key: %d:%s is not authorized to %s %s/%s.", key.ID, key.Name, modeString, results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
@@ -306,10 +291,9 @@ func ServCommand(ctx *context.PrivateContext) { | |||
perm, err := models.GetUserRepoPermission(repo, user) | |||
if err != nil { | |||
log.Error("Unable to get permissions for %-v with key %d in %-v Error: %v", user, key.ID, repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Unable to get permissions for user %d:%s with key %d in %s/%s Error: %v", user.ID, user.Name, key.ID, results.OwnerName, results.RepoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Unable to get permissions for user %d:%s with key %d in %s/%s Error: %v", user.ID, user.Name, key.ID, results.OwnerName, results.RepoName, err), | |||
}) | |||
return | |||
} | |||
@@ -318,10 +302,9 @@ func ServCommand(ctx *context.PrivateContext) { | |||
if userMode < mode { | |||
log.Error("Failed authentication attempt for %s with key %s (not authorized to %s %s/%s) from %s", user.Name, key.Name, modeString, ownerName, repoName, ctx.RemoteAddr()) | |||
ctx.JSON(http.StatusUnauthorized, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrUnauthorized", | |||
"err": fmt.Sprintf("User: %d:%s with Key: %d:%s is not authorized to %s %s/%s.", user.ID, user.Name, key.ID, key.Name, modeString, ownerName, repoName), | |||
ctx.JSON(http.StatusUnauthorized, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("User: %d:%s with Key: %d:%s is not authorized to %s %s/%s.", user.ID, user.Name, key.ID, key.Name, modeString, ownerName, repoName), | |||
}) | |||
return | |||
} | |||
@@ -332,27 +315,24 @@ func ServCommand(ctx *context.PrivateContext) { | |||
if !repoExist { | |||
owner, err := models.GetUserByName(ownerName) | |||
if err != nil { | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Unable to get owner: %s %v", results.OwnerName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Unable to get owner: %s %v", results.OwnerName, err), | |||
}) | |||
return | |||
} | |||
if owner.IsOrganization() && !setting.Repository.EnablePushCreateOrg { | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrForbidden", | |||
"err": "Push to create is not enabled for organizations.", | |||
ctx.JSON(http.StatusForbidden, private.ErrServCommand{ | |||
Results: results, | |||
Err: "Push to create is not enabled for organizations.", | |||
}) | |||
return | |||
} | |||
if !owner.IsOrganization() && !setting.Repository.EnablePushCreateUser { | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrForbidden", | |||
"err": "Push to create is not enabled for users.", | |||
ctx.JSON(http.StatusForbidden, private.ErrServCommand{ | |||
Results: results, | |||
Err: "Push to create is not enabled for users.", | |||
}) | |||
return | |||
} | |||
@@ -360,10 +340,9 @@ func ServCommand(ctx *context.PrivateContext) { | |||
repo, err = repo_service.PushCreateRepo(user, owner, results.RepoName) | |||
if err != nil { | |||
log.Error("pushCreateRepo: %v", err) | |||
ctx.JSON(http.StatusNotFound, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrRepoNotExist", | |||
"err": fmt.Sprintf("Cannot find repository: %s/%s", results.OwnerName, results.RepoName), | |||
ctx.JSON(http.StatusNotFound, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Cannot find repository: %s/%s", results.OwnerName, results.RepoName), | |||
}) | |||
return | |||
} | |||
@@ -374,18 +353,16 @@ func ServCommand(ctx *context.PrivateContext) { | |||
// Ensure the wiki is enabled before we allow access to it | |||
if _, err := repo.GetUnit(models.UnitTypeWiki); err != nil { | |||
if models.IsErrUnitTypeNotExist(err) { | |||
ctx.JSON(http.StatusForbidden, map[string]interface{}{ | |||
"results": results, | |||
"type": "ErrForbidden", | |||
"err": "repository wiki is disabled", | |||
ctx.JSON(http.StatusForbidden, private.ErrServCommand{ | |||
Results: results, | |||
Err: "repository wiki is disabled", | |||
}) | |||
return | |||
} | |||
log.Error("Failed to get the wiki unit in %-v Error: %v", repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Failed to get the wiki unit in %s/%s Error: %v", ownerName, repoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Failed to get the wiki unit in %s/%s Error: %v", ownerName, repoName, err), | |||
}) | |||
return | |||
} | |||
@@ -393,10 +370,9 @@ func ServCommand(ctx *context.PrivateContext) { | |||
// Finally if we're trying to touch the wiki we should init it | |||
if err = wiki_service.InitWiki(repo); err != nil { | |||
log.Error("Failed to initialize the wiki in %-v Error: %v", repo, err) | |||
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ | |||
"results": results, | |||
"type": "InternalServerError", | |||
"err": fmt.Sprintf("Failed to initialize the wiki in %s/%s Error: %v", ownerName, repoName, err), | |||
ctx.JSON(http.StatusInternalServerError, private.ErrServCommand{ | |||
Results: results, | |||
Err: fmt.Sprintf("Failed to initialize the wiki in %s/%s Error: %v", ownerName, repoName, err), | |||
}) | |||
return | |||
} |
@@ -1461,7 +1461,7 @@ func ViewIssue(ctx *context.Context) { | |||
} | |||
if perm.CanWrite(models.UnitTypeCode) { | |||
// Check if branch is not protected | |||
if protected, err := pull.HeadRepo.IsProtectedBranch(pull.HeadBranch, ctx.User); err != nil { | |||
if protected, err := pull.HeadRepo.IsProtectedBranch(pull.HeadBranch); err != nil { | |||
log.Error("IsProtectedBranch: %v", err) | |||
} else if !protected { | |||
canDelete = true |
@@ -26,7 +26,7 @@ func DeleteBranch(doer *models.User, repo *models.Repository, gitRepo *git.Repos | |||
return ErrBranchIsDefault | |||
} | |||
isProtected, err := repo.IsProtectedBranch(branchName, doer) | |||
isProtected, err := repo.IsProtectedBranch(branchName) | |||
if err != nil { | |||
return err | |||
} |