Skip to content

Add directive for SSL Server block #1934

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

Add directive for SSL Server block #1934

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
de9f053
add directives for SSL server blocks
salonichf5 May 6, 2024
19cd828
add unit tests
salonichf5 May 6, 2024
4c5f48a
correct location for directive
salonichf5 May 7, 2024
694817b
update unit tests
salonichf5 May 7, 2024
6bda9c2
Merge branch 'main' into bug/backend-tls
salonichf5 May 7, 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
1 change: 1 addition & 0 deletions internal/mode/static/nginx/config/servers_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ server {
{{ $proxyOrGRPC }}_pass {{ $l.ProxyPass }};
proxy_http_version 1.1;
{{- if $l.ProxySSLVerify }}
{{ $proxyOrGRPC }}_ssl_server_name on;
{{ $proxyOrGRPC }}_ssl_verify on;
{{ $proxyOrGRPC }}_ssl_name {{ $l.ProxySSLVerify.Name }};
{{ $proxyOrGRPC }}_ssl_trusted_certificate {{ $l.ProxySSLVerify.TrustedCertificate }};
Expand Down
27 changes: 27 additions & 0 deletions internal/mode/static/nginx/config/servers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,32 @@ func TestExecuteServers(t *testing.T) {
KeyPairID: "test-keypair",
},
Port: 8443,
PathRules: []dataplane.PathRule{
{
Path: "/",
PathType: dataplane.PathTypePrefix,
MatchRules: []dataplane.MatchRule{
{
Match: dataplane.Match{},
BackendGroup: dataplane.BackendGroup{
Source: types.NamespacedName{Namespace: "test", Name: "route1"},
RuleIdx: 0,
Backends: []dataplane.Backend{
{
UpstreamName: "test_foo_443",
Valid: true,
Weight: 1,
VerifyTLS: &dataplane.VerifyTLS{
CertBundleID: "test-foo",
Hostname: "test-foo.example.com",
},
},
},
},
},
},
},
},
},
},
}
Expand All @@ -61,6 +87,7 @@ func TestExecuteServers(t *testing.T) {
"server_name cafe.example.com;": 2,
"ssl_certificate /etc/nginx/secrets/test-keypair.pem;": 2,
"ssl_certificate_key /etc/nginx/secrets/test-keypair.pem;": 2,
"proxy_ssl_server_name on;": 1,
}
g := NewWithT(t)
serverResults := executeServers(conf)
Expand Down