curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-2694 added destination header support to config file

This commit is contained in:
Dalton 2020-06-12 11:57:21 -05:00
parent 55acf7283c
commit 1a6403b2fd
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cloudflared/access/carrier.go
View File

@ -37,6 +37,10 @@ func StartForwarder(forwarder config.Forwarder, shutdown <-chan struct{}, logger
headers.Set(h2mux.CFAccessClientSecretHeader, forwarder.TokenSecret) headers.Set(h2mux.CFAccessClientSecretHeader, forwarder.TokenSecret)
} }
if forwarder.Destination != "" {
headers.Add(h2mux.CFJumpDestinationHeader, forwarder.Destination)
}
options := &carrier.StartOptions{ options := &carrier.StartOptions{
OriginURL: forwarder.URL, OriginURL: forwarder.URL,
Headers: headers, //TODO: TUN-2688 support custom headers from config file Headers: headers, //TODO: TUN-2688 support custom headers from config file

2
cmd/cloudflared/config/model.go
View File

@ -13,6 +13,7 @@ type Forwarder struct {
Listener string `json:"listener"` Listener string `json:"listener"`
TokenClientID string `json:"service_token_id" yaml:"serviceTokenID"` TokenClientID string `json:"service_token_id" yaml:"serviceTokenID"`
TokenSecret string `json:"secret_token_id" yaml:"serviceTokenSecret"` TokenSecret string `json:"secret_token_id" yaml:"serviceTokenSecret"`
Destination string `json:"destination"`
} }
// Tunnel represents a tunnel that should be started // Tunnel represents a tunnel that should be started
@ -50,6 +51,7 @@ func (f *Forwarder) Hash() string {
io.WriteString(h, f.Listener) io.WriteString(h, f.Listener)
io.WriteString(h, f.TokenClientID) io.WriteString(h, f.TokenClientID)
io.WriteString(h, f.TokenSecret) io.WriteString(h, f.TokenSecret)
io.WriteString(h, f.Destination)
return fmt.Sprintf("%x", h.Sum(nil)) return fmt.Sprintf("%x", h.Sum(nil))
} }