From 934ac2b8361bebdb7bc8f83db84483d646166d34 Mon Sep 17 00:00:00 2001
From: zhouwenfeng <wenfeng.zhou@liulishuo.com>
Date: Tue, 13 Aug 2019 21:14:06 +0800
Subject: [PATCH] add support for add http header when using https2http plugin

---
 conf/frpc_full.ini          |  1 +
 models/plugin/https2http.go | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/conf/frpc_full.ini b/conf/frpc_full.ini
index 71513ee..c84e684 100644
--- a/conf/frpc_full.ini
+++ b/conf/frpc_full.ini
@@ -198,6 +198,7 @@ plugin_local_addr = 127.0.0.1:80
 plugin_crt_path = ./server.crt
 plugin_key_path = ./server.key
 plugin_host_header_rewrite = 127.0.0.1
+plugin_header_X-From-Where = frp
 
 [secret_tcp]
 # If the type is secret tcp, remote_port is useless
diff --git a/models/plugin/https2http.go b/models/plugin/https2http.go
index 6e84ad6..d769f2a 100644
--- a/models/plugin/https2http.go
+++ b/models/plugin/https2http.go
@@ -20,6 +20,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httputil"
+	"strings"
 
 	frpNet "github.com/fatedier/frp/utils/net"
 )
@@ -35,6 +36,7 @@ type HTTPS2HTTPPlugin struct {
 	keyPath           string
 	hostHeaderRewrite string
 	localAddr         string
+	headers           map[string]string
 
 	l *Listener
 	s *http.Server
@@ -45,6 +47,15 @@ func NewHTTPS2HTTPPlugin(params map[string]string) (Plugin, error) {
 	keyPath := params["plugin_key_path"]
 	localAddr := params["plugin_local_addr"]
 	hostHeaderRewrite := params["plugin_host_header_rewrite"]
+	headers := make(map[string]string)
+	for k, v := range params {
+		if !strings.HasPrefix(k, "plugin_header_") {
+			continue
+		}
+		if k = strings.TrimPrefix(k, "plugin_header_"); k != "" {
+			headers[k] = v
+		}
+	}
 
 	if crtPath == "" {
 		return nil, fmt.Errorf("plugin_crt_path is required")
@@ -63,6 +74,7 @@ func NewHTTPS2HTTPPlugin(params map[string]string) (Plugin, error) {
 		keyPath:           keyPath,
 		localAddr:         localAddr,
 		hostHeaderRewrite: hostHeaderRewrite,
+		headers:           headers,
 		l:                 listener,
 	}
 
@@ -73,6 +85,9 @@ func NewHTTPS2HTTPPlugin(params map[string]string) (Plugin, error) {
 			if p.hostHeaderRewrite != "" {
 				req.Host = p.hostHeaderRewrite
 			}
+			for k, v := range p.headers {
+				req.Header.Add(k, v)
+			}
 		},
 	}