Skip to content

Backport of Fix a panic in connect-inject when the provided upstreams list is malformed into release/1.4.x #3971

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
dhiaayachi merged 5 commits into from
May 6, 2024
Merged

Backport of Fix a panic in connect-inject when the provided upstreams list is malformed into release/1.4.x #3971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ccfda3
backport of commit 2b30a0da25f714b5bab72201fb47886df22d7453
Apr 29, 2024
75bf780
backport of commit 03c188733fa4300946f67e421e307bbea3ab95a7
Apr 29, 2024
35edf29
backport of commit 4af5e68ce205c19b187525a6a8f7a585d9e81998
Apr 29, 2024
18dafb3
backport of commit 4c471dd4addd60f171c46b717d26648eff01f2c1
Apr 29, 2024
3470f50
backport of commit 13c989f81ca0cce094d311ea87d91f68c0ac1f50
Apr 30, 2024
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
7 changes: 7 additions & 0 deletions .changelog/3956.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:bug
control-plane: fix a panic when an upstream annotation is malformed.
```

```release-note:enhancement
control-plane: support <space>, <comma> and <\n> as upstream separators.
```
8 changes: 7 additions & 1 deletion control-plane/connect-inject/webhook/container_env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ func (w *MeshWebhook) containerEnvVars(pod corev1.Pod) []corev1.EnvVar {
}

var result []corev1.EnvVar
for _, raw := range strings.Split(raw, ",") {
for _, raw := range strings.FieldsFunc(raw, func(r rune) bool {
return r == ',' || r == ' ' || r == '\n' // Split either comma separated or space separated
}) {
parts := strings.SplitN(raw, ":", 3)
if len(parts) < 2 {
w.Log.Error(fmt.Errorf("ustream URL is malformed, skipping it: %s", raw), "malformed upstream")
continue
}
port, _ := common.PortValue(pod, strings.TrimSpace(parts[1]))
if port > 0 {
name := strings.TrimSpace(parts[0])
Expand Down
127 changes: 118 additions & 9 deletions control-plane/connect-inject/webhook/container_env_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,131 @@ func TestContainerEnvVars(t *testing.T) {
cases := []struct {
Name string
Upstream string
required []corev1.EnvVar
}{
{
"Upstream with datacenter",
"static-server:7890:dc1",
[]corev1.EnvVar{
{
Name: "STATIC_SERVER_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER_CONNECT_SERVICE_PORT",
Value: "7890",
},
},
},
{
"Upstream without datacenter",
"static-server:7890",
[]corev1.EnvVar{
{
Name: "STATIC_SERVER_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER_CONNECT_SERVICE_PORT",
Value: "7890",
},
},
},
{
"Multiple upstreams comma separated",
"static-server:7890, static-server2:7892",
[]corev1.EnvVar{
{
Name: "STATIC_SERVER_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER_CONNECT_SERVICE_PORT",
Value: "7890",
},
{
Name: "STATIC_SERVER2_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER2_CONNECT_SERVICE_PORT",
Value: "7892",
},
},
},
{
"Multiple upstreams comma separated",
"static-server:7890, static-server2:7892 static-server3:7893",
[]corev1.EnvVar{
{
Name: "STATIC_SERVER_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER_CONNECT_SERVICE_PORT",
Value: "7890",
},
{
Name: "STATIC_SERVER2_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER2_CONNECT_SERVICE_PORT",
Value: "7892",
},
{
Name: "STATIC_SERVER3_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER3_CONNECT_SERVICE_PORT",
Value: "7893",
},
},
},
{
"Multiple upstreams comma separated and carriage return",
`static-server:7890,
static-server2:7892
static-server3:7893`,
[]corev1.EnvVar{
{
Name: "STATIC_SERVER_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER_CONNECT_SERVICE_PORT",
Value: "7890",
},
{
Name: "STATIC_SERVER2_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER2_CONNECT_SERVICE_PORT",
Value: "7892",
},
{
Name: "STATIC_SERVER3_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER3_CONNECT_SERVICE_PORT",
Value: "7893",
},
},
},
{
"Multiple upstreams comma separated and carriage return malformed upstream",
`static-server7890,
static-server2:7892
static-server3:7893`,
[]corev1.EnvVar{
{
Name: "STATIC_SERVER2_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER2_CONNECT_SERVICE_PORT",
Value: "7892",
},
{
Name: "STATIC_SERVER3_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER3_CONNECT_SERVICE_PORT",
Value: "7893",
},
},
},
}

Expand All @@ -42,15 +159,7 @@ func TestContainerEnvVars(t *testing.T) {
},
})

require.ElementsMatch(envVars, []corev1.EnvVar{
{
Name: "STATIC_SERVER_CONNECT_SERVICE_HOST",
Value: "127.0.0.1",
}, {
Name: "STATIC_SERVER_CONNECT_SERVICE_PORT",
Value: "7890",
},
})
require.ElementsMatch(envVars, tt.required)
})
}
}