Commit Graph

85 Commits

Author SHA1 Message Date
Fernando Diaz 5195600841 Allows ModSecurity to be configured per location
The following annotations will be added:

- enable-modsecurity
- enable-owasp-core-rules
- modsecurity-transaction-id

Fixes #3167
2018-11-06 22:24:31 -06:00
k8s-ci-robot 17cad51e47
Merge pull request #3341 from Shopify/canary_upstream
Add canary annotation and alternative backends for traffic shaping
2018-11-06 12:22:16 -08:00
Conor Landry 412cd70d3a implement canary annotation and alternative backends
Adds the ability to create alternative backends. Alternative backends enable
traffic shaping by sharing a single location but routing to different
backends depending on the TrafficShapingPolicy defined by AlternativeBackends.

When the list of upstreams and servers are retrieved, we then call
mergeAlternativeBackends which iterates through the paths of every ingress
and checks if the backend supporting the path is a AlternativeBackend. If
so, we then iterate through the map of servers and find the real backend
that the AlternativeBackend should fall under. Once found, the
AlternativeBackend is embedded in the list of VirtualBackends for the real
backend.

If no matching real backend for a AlternativeBackend is found, then the
AlternativeBackend is deleted as it cannot be backed by any server.
2018-11-06 13:13:14 -05:00
k8s-ci-robot 265f96bf14
Merge pull request #3344 from ecosia/jg-customerrors-per-ingress
Adds CustomHTTPErrors ingress annotation and test
2018-11-06 09:21:49 -08:00
jasongwartz 0ebf0354cb Adds CustomHTTPErrors ingress annotation and test
Adds per-server/location error-catch functionality to nginx template

Adds documentation

Reduces template duplication with helper function for CUSTOM_ERRORS data

Updates documentation

Adds e2e test for customerrors

Removes AllCustomHTTPErrors, replaces with template function with deduplication and adds e2e test of deduplication

Fixes copy-paste error in test, adds additional test cases

Reverts noop change in controller.go (unused now)
2018-11-06 16:47:52 +01:00
Adnan Baruni b511333130 add support for auth-snippet annotation
add test for new auth-snippet annotation

document auth-snippet annotation

add e2e test for auth-snippet annotation

add log warning and update documentation
2018-11-05 16:02:29 -06:00
Fernando Diaz 290488a505 Add e2e test for ssl-redirect
Adds the e2e test for the ssl-redirect annotation.
Part of the #3124 effort.
2018-11-04 03:16:03 -06:00
liuwei 5febef5e69 Use second as cookie expires unit 2018-11-02 20:07:23 +08:00
liuwei 25a839c9df Use second as cookie expires unit 2018-11-02 19:02:32 +08:00
liuwei e22e7e6e95 Merge remote-tracking branch 'upstream/master' 2018-11-02 18:35:41 +08:00
liuwei f48e0162a3 Use second as cookie expires unit 2018-11-02 18:13:54 +08:00
liuwei c74e59fa4c Use second as cookie expires unit 2018-11-02 17:05:38 +08:00
Fernando Diaz 71f97c400a Add e2e test for session-cookie-hash
Adds the e2e test for the session-cookie-hash annotation.
Part of the #3124 effort.
2018-11-01 23:44:22 -05:00
Manuel Alejandro de Brito Fontes c9668dd40b
Fix e2e tests 2018-10-30 13:35:31 -03:00
k8s-ci-robot 5671c1718f
Merge pull request #3322 from aledbf/tests-cleanup
Remove e2e boilerplate
2018-10-30 08:40:23 -07:00
Elvin Efendi 91a12ffd52 sticky session e2e test 2018-10-30 16:12:54 +04:00
Manuel Alejandro de Brito Fontes 83dc4607c5
Remove e2e boilerplate 2018-10-29 22:38:15 -03:00
Manuel Alejandro de Brito Fontes fed013ab6f Fix status update in case of connection errors 2018-10-29 13:01:41 -03:00
k8s-ci-robot 0e2ac454cb
Merge pull request #3301 from diazjf/e2e-whitelist
Add e2e tests for IP Whitelist
2018-10-26 13:28:00 -07:00
Fernando Diaz 49ac77e01b Add e2e tests for IP Whitelist
Adds e2e test for the whitelist-source-range annotation.
Part of the #3124 effort.
2018-10-26 14:56:11 -05:00
k8s-ci-robot a2062cbdac
Merge pull request #3305 from aramase/approot-e2e-test
Add e2e test for app-root
2018-10-26 10:53:49 -07:00
k8s-ci-robot e48a1aaa59
Merge pull request #3302 from diazjf/e2e-server-snippet
Add e2e test for server snippet
2018-10-26 10:51:47 -07:00
Fernando Diaz 213be6103f Add e2e test for server snippet
Adds the e2e test for server snippet. Similar test to the
configuration snippet. Part of the #3124 effort.
2018-10-26 11:56:33 -05:00
Anish Ramasekar d3a82f7b04
enhance test logic 2018-10-26 11:21:44 -05:00
Anish Ramasekar 519c30ea70
Add e2e test for app-root 2018-10-26 11:12:44 -05:00
Anish Ramasekar 04e6f7bd82
Add e2e test for force-ssl-redirect 2018-10-26 10:02:09 -05:00
k8s-ci-robot 063f652711
Merge pull request #3187 from DesmondHoLLM/feature/annotations-resty-lua
UPT: annotation enhancement for resty-lua-waf
2018-10-25 00:06:03 -07:00
Desmond Ho bf03046a80 UPT: updated e2e test and default true for process-multipart-body annotation 2018-10-25 14:17:38 +08:00
Desmond Ho 3c2c0d0858 UPT: updated e2e testing title for lua test 2018-10-24 18:30:43 +08:00
k8s-ci-robot 01854c9113
Merge pull request #3281 from aramase/log-e2e-test
Add e2e test for log
2018-10-23 19:37:51 -07:00
Anish Ramasekar a0b76569b7
Add e2e test for log 2018-10-23 13:11:01 -05:00
Anish Ramasekar 80ca063801
Add e2e test for from-to-www-redirect 2018-10-23 12:48:23 -05:00
Anish Ramasekar e0ea0671a7
Add e2e test for configuration snippet 2018-10-22 16:36:35 -05:00
Desmond Ho bab521e81a UPT: align waf options 2018-10-20 12:46:39 +08:00
Desmond Ho 04a89ce234 UPT: annotation enhancement for resty-lua-waf 2018-10-20 12:09:38 +08:00
Fernando Diaz b503c6bdeb Add e2e Tests for AuthTLS
Adds E2E tests for the following annotations:

- auth-tls-secret
- auth-tls-verify-depth
- auth-tls-verify-client
- auth-tls-error-page
- auth-tls-pass-certificate-to-upstream
2018-10-18 20:09:21 -05:00
Anish Ramasekar 441cd3dcb5
Add e2e test for connection 2018-10-17 16:37:27 -05:00
Anish Ramasekar 6d312d12d2
Add e2e tests for upstream vhost
update test

update test
2018-10-17 15:51:18 -05:00
Anish Ramasekar 48da443e67
Added e2e tests for backend protocols
update test for backendprotocols
2018-10-12 15:55:56 -05:00
k8s-ci-robot 3edf11b85f
Merge pull request #3198 from aledbf/only-dynamic
Only support dynamic configuration
2018-10-10 05:07:34 -07:00
Manuel Alejandro de Brito Fontes 74c2f93de6
Only support dynamic configuration 2018-10-09 22:05:45 -03:00
Fernando Diaz 44a11898d8 Refactor e2e Tests to use common helper function
Each e2e test is creating the same(or similar) Ingress Resource in
different ways. This makes common ingress resource creation be
performed by a framework  method, reducing code duplication
2018-10-09 11:12:11 -05:00
Elvin Efendi 78f12c25c5 delete upstream healthcheck annotation 2018-10-09 09:14:13 -04:00
Fernando Diaz 527805f296 Add E2E tests for HealthCheck
Adds e2e tests for:

- upstream-max-fails
- upstream-fail-timeout
2018-10-08 13:17:19 -05:00
k8s-ci-robot b46523a1f4
Merge pull request #3149 from diazjf/proxy-e2e-tests
Add e2e Tests for Proxy Annotations
2018-10-05 05:15:09 -07:00
Zenara Daley bd3f56eaa0 allow curly braces to be used in regex paths 2018-10-04 10:58:38 -04:00
Fernando Diaz c981a65058 Add e2e Tests for Proxy Annotations
Adds e2e tests for the following annotations:

- proxy-body-size
- proxy-connect-timeout
- proxy-send-timeout
- proxy-read-timeout
- proxy-buffering
- proxy-buffer-size
- proxy-request-buffering
- proxy-next-upstream
- proxy-next-upstream-tries
- proxy-cookie-domain
- proxy-cookie-path

and also updates some documentation.
2018-10-01 16:10:09 -05:00
k8s-ci-robot d9f58144eb
Merge pull request #3145 from Shopify/regex-modifier
Add "use-regex" Annotation to Toggle Regular Expression Location Modifier
2018-10-01 11:31:43 -07:00
Zenara Daley f29bdc3e8d Add 'use regex' annotation to toggle nginx regex location modifier 2018-10-01 13:54:11 -04:00
Fernando Diaz 75975d74fb Add e2e test for SSL-Ciphers
Adds tests to make sure SSL-Ciphers are configurable via annotation
2018-09-27 14:23:02 -05:00