Skip to content

Commit

Permalink
Merge refs/heads/main into cors_on_direct_response
Browse files Browse the repository at this point in the history
  • Loading branch information
@soloio-bulldozer
soloio-bulldozer[bot] authored Jun 30, 2023
2 parents 5d7e0f5 + d7f795f commit 03df91f
Show file tree
Hide file tree
Showing 3 changed files with 154 additions and 2 deletions.
6 changes: 6 additions & 0 deletions changelog/v1.15.0-beta16/aggregate-filter-translator-panic.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
changelog:
- type: FIX
issueLink: https://github.com/solo-io/gloo/issues/8405
description: >
Fix a panic caused by a nil pointer dereference when reporting errors in
aggregate filter translator
16 changes: 14 additions & 2 deletions projects/gloo/pkg/utils/validation/proxy_validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,32 @@ func MakeReport(proxy *v1.Proxy) *validation.ProxyReport {
}
case *v1.Listener_AggregateListener:
httpListenerReports := make(map[string]*validation.HttpListenerReport)
tcpListenerReports := make(map[string]*validation.TcpListenerReport)
httpResources := listenerType.AggregateListener.GetHttpResources()
for _, httpFilterChain := range listenerType.AggregateListener.GetHttpFilterChains() {
var virtualHosts []*v1.VirtualHost
for _, vhostRef := range httpFilterChain.GetVirtualHostRefs() {
virtualHosts = append(virtualHosts, httpResources.GetVirtualHosts()[vhostRef])
}

httListenerReport := &validation.HttpListenerReport{
httpListenerReport := &validation.HttpListenerReport{
VirtualHostReports: makeVhostReports(virtualHosts),
}
httpListenerReports[utils.MatchedRouteConfigName(listener, httpFilterChain.GetMatcher())] = httListenerReport
httpListenerReports[utils.MatchedRouteConfigName(listener, httpFilterChain.GetMatcher())] = httpListenerReport
}

for _, tcpListener := range listenerType.AggregateListener.GetTcpListeners() {
tcpListenerReport := &validation.TcpListenerReport{
TcpHostReports: makeTcpHostReports(tcpListener.GetTcpListener().GetTcpHosts()),
}
tcpListenerReports[utils.MatchedRouteConfigName(listener, tcpListener.GetMatcher())] = tcpListenerReport
}

listenerReports[i] = &validation.ListenerReport{
ListenerTypeReport: &validation.ListenerReport_AggregateListenerReport{
AggregateListenerReport: &validation.AggregateListenerReport{
HttpListenerReports: httpListenerReports,
TcpListenerReports: tcpListenerReports,
},
},
}
Expand Down Expand Up @@ -216,6 +225,9 @@ func GetProxyError(proxyRpt *validation.ProxyReport) error {
for _, httpListenerReport := range listenerType.AggregateListenerReport.GetHttpListenerReports() {
errs = append(errs, getHttpListenerReportErrs(httpListenerReport)...)
}
for _, tcpListenerReport := range listenerType.AggregateListenerReport.GetTcpListenerReports() {
errs = append(errs, getTcpListenerReportErrs(tcpListenerReport)...)
}
}
}

Expand Down
134 changes: 134 additions & 0 deletions projects/gloo/pkg/utils/validation/proxy_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package validation_test
import (
"fmt"

"github.com/solo-io/gloo/projects/gloo/pkg/defaults"
"github.com/solo-io/gloo/projects/gloo/pkg/utils"

. "github.com/onsi/ginkgo/v2"
Expand Down Expand Up @@ -115,6 +116,35 @@ var _ = Describe("validation utils", func() {
}
return proxy
}
makeInvalidAggregateListenerProxyTcp := func() *v1.Proxy {
proxy := makeHybridProxy()
proxy.Listeners = []*v1.Listener{{
Name: "aggregate-listener",
BindAddress: "::",
BindPort: defaults.HttpPort,
ListenerType: &v1.Listener_AggregateListener{
AggregateListener: &v1.AggregateListener{
TcpListeners: []*v1.MatchedTcpListener{{
Matcher: &v1.Matcher{
SourcePrefixRanges: []*v3.CidrRange{{
AddressPrefix: "tcp-0",
}},
},
TcpListener: nil,
}},
HttpResources: &v1.AggregateListener_HttpResources{},
HttpFilterChains: []*v1.AggregateListener_HttpFilterChain{{
Matcher: &v1.Matcher{
SourcePrefixRanges: []*v3.CidrRange{{
AddressPrefix: "http-0",
}},
},
}},
},
},
}}
return proxy
}

var _ = Describe("MakeReport", func() {
It("generates a report which matches an http proxy", func() {
Expand Down Expand Up @@ -186,6 +216,16 @@ var _ = Describe("validation utils", func() {
}
}
})

It("properly instantiates TCP reports in aggregate listeners", func() {
// fixes a crash reported in
// https://github.com/solo-io/gloo/issues/8405
proxy := makeInvalidAggregateListenerProxyTcp()
proxyReports := MakeReport(proxy)
Expect(proxyReports.GetListenerReports()).To(HaveLen(1))
tcpListenerReports := proxyReports.GetListenerReports()[0].GetAggregateListenerReport().GetTcpListenerReports()
Expect(tcpListenerReports).To(HaveLen(1))
})
})

var _ = Describe("GetProxyError", func() {
Expand Down Expand Up @@ -225,6 +265,69 @@ var _ = Describe("validation utils", func() {
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("VirtualHost Error: DomainsNotUniqueError. Reason: domains not unique; Listener Error: BindPortNotUniqueError. Reason: bind port not unique; HttpListener Error: ProcessingError. Reason: bad http plugin"))
})
It("aggregates the errors at every level for aggregate listener", func() {
proxy := makeInvalidAggregateListenerProxyTcp()
rpt := MakeReport(proxy)

rpt.ListenerReports[0].Errors = append(rpt.ListenerReports[0].Errors,
&validation.ListenerReport_Error{
Type: validation.ListenerReport_Error_BindPortNotUniqueError,
Reason: "bind port not unique",
},
)

tcpMatcher := &v1.Matcher{
SourcePrefixRanges: []*v3.CidrRange{
&v3.CidrRange{
AddressPrefix: "tcp-0",
},
},
}
tcpListenerReport := rpt.ListenerReports[0].ListenerTypeReport.(*validation.ListenerReport_AggregateListenerReport).AggregateListenerReport.TcpListenerReports[utils.MatchedRouteConfigName(proxy.GetListeners()[0], tcpMatcher)]

// populate the errors - we should hit all cases in
// getTcpListenerReportErrs with the errors we create here
tcpListenerReport.Errors = append(tcpListenerReport.Errors,
&validation.TcpListenerReport_Error{
Type: validation.TcpListenerReport_Error_SSLConfigError,
Reason: "test SSLConfig Error",
},
)
tcpListenerReport.TcpHostReports = append(tcpListenerReport.TcpHostReports,
&validation.TcpHostReport{
Errors: []*validation.TcpHostReport_Error{
{
Type: validation.TcpHostReport_Error_InvalidDestinationError,
Reason: "testing invalid destination error",
},
{
Type: validation.TcpHostReport_Error_ProcessingError,
Reason: "testing processing error",
},
},
})

httpMatcher := &v1.Matcher{
SourcePrefixRanges: []*v3.CidrRange{
&v3.CidrRange{
AddressPrefix: "http-0",
},
},
}
httpListenerReport := rpt.ListenerReports[0].ListenerTypeReport.(*validation.ListenerReport_AggregateListenerReport).AggregateListenerReport.HttpListenerReports[utils.MatchedRouteConfigName(proxy.GetListeners()[0], httpMatcher)]
httpListenerReport.Errors = append(httpListenerReport.Errors, &validation.HttpListenerReport_Error{
Type: validation.HttpListenerReport_Error_ProcessingError,
Reason: "bad http plugin",
})

err := GetProxyError(rpt)
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("HttpListener Error: ProcessingError. Reason: bad http plugin"))
Expect(err.Error()).To(ContainSubstring("Listener Error: BindPortNotUniqueError. Reason: bind port not unique"))
Expect(err.Error()).To(ContainSubstring("TcpListener Error: SSLConfigError. Reason: test SSLConfig Error"))
Expect(err.Error()).To(ContainSubstring("TcpHost Error: InvalidDestinationError. Reason: testing invalid destination error"))
Expect(err.Error()).To(ContainSubstring("TcpHost Error: ProcessingError. Reason: testing processing error"))
})
It("aggregates the errors at every level for hybrid listener", func() {
proxy := makeHybridProxy()
rpt := MakeReport(proxy)
Expand All @@ -235,6 +338,13 @@ var _ = Describe("validation utils", func() {
Reason: "bind port not unique",
},
)
tcpMatcher := &v1.Matcher{
SourcePrefixRanges: []*v3.CidrRange{
&v3.CidrRange{
AddressPrefix: "tcp-0",
},
},
}
httpMatcher := &v1.Matcher{
SourcePrefixRanges: []*v3.CidrRange{
&v3.CidrRange{
Expand Down Expand Up @@ -266,11 +376,35 @@ var _ = Describe("validation utils", func() {
},
)

tcpListenerReport := rpt.ListenerReports[2].ListenerTypeReport.(*validation.ListenerReport_HybridListenerReport).HybridListenerReport.MatchedListenerReports[utils.MatchedRouteConfigName(proxy.GetListeners()[2], tcpMatcher)].GetTcpListenerReport()
tcpListenerReport.Errors = append(tcpListenerReport.Errors,
&validation.TcpListenerReport_Error{
Type: validation.TcpListenerReport_Error_SSLConfigError,
Reason: "test SSLConfig Error",
},
)
tcpListenerReport.TcpHostReports = append(tcpListenerReport.TcpHostReports,
&validation.TcpHostReport{
Errors: []*validation.TcpHostReport_Error{
{
Type: validation.TcpHostReport_Error_InvalidDestinationError,
Reason: "testing invalid destination error",
},
{
Type: validation.TcpHostReport_Error_ProcessingError,
Reason: "testing processing error",
},
},
})

err := GetProxyError(rpt)
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("VirtualHost Error: DomainsNotUniqueError. Reason: domains not unique"))
Expect(err.Error()).To(ContainSubstring("Listener Error: BindPortNotUniqueError. Reason: bind port not unique"))
Expect(err.Error()).To(ContainSubstring("HttpListener Error: ProcessingError. Reason: bad http plugin"))
Expect(err.Error()).To(ContainSubstring("TcpListener Error: SSLConfigError. Reason: test SSLConfig Error"))
Expect(err.Error()).To(ContainSubstring("TcpHost Error: InvalidDestinationError. Reason: testing invalid destination error"))
Expect(err.Error()).To(ContainSubstring("TcpHost Error: ProcessingError. Reason: testing processing error"))
})

})
Expand Down

0 comments on commit 03df91f

Please sign in to comment.