Skip to content
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

Allows secure backend configuration from global #1119

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Allows secure backend configuration from global #1119

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
34 changes: 22 additions & 12 deletions pkg/converters/ingress/annotations/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,15 +802,20 @@ func (c *updater) buildBackendProtocol(d *backData) {
return
}
if crt := d.mapper.Get(ingtypes.BackSecureCrtSecret); crt.Value != "" {
if crtFile, err := c.cache.GetTLSSecretPath(
crt.Source.Namespace,
crt.Value,
[]convtypes.TrackingRef{{Context: convtypes.ResourceHABackend, UniqueName: d.backend.ID}},
); err == nil {
var crtFile convtypes.CrtFile
namespace, name, err := crt.NamespacedName()
if err == nil {
crtFile, err = c.cache.GetTLSSecretPath(
namespace,
name,
[]convtypes.TrackingRef{{Context: convtypes.ResourceHABackend, UniqueName: d.backend.ID}},
)
}
if err == nil {
d.backend.Server.CrtFilename = crtFile.Filename
d.backend.Server.CrtHash = crtFile.SHA1Hash
} else {
c.logger.Warn("skipping client certificate on %v: %v", crt.Source, err)
c.logger.Warn("skipping client certificate on %s: %v", crt.Source.String(), err)
}
}
if sni := d.mapper.Get(ingtypes.BackSecureSNI); sni.Value != "" {
Expand All @@ -835,17 +840,22 @@ func (c *updater) buildBackendProtocol(d *backData) {
}
}
if ca := d.mapper.Get(ingtypes.BackSecureVerifyCASecret); ca.Value != "" {
if caFile, crlFile, err := c.cache.GetCASecretPath(
ca.Source.Namespace,
ca.Value,
[]convtypes.TrackingRef{{Context: convtypes.ResourceHABackend, UniqueName: d.backend.ID}},
); err == nil {
var caFile, crlFile convtypes.File
namespace, name, err := ca.NamespacedName()
if err == nil {
caFile, crlFile, err = c.cache.GetCASecretPath(
namespace,
name,
[]convtypes.TrackingRef{{Context: convtypes.ResourceHABackend, UniqueName: d.backend.ID}},
)
}
if err == nil {
d.backend.Server.CAFilename = caFile.Filename
d.backend.Server.CAHash = caFile.SHA1Hash
d.backend.Server.CRLFilename = crlFile.Filename
d.backend.Server.CRLHash = crlFile.SHA1Hash
} else {
c.logger.Warn("skipping CA on %v: %v", ca.Source, err)
c.logger.Warn("skipping CA on %s: %v", ca.Source.String(), err)
}
}
}
Expand Down
68 changes: 58 additions & 10 deletions pkg/converters/ingress/annotations/backend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,7 +2117,7 @@ func TestBackendServerNaming(t *testing.T) {

func TestBackendProtocol(t *testing.T) {
testCase := []struct {
source Source
source *Source
useHTX bool
annDefault map[string]string
ann map[string]map[string]string
Expand Down Expand Up @@ -2153,7 +2153,7 @@ func TestBackendProtocol(t *testing.T) {
},
// 2
{
source: Source{Namespace: "default", Name: "app1", Type: "service"},
source: &Source{Namespace: "default", Name: "app1", Type: "service"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackSecureBackends: "true",
Expand All @@ -2172,7 +2172,7 @@ func TestBackendProtocol(t *testing.T) {
},
// 3
{
source: Source{Namespace: "default", Name: "app1", Type: "service"},
source: &Source{Namespace: "default", Name: "app1", Type: "service"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackSecureBackends: "true",
Expand All @@ -2197,7 +2197,7 @@ func TestBackendProtocol(t *testing.T) {
},
// 4
{
source: Source{Namespace: "default", Name: "app1", Type: "service"},
source: &Source{Namespace: "default", Name: "app1", Type: "service"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackSecureBackends: "true",
Expand Down Expand Up @@ -2278,7 +2278,7 @@ WARN skipping CA on service 'default/app1': secret not found: 'default/ca'`,
},
// 10
{
source: Source{Namespace: "default", Name: "app1", Type: "service"},
source: &Source{Namespace: "default", Name: "app1", Type: "service"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackBackendProtocol: "invalid-ssl",
Expand All @@ -2289,7 +2289,7 @@ WARN skipping CA on service 'default/app1': secret not found: 'default/ca'`,
},
// 11
{
source: Source{Namespace: "default", Name: "app1", Type: "service"},
source: &Source{Namespace: "default", Name: "app1", Type: "service"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackBackendProtocol: "h2",
Expand Down Expand Up @@ -2344,7 +2344,7 @@ WARN skipping CA on service 'default/app1': secret not found: 'default/ca'`,
},
// 15
{
source: Source{Namespace: "default", Name: "app", Type: "ingress"},
source: &Source{Namespace: "default", Name: "app", Type: "ingress"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackBackendProtocol: "h1-ssl",
Expand Down Expand Up @@ -2373,7 +2373,7 @@ WARN skipping CA on service 'default/app1': secret not found: 'default/ca'`,
},
// 17
{
source: Source{Namespace: "default", Name: "app", Type: "ingress"},
source: &Source{Namespace: "default", Name: "app", Type: "ingress"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackBackendProtocol: "h1-ssl",
Expand Down Expand Up @@ -2416,7 +2416,7 @@ WARN skipping CA on service 'default/app1': secret not found: 'default/ca'`,
},
// 20
{
source: Source{Namespace: "default", Name: "app", Type: "ingress"},
source: &Source{Namespace: "default", Name: "app", Type: "ingress"},
ann: map[string]map[string]string{
"/": {
ingtypes.BackBackendProtocol: "h1-ssl",
Expand All @@ -2429,10 +2429,58 @@ WARN skipping CA on service 'default/app1': secret not found: 'default/ca'`,
},
logging: `WARN skipping invalid domain (verify-hostname) on ingress 'default/app': invalid-domain`,
},
// 21
{
ann: map[string]map[string]string{
"/": {
ingtypes.BackSecureBackends: "true",
ingtypes.BackSecureCrtSecret: "cli",
ingtypes.BackSecureVerifyCASecret: "ca",
},
},
tlsSecrets: map[string]string{
"default/cli": "/var/haproxy/ssl/cli.pem",
},
caSecrets: map[string]string{
"default/ca": "/var/haproxy/ssl/ca.pem",
},
expected: hatypes.ServerConfig{
Protocol: "h1",
Secure: true,
},
logging: `
WARN skipping client certificate on <global>: a globally configured resource name is missing the namespace: cli
WARN skipping CA on <global>: a globally configured resource name is missing the namespace: ca
`,
},
// 22
{
ann: map[string]map[string]string{
"/": {
ingtypes.BackSecureBackends: "true",
ingtypes.BackSecureCrtSecret: "default/cli",
ingtypes.BackSecureVerifyCASecret: "default/ca",
},
},
tlsSecrets: map[string]string{
"default/cli": "/var/haproxy/ssl/cli.pem",
},
caSecrets: map[string]string{
"default/ca": "/var/haproxy/ssl/ca.pem",
},
expected: hatypes.ServerConfig{
Protocol: "h1",
Secure: true,
CAFilename: "/var/haproxy/ssl/ca.pem",
CAHash: "3be93154b1cddfd0e1279f4d76022221676d08c7",
CrtFilename: "/var/haproxy/ssl/cli.pem",
CrtHash: "f916dd295030e070f4d4aca4508571bc82f549af",
},
},
}
for i, test := range testCase {
c := setup(t)
d := c.createBackendMappingData("default/app", &test.source, test.annDefault, test.ann, test.paths)
d := c.createBackendMappingData("default/app", test.source, test.annDefault, test.ann, test.paths)
c.haproxy.Global().UseHTX = test.useHTX
c.cache.SecretTLSPath = test.tlsSecrets
c.cache.SecretCAPath = test.caSecrets
Expand Down
18 changes: 18 additions & 0 deletions pkg/converters/ingress/annotations/mapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,21 @@ func (cv *ConfigValue) String() string {
return cv.Value
}

// NamespacedName ...
func (cv *ConfigValue) NamespacedName() (namespace, name string, err error) {
value := strings.Split(cv.Value, "/")
if len(value) > 2 {
return "", "", fmt.Errorf("unpexpected format for resource name: %s", cv.Value)
}
if len(value) == 2 {
return value[0], value[1], nil
}
if s := cv.Source; s != nil {
return s.Namespace, value[0], nil
}
return "", "", fmt.Errorf("a globally configured resource name is missing the namespace: %s", cv.Value)
}

// ToLower ...
func (cv *ConfigValue) ToLower() string {
return strings.ToLower(cv.Value)
Expand Down Expand Up @@ -240,5 +255,8 @@ func (m *PathConfig) String() string {

// String ...
func (s *Source) String() string {
if s == nil {
return "<global>"
}
return fmt.Sprintf("%s '%s'", s.Type, s.FullName())
}
Loading