DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4597 from Shopify/improve-tls-hsts-test

Browse source 
more meaningful assertion for tls hsts test
This commit is contained in:
Kubernetes Prow Robot 2019-09-24 13:55:58 -07:00 committed by GitHub
commit 75490fa309
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/e2e/settings/tls.go
View file

@ -119,11 +119,6 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
By("setting max-age parameter") By("setting max-age parameter")
f.UpdateNginxConfigMapData(hstsMaxAge, "86400") f.UpdateNginxConfigMapData(hstsMaxAge, "86400")
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "Strict-Transport-Security: max-age=86400; includeSubDomains\"")
})
resp, _, errs := gorequest.New(). resp, _, errs := gorequest.New().
Get(f.GetURL(framework.HTTPS)). Get(f.GetURL(framework.HTTPS)).
TLSClientConfig(tlsConfig). TLSClientConfig(tlsConfig).
@ -132,16 +127,11 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Expect(errs).Should(BeEmpty()) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Strict-Transport-Security")).Should(ContainSubstring("max-age=86400")) Expect(resp.Header.Get("Strict-Transport-Security")).Should(Equal("max-age=86400; includeSubDomains"))
By("setting includeSubDomains parameter") By("setting includeSubDomains parameter")
f.UpdateNginxConfigMapData(hstsIncludeSubdomains, "false") f.UpdateNginxConfigMapData(hstsIncludeSubdomains, "false")
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "Strict-Transport-Security: max-age=86400\"")
})
resp, _, errs = gorequest.New(). resp, _, errs = gorequest.New().
Get(f.GetURL(framework.HTTPS)). Get(f.GetURL(framework.HTTPS)).
TLSClientConfig(tlsConfig). TLSClientConfig(tlsConfig).
@ -150,16 +140,11 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Expect(errs).Should(BeEmpty()) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Strict-Transport-Security")).ShouldNot(ContainSubstring("includeSubDomains")) Expect(resp.Header.Get("Strict-Transport-Security")).Should(Equal("max-age=86400"))
By("setting preload parameter") By("setting preload parameter")
f.UpdateNginxConfigMapData(hstsPreload, "true") f.UpdateNginxConfigMapData(hstsPreload, "true")
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "Strict-Transport-Security: max-age=86400; preload\"")
})
resp, _, errs = gorequest.New(). resp, _, errs = gorequest.New().
Get(f.GetURL(framework.HTTPS)). Get(f.GetURL(framework.HTTPS)).
TLSClientConfig(tlsConfig). TLSClientConfig(tlsConfig).
@ -168,7 +153,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Expect(errs).Should(BeEmpty()) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Strict-Transport-Security")).Should(ContainSubstring("preload")) Expect(resp.Header.Get("Strict-Transport-Security")).Should(Equal("max-age=86400; preload"))
}) })
It("should not use ports during the HTTP to HTTPS redirection", func() { It("should not use ports during the HTTP to HTTPS redirection", func() {