mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 20:36:07 +01:00 
			
		
		
		
	add a new internal hook to save ssh log (#15787)
* add a new internal hook to save ssh log as title, when a ssh error ocure like #15785. only when switch ``RUN_MODE`` to dev can we found which error is ocure. But this way is not a good idea for production envirment. this changes try save ssh error mesage to the log file like other log by a new internal hook. I think it's usefull for find error message in production envirment. Thanks. Signed-off-by: a1012112796 <1012112796@qq.com> * rename and fix nit * Update modules/private/hook.go Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
		@@ -81,6 +81,10 @@ func fail(userMessage, logMessage string, args ...interface{}) {
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if len(logMessage) > 0 {
 | 
			
		||||
		_ = private.SSHLog(true, fmt.Sprintf(logMessage+": ", args...))
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	os.Exit(1)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -444,6 +444,11 @@ ROUTER = console
 | 
			
		||||
;ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"
 | 
			
		||||
;;
 | 
			
		||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 | 
			
		||||
;;
 | 
			
		||||
;; SSH log (Creates log from ssh git request)
 | 
			
		||||
;;
 | 
			
		||||
;ENABLE_SSH_LOG = false
 | 
			
		||||
;;
 | 
			
		||||
;; Other Settings
 | 
			
		||||
;;
 | 
			
		||||
;; Print Stacktraces with logs. (Rarely helpful.) Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "None"
 | 
			
		||||
 
 | 
			
		||||
@@ -657,6 +657,7 @@ Default templates for project boards:
 | 
			
		||||
- `ROUTER`: **console**: The mode or name of the log the router should log to. (If you set this to `,` it will log to default gitea logger.)
 | 
			
		||||
NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take effect. Configure each mode in per mode log subsections `\[log.modename.router\]`.
 | 
			
		||||
- `ENABLE_ACCESS_LOG`: **false**: Creates an access.log in NCSA common log format, or as per the following template
 | 
			
		||||
- `ENABLE_SSH_LOG`: **false**: save ssh log to log file
 | 
			
		||||
- `ACCESS`: **file**: Logging mode for the access logger, use a comma to separate values. Configure each mode in per mode log subsections `\[log.modename.access\]`. By default the file mode will log to `$ROOT_PATH/access.log`. (If you set this to `,` it will log to the default gitea logger.)
 | 
			
		||||
- `ACCESS_LOG_TEMPLATE`: **`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`**: Sets the template used to create the access log.
 | 
			
		||||
  - The following variables are available:
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,7 @@
 | 
			
		||||
package private
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"encoding/json"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"net/http"
 | 
			
		||||
	"net/url"
 | 
			
		||||
@@ -57,6 +58,12 @@ type HookOptions struct {
 | 
			
		||||
	IsDeployKey                     bool
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SSHLogOption ssh log options
 | 
			
		||||
type SSHLogOption struct {
 | 
			
		||||
	IsError bool
 | 
			
		||||
	Message string
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// HookPostReceiveResult represents an individual result from PostReceive
 | 
			
		||||
type HookPostReceiveResult struct {
 | 
			
		||||
	Results      []HookPostReceiveBranchResult
 | 
			
		||||
@@ -146,3 +153,27 @@ func SetDefaultBranch(ownerName, repoName, branch string) error {
 | 
			
		||||
	}
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SSHLog sends ssh error log response
 | 
			
		||||
func SSHLog(isErr bool, msg string) error {
 | 
			
		||||
	reqURL := setting.LocalURL + "api/internal/ssh/log"
 | 
			
		||||
	req := newInternalRequest(reqURL, "POST")
 | 
			
		||||
	req = req.Header("Content-Type", "application/json")
 | 
			
		||||
 | 
			
		||||
	jsonBytes, _ := json.Marshal(&SSHLogOption{
 | 
			
		||||
		IsError: isErr,
 | 
			
		||||
		Message: msg,
 | 
			
		||||
	})
 | 
			
		||||
	req.Body(jsonBytes)
 | 
			
		||||
 | 
			
		||||
	req.SetTimeout(60*time.Second, 60*time.Second)
 | 
			
		||||
	resp, err := req.Response()
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return fmt.Errorf("unable to contact gitea: %v", err)
 | 
			
		||||
	}
 | 
			
		||||
	defer resp.Body.Close()
 | 
			
		||||
	if resp.StatusCode != http.StatusOK {
 | 
			
		||||
		return fmt.Errorf("Error returned from gitea: %v", decodeJSONError(resp).Err)
 | 
			
		||||
	}
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -287,6 +287,7 @@ func newLogService() {
 | 
			
		||||
 | 
			
		||||
	options := newDefaultLogOptions()
 | 
			
		||||
	options.bufferLength = Cfg.Section("log").Key("BUFFER_LEN").MustInt64(10000)
 | 
			
		||||
	EnableSSHLog = Cfg.Section("log").Key("ENABLE_SSH_LOG").MustBool(false)
 | 
			
		||||
 | 
			
		||||
	description := LogDescription{
 | 
			
		||||
		Name: log.DEFAULT,
 | 
			
		||||
 
 | 
			
		||||
@@ -319,6 +319,7 @@ var (
 | 
			
		||||
	DisableRouterLog   bool
 | 
			
		||||
	RouterLogLevel     log.Level
 | 
			
		||||
	EnableAccessLog    bool
 | 
			
		||||
	EnableSSHLog       bool
 | 
			
		||||
	AccessLogTemplate  string
 | 
			
		||||
	EnableXORMLog      bool
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -55,6 +55,7 @@ func Routes() *web.Route {
 | 
			
		||||
 | 
			
		||||
	r.Post("/ssh/authorized_keys", AuthorizedPublicKeyByContent)
 | 
			
		||||
	r.Post("/ssh/{id}/update/{repoid}", UpdatePublicKeyInRepo)
 | 
			
		||||
	r.Post("/ssh/log", bind(private.SSHLogOption{}), SSHLog)
 | 
			
		||||
	r.Post("/hook/pre-receive/{owner}/{repo}", bind(private.HookOptions{}), HookPreReceive)
 | 
			
		||||
	r.Post("/hook/post-receive/{owner}/{repo}", bind(private.HookOptions{}), HookPostReceive)
 | 
			
		||||
	r.Post("/hook/set-default-branch/{owner}/{repo}/{branch}", SetDefaultBranch)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										34
									
								
								routers/private/ssh_log.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								routers/private/ssh_log.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,34 @@
 | 
			
		||||
// Copyright 2021 The Gitea Authors. All rights reserved.
 | 
			
		||||
// Use of this source code is governed by a MIT-style
 | 
			
		||||
// license that can be found in the LICENSE file.
 | 
			
		||||
 | 
			
		||||
package private
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"net/http"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/modules/context"
 | 
			
		||||
	"code.gitea.io/gitea/modules/log"
 | 
			
		||||
	"code.gitea.io/gitea/modules/private"
 | 
			
		||||
	"code.gitea.io/gitea/modules/setting"
 | 
			
		||||
	"code.gitea.io/gitea/modules/web"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// SSHLog hook to response ssh log
 | 
			
		||||
func SSHLog(ctx *context.PrivateContext) {
 | 
			
		||||
	if !setting.EnableSSHLog {
 | 
			
		||||
		ctx.Status(http.StatusOK)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	opts := web.GetForm(ctx).(*private.SSHLogOption)
 | 
			
		||||
 | 
			
		||||
	if opts.IsError {
 | 
			
		||||
		log.Error("ssh: %v", opts.Message)
 | 
			
		||||
		ctx.Status(http.StatusOK)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	log.Debug("ssh: %v", opts.Message)
 | 
			
		||||
	ctx.Status(http.StatusOK)
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user