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

Jump to bottom

Update JWT/JWKS policy validation #4160

Merged
merged 12 commits into from
Aug 2, 2023
Merged

Update JWT/JWKS policy validation #4160

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0e140f5
Update JWT / JWKS policy validation
jjngx Jul 27, 2023
4e3d189
Add tests for JWKS with and without tokens
jjngx Aug 1, 2023
7d93066
Validate case when missing keyCache
jjngx Aug 1, 2023
e748c9c
Update error message
jjngx Aug 1, 2023
a666f84
Merge branch 'main' into fix/jws-uri-cache
jjngx Aug 1, 2023
2435b8c
Update error message
jjngx Aug 1, 2023
0129e65
Refactor test helpers - tmpl executors
jjngx Aug 1, 2023
2eafa41
Merge branch 'main' into fix/jws-uri-cache
jjngx Aug 1, 2023
fa17205
Merge branch 'main' into fix/jws-uri-cache
jjngx Aug 2, 2023
b20ace0
Merge branch 'main' into fix/jws-uri-cache
jjngx Aug 2, 2023
92a6b79
Fix typo
jjngx Aug 2, 2023
0fcbd23
Merge branch 'main' into fix/jws-uri-cache
jjngx Aug 2, 2023
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
Prev Previous commit
Next Next commit
Refactor test helpers - tmpl executors
  • Loading branch information
@jjngx
jjngx committed Aug 1, 2023
commit 0129e65b050fcba9b417f6f56cff213e1be783e6
62 changes: 27 additions & 35 deletions internal/configs/version2/templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,27 @@ func createPointerFromInt(n int) *int {
return &n
}

// newExecutor takes VirtualServer and TransportServer templates and returns a test helper func.
//
// Depending on passed arguments returned test helper func creates either NGINXPlus or
// NGINX template executor.
func newExecutor(vsTemplate, tsTemplate string) func(t *testing.T) *TemplateExecutor {
return func(t *testing.T) *TemplateExecutor {
t.Helper()
executor, err := NewTemplateExecutor(vsTemplate, tsTemplate)
if err != nil {
t.Fatal(err)
}
return executor
func newTmplExecutorNGINXPlus(t *testing.T) *TemplateExecutor {
t.Helper()
executor, err := NewTemplateExecutor("nginx-plus.virtualserver.tmpl", "nginx-plus.transportserver.tmpl")
if err != nil {
t.Fatal(err)
}
return executor
}

var (
tmplExecutorNGINXplus = newExecutor(
"nginx-plus.virtualserver.tmpl",
"nginx-plus.transportserver.tmpl",
)
tmplExecutorNGINX = newExecutor(
"nginx.virtualserver.tmpl",
"nginx.transportserver.tmpl",
)
)
func newTmplExecutorNGINX(t *testing.T) *TemplateExecutor {
t.Helper()
executor, err := NewTemplateExecutor("nginx.virtualserver.tmpl", "nginx.transportserver.tmpl")
if err != nil {
t.Fatal(err)
}
return executor
}

func TestVirtualServerForNginxPlus(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
data, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfg)
if err != nil {
t.Errorf("Failed to execute template: %v", err)
Expand All @@ -47,7 +39,7 @@ func TestVirtualServerForNginxPlus(t *testing.T) {

func TestExecuteVirtualServerTemplate_RendersTemplateWithServerGunzipOn(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
got, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfgWithGunzipOn)
if err != nil {
t.Error(err)
Expand All @@ -60,7 +52,7 @@ func TestExecuteVirtualServerTemplate_RendersTemplateWithServerGunzipOn(t *testi

func TestExecuteVirtualServerTemplate_RendersTemplateWithServerGunzipOff(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
got, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfgWithGunzipOff)
if err != nil {
t.Error(err)
Expand All @@ -73,7 +65,7 @@ func TestExecuteVirtualServerTemplate_RendersTemplateWithServerGunzipOff(t *test

func TestExecuteVirtualServerTemplate_RendersTemplateWithServerGunzipNotSet(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
got, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfgWithGunzipNotSet)
if err != nil {
t.Error(err)
Expand All @@ -86,7 +78,7 @@ func TestExecuteVirtualServerTemplate_RendersTemplateWithServerGunzipNotSet(t *t

func TestExecuteVirtualServerTemplate_RendersTemplateWithSessionCookieSameSite(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
got, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfgWithSessionCookieSameSite)
if err != nil {
t.Error(err)
Expand All @@ -99,7 +91,7 @@ func TestExecuteVirtualServerTemplate_RendersTemplateWithSessionCookieSameSite(t

func TestVirtualServerForNginxPlusWithWAFApBundle(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
data, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfgWithWAFApBundle)
if err != nil {
t.Errorf("Failed to execute template: %v", err)
Expand All @@ -109,7 +101,7 @@ func TestVirtualServerForNginxPlusWithWAFApBundle(t *testing.T) {

func TestVirtualServerForNginx(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINX(t)
executor := newTmplExecutorNGINX(t)
data, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfg)
if err != nil {
t.Errorf("Failed to execute template: %v", err)
Expand All @@ -119,7 +111,7 @@ func TestVirtualServerForNginx(t *testing.T) {

func TestTransportServerForNginxPlus(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
data, err := executor.ExecuteTransportServerTemplate(&transportServerCfg)
if err != nil {
t.Errorf("Failed to execute template: %v", err)
Expand All @@ -129,7 +121,7 @@ func TestTransportServerForNginxPlus(t *testing.T) {

func TestExecuteTemplateForTransportServerWithResolver(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
_, err := executor.ExecuteTransportServerTemplate(&transportServerCfgWithResolver)
if err != nil {
t.Errorf("Failed to execute template: %v", err)
Expand All @@ -138,7 +130,7 @@ func TestExecuteTemplateForTransportServerWithResolver(t *testing.T) {

func TestTransportServerForNginx(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINX(t)
executor := newTmplExecutorNGINX(t)
data, err := executor.ExecuteTransportServerTemplate(&transportServerCfg)
if err != nil {
t.Errorf("Failed to execute template: %v", err)
Expand All @@ -148,7 +140,7 @@ func TestTransportServerForNginx(t *testing.T) {

func TestTLSPassthroughHosts(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINX(t)
executor := newTmplExecutorNGINX(t)

unixSocketsCfg := TLSPassthroughHostsConfig{
"app.example.com": "unix:/var/lib/nginx/passthrough-default_secure-app.sock",
Expand All @@ -163,7 +155,7 @@ func TestTLSPassthroughHosts(t *testing.T) {

func TestExecuteVirtualServerTemplateWithJWKSWithToken(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
got, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfgWithJWTPolicyJWKSWithToken)
if err != nil {
t.Error(err)
Expand All @@ -182,7 +174,7 @@ func TestExecuteVirtualServerTemplateWithJWKSWithToken(t *testing.T) {

func TestExecuteVirtualServerTemplateWithJWKSWithoutToken(t *testing.T) {
t.Parallel()
executor := tmplExecutorNGINXplus(t)
executor := newTmplExecutorNGINXPlus(t)
got, err := executor.ExecuteVirtualServerTemplate(&virtualServerCfgWithJWTPolicyJWKSWithoutToken)
if err != nil {
t.Error(err)
Expand Down
Loading