XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-05-08 23:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge e2b34fff62ba7c2e642b07e5d00d7525aaab1f03 into 9d5638cae6dfecb10bff7c6d3e52625fe264fee1

Browse Source
This commit is contained in:
adamwallred 2024-10-18 14:39:03 +08:00 committed by GitHub
commit b8a4fbe40b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/config/v1/plugin.go
View File

@ -103,6 +103,7 @@ type HTTP2HTTPSPluginOptions struct {
LocalAddr string `json:"localAddr,omitempty"`
HostHeaderRewrite string `json:"hostHeaderRewrite,omitempty"`
RequestHeaders HeaderOperations `json:"requestHeaders,omitempty"`
RootCA string `json:"rootCA,omitempty"`
}
func (o *HTTP2HTTPSPluginOptions) Complete() {}
@ -137,6 +138,7 @@ type HTTPS2HTTPSPluginOptions struct {
EnableHTTP2 *bool `json:"enableHTTP2,omitempty"`
CrtPath string `json:"crtPath,omitempty"`
KeyPath string `json:"keyPath,omitempty"`
RootCA string `json:"rootCA,omitempty"`
}
func (o *HTTPS2HTTPSPluginOptions) Complete() {

21
pkg/plugin/client/http2https.go
View File

@ -19,11 +19,13 @@ package plugin
import (
"context"
"crypto/tls"
"crypto/x509"
"io"
stdlog "log"
"net"
"net/http"
"net/http/httputil"
"os"
"github.com/fatedier/golib/pool"
@ -53,8 +55,23 @@ func NewHTTP2HTTPSPlugin(options v1.ClientPluginOptions) (Plugin, error) {
l: listener,
}
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
tr := &http.Transport{}
if opts.RootCA != "" {
caCert, err := os.ReadFile(opts.RootCA)
if err != nil {
return nil, err
}
caCertPool, err := x509.SystemCertPool()
if err != nil {
return nil, err
}
caCertPool.AppendCertsFromPEM(caCert)
tr.TLSClientConfig = &tls.Config{
RootCAs: caCertPool,
}
} else {
tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
}
rp := &httputil.ReverseProxy{

21
pkg/plugin/client/https2https.go
View File

@ -19,12 +19,14 @@ package plugin
import (
"context"
"crypto/tls"
"crypto/x509"
"fmt"
"io"
stdlog "log"
"net"
"net/http"
"net/http/httputil"
"os"
"time"
"github.com/fatedier/golib/pool"
@ -58,8 +60,23 @@ func NewHTTPS2HTTPSPlugin(options v1.ClientPluginOptions) (Plugin, error) {
l: listener,
}
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
tr := &http.Transport{}
if opts.RootCA != "" {
caCert, err := os.ReadFile(opts.RootCA)
if err != nil {
return nil, err
}
caCertPool, err := x509.SystemCertPool()
if err != nil {
return nil, err
}
caCertPool.AppendCertsFromPEM(caCert)
tr.TLSClientConfig = &tls.Config{
RootCAs: caCertPool,
}
} else {
tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
}
rp := &httputil.ReverseProxy{