Merge 5507467fb3789964bc88c63f513df6cd7ecf4f88 into 002831ea823edfa2ab3695b3f4fc0404979bcedf

client/health/health.go

@@ -40,8 +40,9 @@ type Monitor struct {
 	addr string
 
 	// For http
-	url string
+	url            string
-
+	header         http.Header
+	host           string
 	failedTimes    uint64
 	statusOK       bool
 	statusNormalFn func()
@@ -73,6 +74,11 @@ func NewMonitor(ctx context.Context, cfg v1.HealthCheckConfig, addr string,
 		}
 		url = s + cfg.Path
 	}
+	header := make(http.Header)
+	for _, h := range cfg.Headers {
+		header.Set(h.Name, h.Value)
+	}
+
 	return &Monitor{
 		checkType:      cfg.Type,
 		interval:       time.Duration(cfg.IntervalSeconds) * time.Second,
@@ -80,6 +86,8 @@ func NewMonitor(ctx context.Context, cfg v1.HealthCheckConfig, addr string,
 		maxFailedTimes: cfg.MaxFailed,
 		addr:           addr,
 		url:            url,
+		header:         header,
+		host:           cfg.HostHeaderRewrite,
 		statusOK:       false,
 		statusNormalFn: statusNormalFn,
 		statusFailedFn: statusFailedFn,
@@ -163,6 +171,8 @@ func (monitor *Monitor) doHTTPCheck(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	req.Header = monitor.header
+	req.Host = monitor.host
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return err

conf/frpc_full_example.toml

@@ -216,6 +216,11 @@ healthCheck.path = "/status"
 healthCheck.intervalSeconds = 10
 healthCheck.maxFailed = 3
 healthCheck.timeoutSeconds = 3
+# set health check headers
+healthCheck.headers=[
+    { name = "x-from-where", value = "frp" }
+]
+healthCheck.hostHeaderRewrite = "example.com"
 
 [[proxies]]
 name = "web02"

pkg/config/v1/common.go

@@ -129,3 +129,8 @@ type HTTPPluginOptions struct {
 type HeaderOperations struct {
 	Set map[string]string `json:"set,omitempty"`
 }
+
+type HTTPHeader struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}

pkg/config/v1/proxy.go

@@ -97,6 +97,12 @@ type HealthCheckConfig struct {
 	// Path specifies the path to send health checks to if the
 	// health check type is "http".
 	Path string `json:"path,omitempty"`
+	// Headers specifies the headers to send health checks to if the
+	// health check type is "http".
+	Headers []HTTPHeader `json:"headers,omitempty"`
+	// HostHeaderRewrite specifies the request host to send health checks to if the
+	// health check type is "http".
+	HostHeaderRewrite string `json:"hostHeaderRewrite,omitempty"`
 }
 
 type DomainConfig struct {