mirror of
				https://gitcode.com/gitea/gitea.git
				synced 2025-10-30 07:59:37 +08:00 
			
		
		
		
	 f4538791f5
			
		
	
	f4538791f5
	
	
	
		
			
			# Why this PR comes At first, I'd like to help users like #23636 (there are a lot) The unclear "Internal Server Error" is quite anonying, scare users, frustrate contributors, nobody knows what happens. So, it's always good to provide meaningful messages to end users (of course, do not leak sensitive information). When I started working on the "response message to end users", I found that the related code has a lot of technical debt. A lot of copy&paste code, unclear fields and usages. So I think it's good to make everything clear. # Tech Backgrounds Gitea has many sub-commands, some are used by admins, some are used by SSH servers or Git Hooks. Many sub-commands use "internal API" to communicate with Gitea web server. Before, Gitea server always use `StatusCode + Json "err" field` to return messages. * The CLI sub-commands: they expect to show all error related messages to site admin * The Serv/Hook sub-commands (for git clients): they could only show safe messages to end users, the error log could only be recorded by "SSHLog" to Gitea web server. In the old design, it assumes that: * If the StatusCode is 500 (in some functions), then the "err" field is error log, shouldn't be exposed to git client. * If the StatusCode is 40x, then the "err" field could be exposed. And some functions always read the "err" no matter what the StatusCode is. The old code is not strict, and it's difficult to distinguish the messages clearly and then output them correctly. # This PR To help to remove duplicate code and make everything clear, this PR introduces `ResponseExtra` and `requestJSONResp`. * `ResponseExtra` is a struct which contains "extra" information of a internal API response, including StatusCode, UserMsg, Error * `requestJSONResp` is a generic function which can be used for all cases to help to simplify the calls. * Remove all `map["err"]`, always use `private.Response{Err}` to construct error messages. * User messages and error messages are separated clearly, the `fail` and `handleCliResponseExtra` will output correct messages. * Replace all `Internal Server Error` messages with meaningful (still safe) messages. This PR saves more than 300 lines, while makes the git client messages more clear. Many gitea-serv/git-hook related essential functions are covered by tests. --------- Co-authored-by: delvh <dev.lh@web.de>
		
			
				
	
	
		
			142 lines
		
	
	
		
			4.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			142 lines
		
	
	
		
			4.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2019 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package private
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"fmt"
 | |
| 	"net/url"
 | |
| 	"strconv"
 | |
| 	"time"
 | |
| 
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| )
 | |
| 
 | |
| // Git environment variables
 | |
| const (
 | |
| 	GitAlternativeObjectDirectories = "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 | |
| 	GitObjectDirectory              = "GIT_OBJECT_DIRECTORY"
 | |
| 	GitQuarantinePath               = "GIT_QUARANTINE_PATH"
 | |
| 	GitPushOptionCount              = "GIT_PUSH_OPTION_COUNT"
 | |
| )
 | |
| 
 | |
| // GitPushOptions is a wrapper around a map[string]string
 | |
| type GitPushOptions map[string]string
 | |
| 
 | |
| // GitPushOptions keys
 | |
| const (
 | |
| 	GitPushOptionRepoPrivate  = "repo.private"
 | |
| 	GitPushOptionRepoTemplate = "repo.template"
 | |
| )
 | |
| 
 | |
| // Bool checks for a key in the map and parses as a boolean
 | |
| func (g GitPushOptions) Bool(key string, def bool) bool {
 | |
| 	if val, ok := g[key]; ok {
 | |
| 		if b, err := strconv.ParseBool(val); err == nil {
 | |
| 			return b
 | |
| 		}
 | |
| 	}
 | |
| 	return def
 | |
| }
 | |
| 
 | |
| // HookOptions represents the options for the Hook calls
 | |
| type HookOptions struct {
 | |
| 	OldCommitIDs                    []string
 | |
| 	NewCommitIDs                    []string
 | |
| 	RefFullNames                    []string
 | |
| 	UserID                          int64
 | |
| 	UserName                        string
 | |
| 	GitObjectDirectory              string
 | |
| 	GitAlternativeObjectDirectories string
 | |
| 	GitQuarantinePath               string
 | |
| 	GitPushOptions                  GitPushOptions
 | |
| 	PullRequestID                   int64
 | |
| 	DeployKeyID                     int64 // if the pusher is a DeployKey, then UserID is the repo's org user.
 | |
| 	IsWiki                          bool
 | |
| 	ActionPerm                      int
 | |
| }
 | |
| 
 | |
| // SSHLogOption ssh log options
 | |
| type SSHLogOption struct {
 | |
| 	IsError bool
 | |
| 	Message string
 | |
| }
 | |
| 
 | |
| // HookPostReceiveResult represents an individual result from PostReceive
 | |
| type HookPostReceiveResult struct {
 | |
| 	Results      []HookPostReceiveBranchResult
 | |
| 	RepoWasEmpty bool
 | |
| 	Err          string
 | |
| }
 | |
| 
 | |
| // HookPostReceiveBranchResult represents an individual branch result from PostReceive
 | |
| type HookPostReceiveBranchResult struct {
 | |
| 	Message bool
 | |
| 	Create  bool
 | |
| 	Branch  string
 | |
| 	URL     string
 | |
| }
 | |
| 
 | |
| // HookProcReceiveResult represents an individual result from ProcReceive
 | |
| type HookProcReceiveResult struct {
 | |
| 	Results []HookProcReceiveRefResult
 | |
| 	Err     string
 | |
| }
 | |
| 
 | |
| // HookProcReceiveRefResult represents an individual result from ProcReceive
 | |
| type HookProcReceiveRefResult struct {
 | |
| 	OldOID       string
 | |
| 	NewOID       string
 | |
| 	Ref          string
 | |
| 	OriginalRef  string
 | |
| 	IsForcePush  bool
 | |
| 	IsNotMatched bool
 | |
| 	Err          string
 | |
| }
 | |
| 
 | |
| // HookPreReceive check whether the provided commits are allowed
 | |
| func HookPreReceive(ctx context.Context, ownerName, repoName string, opts HookOptions) ResponseExtra {
 | |
| 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/hook/pre-receive/%s/%s", url.PathEscape(ownerName), url.PathEscape(repoName))
 | |
| 	req := newInternalRequest(ctx, reqURL, "POST", opts)
 | |
| 	req.SetReadWriteTimeout(time.Duration(60+len(opts.OldCommitIDs)) * time.Second)
 | |
| 	_, extra := requestJSONResp(req, &responseText{})
 | |
| 	return extra
 | |
| }
 | |
| 
 | |
| // HookPostReceive updates services and users
 | |
| func HookPostReceive(ctx context.Context, ownerName, repoName string, opts HookOptions) (*HookPostReceiveResult, ResponseExtra) {
 | |
| 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/hook/post-receive/%s/%s", url.PathEscape(ownerName), url.PathEscape(repoName))
 | |
| 	req := newInternalRequest(ctx, reqURL, "POST", opts)
 | |
| 	req.SetReadWriteTimeout(time.Duration(60+len(opts.OldCommitIDs)) * time.Second)
 | |
| 	return requestJSONResp(req, &HookPostReceiveResult{})
 | |
| }
 | |
| 
 | |
| // HookProcReceive proc-receive hook
 | |
| func HookProcReceive(ctx context.Context, ownerName, repoName string, opts HookOptions) (*HookProcReceiveResult, ResponseExtra) {
 | |
| 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/hook/proc-receive/%s/%s", url.PathEscape(ownerName), url.PathEscape(repoName))
 | |
| 
 | |
| 	req := newInternalRequest(ctx, reqURL, "POST", opts)
 | |
| 	req.SetReadWriteTimeout(time.Duration(60+len(opts.OldCommitIDs)) * time.Second)
 | |
| 	return requestJSONResp(req, &HookProcReceiveResult{})
 | |
| }
 | |
| 
 | |
| // SetDefaultBranch will set the default branch to the provided branch for the provided repository
 | |
| func SetDefaultBranch(ctx context.Context, ownerName, repoName, branch string) ResponseExtra {
 | |
| 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/hook/set-default-branch/%s/%s/%s",
 | |
| 		url.PathEscape(ownerName),
 | |
| 		url.PathEscape(repoName),
 | |
| 		url.PathEscape(branch),
 | |
| 	)
 | |
| 	req := newInternalRequest(ctx, reqURL, "POST")
 | |
| 	return requestJSONUserMsg(req, "")
 | |
| }
 | |
| 
 | |
| // SSHLog sends ssh error log response
 | |
| func SSHLog(ctx context.Context, isErr bool, msg string) error {
 | |
| 	reqURL := setting.LocalURL + "api/internal/ssh/log"
 | |
| 	req := newInternalRequest(ctx, reqURL, "POST", &SSHLogOption{IsError: isErr, Message: msg})
 | |
| 	_, extra := requestJSONResp(req, &responseText{})
 | |
| 	return extra.Error
 | |
| }
 |