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

Merge pull request #4689 from janosi/upstream_ssl

Browse source 
Server-only authentication of backends and per-location SSL config
This commit is contained in:
Kubernetes Prow Robot 2019-11-18 19:49:43 -08:00 committed by GitHub
commit 4ffc076e0c
5 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/ingress/controller/controller.go
View file

@ -1166,6 +1166,7 @@ func locationApplyAnnotations(loc *ingress.Location, anns *annotations.Ingress)
loc.EnableGlobalAuth = anns.EnableGlobalAuth loc.EnableGlobalAuth = anns.EnableGlobalAuth
loc.HTTP2PushPreload = anns.HTTP2PushPreload loc.HTTP2PushPreload = anns.HTTP2PushPreload
loc.Proxy = anns.Proxy loc.Proxy = anns.Proxy
loc.ProxySSL = anns.ProxySSL
loc.RateLimit = anns.RateLimit loc.RateLimit = anns.RateLimit
loc.Redirect = anns.Redirect loc.Redirect = anns.Redirect
loc.Rewrite = anns.Rewrite loc.Rewrite = anns.Rewrite

1
internal/ingress/controller/store/backend_ssl.go
View file

@ -115,6 +115,7 @@ func (s *k8sStore) getPemCertificate(secretName string) (*ingress.SSLCert, error
return nil, fmt.Errorf("error while storing certificate and key: %v", err) return nil, fmt.Errorf("error while storing certificate and key: %v", err)
} }
sslCert.PemFileName = path
sslCert.CACertificate = caCert sslCert.CACertificate = caCert
sslCert.CAFileName = path sslCert.CAFileName = path
sslCert.CASHA = file.SHA1(path) sslCert.CASHA = file.SHA1(path)

1
internal/ingress/controller/store/store.go
View file

@ -843,6 +843,7 @@ func (s *k8sStore) GetAuthCertificate(name string) (*resolver.AuthSSLCert, error
CASHA: cert.CASHA, CASHA: cert.CASHA,
CRLFileName: cert.CRLFileName, CRLFileName: cert.CRLFileName,
CRLSHA: cert.CRLSHA, CRLSHA: cert.CRLSHA,
PemFileName: cert.PemFileName,
}, nil }, nil
} }

2
internal/ingress/resolver/main.go
View file

@ -56,6 +56,8 @@ type AuthSSLCert struct {
CRLFileName string `json:"crlFileName"` CRLFileName string `json:"crlFileName"`
// CRLSHA contains the SHA1 hash of the 'ca.crl' file // CRLSHA contains the SHA1 hash of the 'ca.crl' file
CRLSHA string `json:"crlSha"` CRLSHA string `json:"crlSha"`
// PemFileName contains the path to the secrets 'tls.crt' and 'tls.key'
PemFileName string `json:"pemFilename"`
} }
// Equal tests for equality between two AuthSSLCert types // Equal tests for equality between two AuthSSLCert types

20
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -818,8 +818,6 @@ stream {
{{ if not (empty $server.ProxySSL.CAFileName) }} {{ if not (empty $server.ProxySSL.CAFileName) }}
# PEM sha: {{ $server.ProxySSL.CASHA }} # PEM sha: {{ $server.ProxySSL.CASHA }}
proxy_ssl_certificate {{ $server.ProxySSL.CAFileName }};
proxy_ssl_certificate_key {{ $server.ProxySSL.CAFileName }};
proxy_ssl_trusted_certificate {{ $server.ProxySSL.CAFileName }}; proxy_ssl_trusted_certificate {{ $server.ProxySSL.CAFileName }};
proxy_ssl_ciphers {{ $server.ProxySSL.Ciphers }}; proxy_ssl_ciphers {{ $server.ProxySSL.Ciphers }};
proxy_ssl_protocols {{ $server.ProxySSL.Protocols }}; proxy_ssl_protocols {{ $server.ProxySSL.Protocols }};
@ -827,6 +825,11 @@ stream {
proxy_ssl_verify_depth {{ $server.ProxySSL.VerifyDepth }}; proxy_ssl_verify_depth {{ $server.ProxySSL.VerifyDepth }};
{{ end }} {{ end }}
{{ if not (empty $server.ProxySSL.PemFileName) }}
proxy_ssl_certificate {{ $server.ProxySSL.PemFileName }};
proxy_ssl_certificate_key {{ $server.ProxySSL.PemFileName }};
{{ end }}
{{ if not (empty $server.SSLCiphers) }} {{ if not (empty $server.SSLCiphers) }}
ssl_ciphers {{ $server.SSLCiphers }}; ssl_ciphers {{ $server.SSLCiphers }};
{{ end }} {{ end }}
@ -1287,6 +1290,19 @@ stream {
# Location denied. Reason: {{ $location.Denied | quote }} # Location denied. Reason: {{ $location.Denied | quote }}
return 503; return 503;
{{ end }} {{ end }}
{{ if not (empty $location.ProxySSL.CAFileName) }}
# PEM sha: {{ $location.ProxySSL.CASHA }}
proxy_ssl_trusted_certificate {{ $location.ProxySSL.CAFileName }};
proxy_ssl_ciphers {{ $location.ProxySSL.Ciphers }};
proxy_ssl_protocols {{ $location.ProxySSL.Protocols }};
proxy_ssl_verify {{ $location.ProxySSL.Verify }};
proxy_ssl_verify_depth {{ $location.ProxySSL.VerifyDepth }};
{{ end }}
{{ if not (empty $location.ProxySSL.PemFileName) }}
proxy_ssl_certificate {{ $location.ProxySSL.PemFileName }};
proxy_ssl_certificate_key {{ $location.ProxySSL.PemFileName }};
{{ end }}
} }
{{ end }} {{ end }}
{{ end }} {{ end }}