Skip to content

OCPBUGS-87205: Add configuration override for X-SSL strip #1465

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

Open
rikatz wants to merge 1 commit into
base: master
Choose a base branch
from
+73 −4
Open

OCPBUGS-87205: Add configuration override for X-SSL strip #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions pkg/operator/controller/ingress/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,10 @@ const (

WorkloadPartitioningManagement = "target.workload.openshift.io/management"

RouterClientAuthPolicy = "ROUTER_MUTUAL_TLS_AUTH"
RouterClientAuthCA = "ROUTER_MUTUAL_TLS_AUTH_CA"
RouterClientAuthFilter = "ROUTER_MUTUAL_TLS_AUTH_FILTER"
RouterClientAuthPolicy = "ROUTER_MUTUAL_TLS_AUTH"
RouterClientAuthCA = "ROUTER_MUTUAL_TLS_AUTH_CA"
RouterClientAuthFilter = "ROUTER_MUTUAL_TLS_AUTH_FILTER"
RouterMutualTLSHeaderFilter = "ROUTER_MUTUAL_TLS_HEADER_FILTER"

RouterEnableCompression = "ROUTER_ENABLE_COMPRESSION"
RouterCompressionMIMETypes = "ROUTER_COMPRESSION_MIME"
Expand Down Expand Up @@ -577,7 +578,8 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, config *Config, i
// Note, however, that dynamic servers consume memory even when not enabled.
// Use this analysis of the memory usage to assess the impact of different numbers of servers:
// https://gist.github.com/frobware/2b527ce3f040797909eff482a4776e0b
MaxDynamicServers string `json:"maxDynamicServers"`
MaxDynamicServers string `json:"maxDynamicServers"`
MutualTLSHeaderFilter string `json:"mutualTLSHeaderFilter"`
}
if len(ci.Spec.UnsupportedConfigOverrides.Raw) > 0 {
if err := json.Unmarshal(ci.Spec.UnsupportedConfigOverrides.Raw, &unsupportedConfigOverrides); err != nil {
Expand Down Expand Up @@ -663,6 +665,13 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, config *Config, i
})
}

if v, err := strconv.ParseBool(unsupportedConfigOverrides.MutualTLSHeaderFilter); err == nil && !v {
env = append(env, corev1.EnvVar{
Name: RouterMutualTLSHeaderFilter,
Value: "false",
})
}

if len(ci.Status.Domain) > 0 {
cName := "router-" + ci.Name + "." + ci.Status.Domain
env = append(env,
Expand Down
60 changes: 60 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 @@ -1494,6 +1494,66 @@ func TestDesiredRouterDeploymentDynamicConfigManager(t *testing.T) {
}
}

func TestDesiredRouterDeploymentMutualTLSHeaderFilter(t *testing.T) {
testCases := []struct {
name string
unsupportedConfigOverrides string
expectedEnv []envData
}{
{
name: "not-set",
unsupportedConfigOverrides: `{}`,
expectedEnv: []envData{
{"ROUTER_MUTUAL_TLS_HEADER_FILTER", false, ""},
},
},
{
name: "set-to-false",
unsupportedConfigOverrides: `{"mutualTLSHeaderFilter":"false"}`,
expectedEnv: []envData{
{"ROUTER_MUTUAL_TLS_HEADER_FILTER", true, "false"},
},
},
{
name: "set-to-true",
unsupportedConfigOverrides: `{"mutualTLSHeaderFilter":"true"}`,
expectedEnv: []envData{
{"ROUTER_MUTUAL_TLS_HEADER_FILTER", false, ""},
},
},
{
name: "set-to-invalid-value",
unsupportedConfigOverrides: `{"mutualTLSHeaderFilter":"banana"}`,
expectedEnv: []envData{
{"ROUTER_MUTUAL_TLS_HEADER_FILTER", false, ""},
},
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ic := &operatorv1.IngressController{
ObjectMeta: metav1.ObjectMeta{
Name: "default",
},
Spec: operatorv1.IngressControllerSpec{
UnsupportedConfigOverrides: runtime.RawExtension{
Raw: []byte(tc.unsupportedConfigOverrides),
},
},
Status: operatorv1.IngressControllerStatus{
EndpointPublishingStrategy: &operatorv1.EndpointPublishingStrategy{
Type: operatorv1.PrivateStrategyType,
},
},
}

deployment, err := desiredRouterDeployment(ic, &Config{IngressControllerImage: ingressControllerImage}, &configv1.Ingress{}, &configv1.Infrastructure{}, &configv1.APIServer{}, &configv1.Network{}, nil, false, false, nil, &configv1.Proxy{})
assert.NoError(t, err)
assert.NoError(t, checkDeploymentEnvironment(t, deployment, tc.expectedEnv))
})
}
}

func checkContainerPort(t *testing.T, d *appsv1.Deployment, portName string, port int32) {
t.Helper()
for _, p := range d.Spec.Template.Spec.Containers[0].Ports {
Expand Down