Skip to content

Implement HTTP Forwarded header policy API #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Jul 31, 2020
Merged

Implement HTTP Forwarded header policy API #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96a0e7f
TestInternalLoadBalancer: Enable test on GCP
Miciah Jul 17, 2020
167bcc2
Implement HTTP Forwarded header policy API
Miciah Jun 10, 2020
476387a
Makefile: Increase timeout for test-e2e
Miciah Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ release-local:

.PHONY: test-e2e
test-e2e:
$(GO) test -count 1 -v -tags e2e -run "$(TEST)" ./test/e2e
$(GO) test -timeout 1h -count 1 -v -tags e2e -run "$(TEST)" ./test/e2e

.PHONY: clean
clean:
Expand Down
19 changes: 19 additions & 0 deletions pkg/operator/controller/ingress/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import (
const (
WildcardRouteAdmissionPolicy = "ROUTER_ALLOW_WILDCARD_ROUTES"

RouterForwardedHeadersPolicy = "ROUTER_SET_FORWARDED_HEADERS"

RouterLogLevelEnvName = "ROUTER_LOG_LEVEL"
RouterSyslogAddressEnvName = "ROUTER_SYSLOG_ADDRESS"
RouterSyslogFormatEnvName = "ROUTER_SYSLOG_FORMAT"
Expand Down Expand Up @@ -533,6 +535,23 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, ingressController
env = append(env, corev1.EnvVar{Name: WildcardRouteAdmissionPolicy, Value: "false"})
}

forwardedHeaderPolicy := operatorv1.AppendHTTPHeaderPolicy
if ci.Spec.HTTPHeaders != nil && len(ci.Spec.HTTPHeaders.ForwardedHeaderPolicy) != 0 {
forwardedHeaderPolicy = ci.Spec.HTTPHeaders.ForwardedHeaderPolicy
}
routerForwardedHeadersPolicyValue := "append"
switch forwardedHeaderPolicy {
case operatorv1.AppendHTTPHeaderPolicy:
// Nothing to do.
case operatorv1.ReplaceHTTPHeaderPolicy:
routerForwardedHeadersPolicyValue = "replace"
case operatorv1.IfNoneHTTPHeaderPolicy:
routerForwardedHeadersPolicyValue = "if-none"
case operatorv1.NeverHTTPHeaderPolicy:
routerForwardedHeadersPolicyValue = "never"
}
env = append(env, corev1.EnvVar{Name: RouterForwardedHeadersPolicy, Value: routerForwardedHeadersPolicyValue})

if HTTP2IsEnabled(ci, ingressConfig) {
env = append(env, corev1.EnvVar{Name: RouterDisableHTTP2EnvName, Value: "false"})
} else {
Expand Down
7 changes: 7 additions & 0 deletions pkg/operator/controller/ingress/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,8 @@ func TestDesiredRouterDeployment(t *testing.T) {
checkDeploymentHasEnvVar(t, deployment, "ROUTER_SYSLOG_ADDRESS", true, "/var/lib/rsyslog/rsyslog.sock")
checkDeploymentHasEnvVar(t, deployment, "ROUTER_SYSLOG_FORMAT", true, `"%ci:%cp [%t] %ft %b/%s %B %bq %HM %HU %HV"`)

checkDeploymentHasEnvVar(t, deployment, "ROUTER_SET_FORWARDED_HEADERS", true, "append")

checkDeploymentHasEnvVar(t, deployment, "ROUTER_CIPHERS", true, "quux")

// TODO: Update when haproxy is built with an openssl version that supports tls v1.3.
Expand All @@ -304,6 +306,9 @@ func TestDesiredRouterDeployment(t *testing.T) {
},
},
}
ci.Spec.HTTPHeaders = &operatorv1.IngressControllerHTTPHeaders{
ForwardedHeaderPolicy: operatorv1.NeverHTTPHeaderPolicy,
}
ci.Spec.NodePlacement = &operatorv1.NodePlacement{
NodeSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
Expand Down Expand Up @@ -371,6 +376,8 @@ func TestDesiredRouterDeployment(t *testing.T) {
checkDeploymentHasEnvVar(t, deployment, "ROUTER_SYSLOG_ADDRESS", true, "1.2.3.4:12345")
checkDeploymentHasEnvVar(t, deployment, "ROUTER_SYSLOG_FORMAT", false, "")

checkDeploymentHasEnvVar(t, deployment, "ROUTER_SET_FORWARDED_HEADERS", true, "never")

checkDeploymentHasEnvVar(t, deployment, "ROUTER_IP_V4_V6_MODE", true, "v6")
checkDeploymentHasEnvVar(t, deployment, RouterDisableHTTP2EnvName, true, "true")
}
Expand Down
Loading