
* Drop v1beta1 from ingress nginx (#7156) * Drop v1beta1 from ingress nginx Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix intorstr logic in controller Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * fixing admission Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * more intorstr fixing * correct template rendering Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix e2e tests for v1 api Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix gofmt errors * This is finally working...almost there... Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Re-add removed validation of AdmissionReview * Prepare for v1.0.0-alpha.1 release Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Update changelog and matrix table for v1.0.0-alpha.1 (#7274) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * add docs for syslog feature (#7219) * Fix link to e2e-tests.md in developer-guide (#7201) * Use ENV expansion for namespace in args (#7146) Update the DaemonSet namespace references to use the `POD_NAMESPACE` environment variable in the same way that the Deployment does. * chart: using Helm builtin capabilities check (#7190) Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> * Update proper default value for HTTP2MaxConcurrentStreams in Docs (#6944) It should be 128 as documented in https://github.com/kubernetes/ingress-nginx/blob/master/internal/ingress/controller/config/config.go#L780 * Fix MaxWorkerOpenFiles calculation on high cores nodes (#7107) * Fix MaxWorkerOpenFiles calculation on high cores nodes * Add e2e test for rlimit_nofile * Fix doc for max-worker-open-files * ingress/tcp: add additional error logging on failed (#7208) * Add file containing stable release (#7313) * Handle named (non-numeric) ports correctly (#7311) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Updated v1beta1 to v1 as its deprecated (#7308) * remove mercurial from build (#7031) * Retry to download maxmind DB if it fails (#7242) * Retry to download maxmind DB if it fails. Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Add retries count arg, move retry logic into DownloadGeoLite2DB function Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Reorder parameters in DownloadGeoLite2DB Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Remove hardcoded value Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Release v1.0.0-alpha.1 * Add changelog for v1.0.0-alpha.2 * controller: ignore non-service backends (#7332) * controller: ignore non-service backends Signed-off-by: Carlos Panato <ctadeu@gmail.com> * update per feedback Signed-off-by: Carlos Panato <ctadeu@gmail.com> * fix: allow scope/tcp/udp configmap namespace to altered (#7161) * Lower webhook timeout for digital ocean (#7319) * Lower webhook timeout for digital ocean * Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29 * update OWNERS and aliases files (#7365) (#7366) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Downgrade Lua modules for s390x (#7355) Downgrade Lua modules to last known working version. * Fix IngressClass logic for newer releases (#7341) * Fix IngressClass logic for newer releases Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Change e2e tests for the new IngressClass presence * Fix chart and admission tests Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix helm chart test Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix reviews * Remove ingressclass code from admission * update tag to v1.0.0-beta.1 * update readme and changelog for v1.0.0-beta.1 * Release v1.0.0-beta.1 - helm and manifests (#7422) * Change the order of annotation just to trigger a new helm release (#7425) * [cherry-pick] Add dev-v1 branch into helm releaser (#7428) * Add dev-v1 branch into helm releaser (#7424) * chore: add link for artifacthub.io/prerelease annotations Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> * k8s job ci pipeline for dev-v1 br v1.22.0 (#7453) * k8s job ci pipeline for dev-v1 br v1.22.0 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * k8s job ci pipeline for dev-v1 br v1.21.2 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * remove v1.21.1 version Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * Add controller.watchIngressWithoutClass config option (#7459) Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com> * Release new helm chart with certgen fixed (#7478) * Update go version, modules and remove ioutil * Release new helm chart with certgen fixed * changed appversion, chartversion, TAG, image (#7490) * Fix CI conflict * Fix CI conflict * Fix build.sh from rebase process * Fix controller_test post rebase Co-authored-by: Tianhao Guo <rggth09@gmail.com> Co-authored-by: Ray <61553+rctay@users.noreply.github.com> Co-authored-by: Bill Cassidy <cassid4@gmail.com> Co-authored-by: Jintao Zhang <tao12345666333@163.com> Co-authored-by: Sathish Ramani <rsathishx87@gmail.com> Co-authored-by: Mansur Marvanov <nanorobocop@gmail.com> Co-authored-by: Matt1360 <568198+Matt1360@users.noreply.github.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com> Co-authored-by: Kundan Kumar <kundan.kumar@india.nec.com> Co-authored-by: Tom Hayward <thayward@infoblox.com> Co-authored-by: Sergey Shakuto <sshakuto@infoblox.com> Co-authored-by: Tore <tore.lonoy@gmail.com> Co-authored-by: Bouke Versteegh <info@boukeversteegh.nl> Co-authored-by: Shahid <shahid@us.ibm.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Long Wu Yuan <longwuyuan@gmail.com> Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Neha Lohia <nehapithadiya444@gmail.com> Co-authored-by: Akshit Grover <akshit.grover2016@gmail.com>
291 lines
7.7 KiB
Go
291 lines
7.7 KiB
Go
/*
|
|
Copyright 2019 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package proxyssl
|
|
|
|
import (
|
|
"testing"
|
|
|
|
api "k8s.io/api/core/v1"
|
|
networking "k8s.io/api/networking/v1"
|
|
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
|
|
"k8s.io/ingress-nginx/internal/ingress/errors"
|
|
"k8s.io/ingress-nginx/internal/ingress/resolver"
|
|
)
|
|
|
|
func buildIngress() *networking.Ingress {
|
|
defaultBackend := networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: "default-backend",
|
|
Port: networking.ServiceBackendPort{
|
|
Number: 80,
|
|
},
|
|
},
|
|
}
|
|
|
|
return &networking.Ingress{
|
|
ObjectMeta: meta_v1.ObjectMeta{
|
|
Name: "foo",
|
|
Namespace: api.NamespaceDefault,
|
|
},
|
|
Spec: networking.IngressSpec{
|
|
DefaultBackend: &networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: "default-backend",
|
|
Port: networking.ServiceBackendPort{
|
|
Number: 80,
|
|
},
|
|
},
|
|
},
|
|
Rules: []networking.IngressRule{
|
|
{
|
|
Host: "foo.bar.com",
|
|
IngressRuleValue: networking.IngressRuleValue{
|
|
HTTP: &networking.HTTPIngressRuleValue{
|
|
Paths: []networking.HTTPIngressPath{
|
|
{
|
|
Path: "/foo",
|
|
Backend: defaultBackend,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
// mocks the resolver for proxySSL
|
|
type mockSecret struct {
|
|
resolver.Mock
|
|
}
|
|
|
|
// GetAuthCertificate from mockSecret mocks the GetAuthCertificate for backend certificate authentication
|
|
func (m mockSecret) GetAuthCertificate(name string) (*resolver.AuthSSLCert, error) {
|
|
if name != "default/demo-secret" {
|
|
return nil, errors.Errorf("there is no secret with name %v", name)
|
|
}
|
|
|
|
return &resolver.AuthSSLCert{
|
|
Secret: "default/demo-secret",
|
|
CAFileName: "/ssl/ca.crt",
|
|
CASHA: "abc",
|
|
}, nil
|
|
|
|
}
|
|
|
|
func TestAnnotations(t *testing.T) {
|
|
ing := buildIngress()
|
|
data := map[string]string{}
|
|
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-secret")] = "default/demo-secret"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-ciphers")] = "HIGH:-SHA"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-name")] = "$host"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-protocols")] = "TLSv1.3 SSLv2 TLSv1 TLSv1.2"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-server-name")] = "on"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-session-reuse")] = "off"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-verify")] = "on"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-verify-depth")] = "3"
|
|
|
|
ing.SetAnnotations(data)
|
|
|
|
fakeSecret := &mockSecret{}
|
|
i, err := NewParser(fakeSecret).Parse(ing)
|
|
if err != nil {
|
|
t.Errorf("Unexpected error with ingress: %v", err)
|
|
}
|
|
|
|
u, ok := i.(*Config)
|
|
if !ok {
|
|
t.Errorf("expected *Config but got %v", u)
|
|
}
|
|
|
|
secret, err := fakeSecret.GetAuthCertificate("default/demo-secret")
|
|
if err != nil {
|
|
t.Errorf("unexpected error getting secret %v", err)
|
|
}
|
|
|
|
if u.AuthSSLCert.Secret != secret.Secret {
|
|
t.Errorf("expected %v but got %v", secret.Secret, u.AuthSSLCert.Secret)
|
|
}
|
|
if u.Ciphers != "HIGH:-SHA" {
|
|
t.Errorf("expected %v but got %v", "HIGH:-SHA", u.Ciphers)
|
|
}
|
|
if u.Protocols != "SSLv2 TLSv1 TLSv1.2 TLSv1.3" {
|
|
t.Errorf("expected %v but got %v", "SSLv2 TLSv1 TLSv1.2 TLSv1.3", u.Protocols)
|
|
}
|
|
if u.Verify != "on" {
|
|
t.Errorf("expected %v but got %v", "on", u.Verify)
|
|
}
|
|
if u.VerifyDepth != 3 {
|
|
t.Errorf("expected %v but got %v", 3, u.VerifyDepth)
|
|
}
|
|
if u.ProxySSLName != "$host" {
|
|
t.Errorf("expected %v but got %v", "$host", u.ProxySSLName)
|
|
}
|
|
if u.ProxySSLServerName != "on" {
|
|
t.Errorf("expected %v but got %v", "on", u.ProxySSLServerName)
|
|
}
|
|
|
|
}
|
|
|
|
func TestInvalidAnnotations(t *testing.T) {
|
|
ing := buildIngress()
|
|
fakeSecret := &mockSecret{}
|
|
data := map[string]string{}
|
|
|
|
// No annotation
|
|
_, err := NewParser(fakeSecret).Parse(ing)
|
|
if err == nil {
|
|
t.Errorf("Expected error with ingress but got nil")
|
|
}
|
|
|
|
// Invalid NameSpace
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-secret")] = "demo-secret"
|
|
ing.SetAnnotations(data)
|
|
_, err = NewParser(fakeSecret).Parse(ing)
|
|
if err == nil {
|
|
t.Errorf("Expected error with ingress but got nil")
|
|
}
|
|
|
|
// Invalid Proxy Certificate
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-secret")] = "default/invalid-demo-secret"
|
|
ing.SetAnnotations(data)
|
|
_, err = NewParser(fakeSecret).Parse(ing)
|
|
if err == nil {
|
|
t.Errorf("Expected error with ingress but got nil")
|
|
}
|
|
|
|
// Invalid optional Annotations
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-secret")] = "default/demo-secret"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-protocols")] = "TLSv111 SSLv1"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-server-name")] = "w00t"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-session-reuse")] = "w00t"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-verify")] = "w00t"
|
|
data[parser.GetAnnotationWithPrefix("proxy-ssl-verify-depth")] = "abcd"
|
|
ing.SetAnnotations(data)
|
|
|
|
i, err := NewParser(fakeSecret).Parse(ing)
|
|
if err != nil {
|
|
t.Errorf("Unexpected error with ingress: %v", err)
|
|
}
|
|
u, ok := i.(*Config)
|
|
if !ok {
|
|
t.Errorf("expected *Config but got %v", u)
|
|
}
|
|
|
|
if u.Protocols != defaultProxySSLProtocols {
|
|
t.Errorf("expected %v but got %v", defaultProxySSLProtocols, u.Protocols)
|
|
}
|
|
if u.Verify != defaultProxySSLVerify {
|
|
t.Errorf("expected %v but got %v", defaultProxySSLVerify, u.Verify)
|
|
}
|
|
if u.VerifyDepth != defaultProxySSLVerifyDepth {
|
|
t.Errorf("expected %v but got %v", defaultProxySSLVerifyDepth, u.VerifyDepth)
|
|
}
|
|
if u.ProxySSLServerName != defaultProxySSLServerName {
|
|
t.Errorf("expected %v but got %v", defaultProxySSLServerName, u.ProxySSLServerName)
|
|
}
|
|
}
|
|
|
|
func TestEquals(t *testing.T) {
|
|
cfg1 := &Config{}
|
|
cfg2 := &Config{}
|
|
|
|
// Same config
|
|
result := cfg1.Equal(cfg1)
|
|
if result != true {
|
|
t.Errorf("Expected true")
|
|
}
|
|
|
|
// compare nil
|
|
result = cfg1.Equal(nil)
|
|
if result != false {
|
|
t.Errorf("Expected false")
|
|
}
|
|
|
|
// Different Certs
|
|
sslCert1 := resolver.AuthSSLCert{
|
|
Secret: "default/demo-secret",
|
|
CAFileName: "/ssl/ca.crt",
|
|
CASHA: "abc",
|
|
}
|
|
sslCert2 := resolver.AuthSSLCert{
|
|
Secret: "default/other-demo-secret",
|
|
CAFileName: "/ssl/ca.crt",
|
|
CASHA: "abc",
|
|
}
|
|
cfg1.AuthSSLCert = sslCert1
|
|
cfg2.AuthSSLCert = sslCert2
|
|
result = cfg1.Equal(cfg2)
|
|
if result != false {
|
|
t.Errorf("Expected false")
|
|
}
|
|
cfg2.AuthSSLCert = sslCert1
|
|
|
|
// Different Ciphers
|
|
cfg1.Ciphers = "DEFAULT"
|
|
cfg2.Ciphers = "HIGH:-SHA"
|
|
result = cfg1.Equal(cfg2)
|
|
if result != false {
|
|
t.Errorf("Expected false")
|
|
}
|
|
cfg2.Ciphers = "DEFAULT"
|
|
|
|
// Different Protocols
|
|
cfg1.Protocols = "SSLv2 TLSv1 TLSv1.2 TLSv1.3"
|
|
cfg2.Protocols = "SSLv3 TLSv1 TLSv1.2 TLSv1.3"
|
|
result = cfg1.Equal(cfg2)
|
|
if result != false {
|
|
t.Errorf("Expected false")
|
|
}
|
|
cfg2.Protocols = "SSLv2 TLSv1 TLSv1.2 TLSv1.3"
|
|
|
|
// Different Verify
|
|
cfg1.Verify = "off"
|
|
cfg2.Verify = "on"
|
|
result = cfg1.Equal(cfg2)
|
|
if result != false {
|
|
t.Errorf("Expected false")
|
|
}
|
|
cfg2.Verify = "off"
|
|
|
|
// Different VerifyDepth
|
|
cfg1.VerifyDepth = 1
|
|
cfg2.VerifyDepth = 2
|
|
result = cfg1.Equal(cfg2)
|
|
if result != false {
|
|
t.Errorf("Expected false")
|
|
}
|
|
cfg2.VerifyDepth = 1
|
|
|
|
// Different ProxySSLServerName
|
|
cfg1.ProxySSLServerName = "off"
|
|
cfg2.ProxySSLServerName = "on"
|
|
result = cfg1.Equal(cfg2)
|
|
if result != false {
|
|
t.Errorf("Expected false")
|
|
}
|
|
cfg2.ProxySSLServerName = "off"
|
|
|
|
// Equal Configs
|
|
result = cfg1.Equal(cfg2)
|
|
if result != true {
|
|
t.Errorf("Expected true")
|
|
}
|
|
}
|