Skip to content

Commit 61007dd

Browse files
committed
TUN-6860: Send access configuration keys to the edge
1 parent b01006f commit 61007dd

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

ingress/config.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,12 @@ func (defaults *OriginRequestConfig) setHttp2Origin(overrides config.OriginReque
427427
}
428428
}
429429

430+
func (defaults *OriginRequestConfig) setAccess(overrides config.OriginRequestConfig) {
431+
if val := overrides.Access; val != nil {
432+
defaults.Access = *val
433+
}
434+
}
435+
430436
// SetConfig gets config for the requests that cloudflared sends to origins.
431437
// Each field has a setter method which sets a value for the field by trying to find:
432438
// 1. The user config for this rule
@@ -453,6 +459,8 @@ func setConfig(defaults OriginRequestConfig, overrides config.OriginRequestConfi
453459
cfg.setProxyType(overrides)
454460
cfg.setIPRules(overrides)
455461
cfg.setHttp2Origin(overrides)
462+
cfg.setAccess(overrides)
463+
456464
return cfg
457465
}
458466

@@ -463,6 +471,7 @@ func ConvertToRawOriginConfig(c OriginRequestConfig) config.OriginRequestConfig
463471
var keepAliveConnections *int
464472
var keepAliveTimeout *config.CustomDuration
465473
var proxyAddress *string
474+
var access *config.AccessConfig
466475

467476
if c.ConnectTimeout != defaultHTTPConnectTimeout {
468477
connectTimeout = &c.ConnectTimeout
@@ -482,6 +491,9 @@ func ConvertToRawOriginConfig(c OriginRequestConfig) config.OriginRequestConfig
482491
if c.ProxyAddress != defaultProxyAddress {
483492
proxyAddress = &c.ProxyAddress
484493
}
494+
if c.Access.Required {
495+
access = &c.Access
496+
}
485497

486498
return config.OriginRequestConfig{
487499
ConnectTimeout: connectTimeout,
@@ -501,6 +513,7 @@ func ConvertToRawOriginConfig(c OriginRequestConfig) config.OriginRequestConfig
501513
ProxyType: emptyStringToNil(c.ProxyType),
502514
IPRules: convertToRawIPRules(c.IPRules),
503515
Http2Origin: defaultBoolToNil(c.Http2Origin),
516+
Access: access,
504517
}
505518
}
506519

0 commit comments

Comments
 (0)