3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-31 01:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

config: extra CA and CRL validation (#4455)

Browse source 
Return an error from DownstreamMTLSSettings.validate() if both CA and
CAFile are populated, or if both CRL and CRLFile are populated.
This commit is contained in:
Kenneth Jenkins 2023-08-10 16:15:11 -07:00 • committed by GitHub
parent 50e6cf7466
commit ed9a93fe5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/mtls.go
View file

@ -116,10 +116,15 @@ func (s *DownstreamMTLSSettings) GetMaxVerifyDepth() uint32 {
} }
func (s *DownstreamMTLSSettings) validate() error { func (s *DownstreamMTLSSettings) validate() error {
if _, err := s.GetCA(); err != nil { if s.CA != "" && s.CAFile != "" {
return errors.New("cannot set both ca and ca_file")
} else if _, err := s.GetCA(); err != nil {
return err return err
} }
if s.CRL != "" && s.CRLFile != "" {
return errors.New("cannot set both crl and crl_file")
}
crl, err := s.GetCRL() crl, err := s.GetCRL()
if err != nil { if err != nil {
return err return err

4
config/mtls_test.go
View file

@ -122,10 +122,14 @@ func TestDownstreamMTLSSettingsValidate(t *testing.T) {
errorMsg string errorMsg string
}{ }{
{"not set", DownstreamMTLSSettings{}, ""}, {"not set", DownstreamMTLSSettings{}, ""},
{"both CA and CA file", DownstreamMTLSSettings{CA: "CA", CAFile: "CAFile"},
"cannot set both ca and ca_file"},
{"bad CA", DownstreamMTLSSettings{CA: "not%valid%base64%data"}, {"bad CA", DownstreamMTLSSettings{CA: "not%valid%base64%data"},
"CA: illegal base64 data at input byte 3"}, "CA: illegal base64 data at input byte 3"},
{"bad CA file", DownstreamMTLSSettings{CAFile: "-"}, {"bad CA file", DownstreamMTLSSettings{CAFile: "-"},
"CA file: open -: no such file or directory"}, "CA file: open -: no such file or directory"},
{"both CRL and CRL file", DownstreamMTLSSettings{CRL: "CRL", CRLFile: "CRLFile"},
"cannot set both crl and crl_file"},
{"bad CRL", DownstreamMTLSSettings{CRL: "dGhpc2lzZmluZQo="}, {"bad CRL", DownstreamMTLSSettings{CRL: "dGhpc2lzZmluZQo="},
"CRL: cryptutil: invalid crl, no X509 CRL block found"}, "CRL: cryptutil: invalid crl, no X509 CRL block found"},
{"bad CRL file", DownstreamMTLSSettings{CRLFile: "-"}, {"bad CRL file", DownstreamMTLSSettings{CRLFile: "-"},

41
config/options_test.go
View file

@ -705,18 +705,37 @@ func TestDeprecatedClientCAOptions(t *testing.T) {
zl := zerolog.New(&logOutput) zl := zerolog.New(&logOutput)
testutil.SetLogger(t, &zl) testutil.SetLogger(t, &zl)
o := NewDefaultOptions() t.Run("CA", func(t *testing.T) {
o.ClientCA = "LS0tIEZBS0UgQ0EgQ0VSVCAtLS0=" logOutput.Reset()
o.ClientCAFile = caFile
o.AutocertOptions.Enable = true // suppress an unrelated warning
err := o.Validate() o := NewDefaultOptions()
require.NoError(t, err) o.AutocertOptions.Enable = true // suppress an unrelated warning
assert.Equal(t, "LS0tIEZBS0UgQ0EgQ0VSVCAtLS0=", o.DownstreamMTLS.CA) o.ClientCA = "LS0tIEZBS0UgQ0EgQ0VSVCAtLS0="
assert.Equal(t, caFile, o.DownstreamMTLS.CAFile)
assert.Equal(t, `{"level":"warn","message":"config: client_ca is deprecated, set downstream_mtls.ca instead"} err := o.Validate()
{"level":"warn","message":"config: client_ca_file is deprecated, set downstream_mtls.ca_file instead"}
`, logOutput.String()) require.NoError(t, err)
assert.Equal(t, "LS0tIEZBS0UgQ0EgQ0VSVCAtLS0=", o.DownstreamMTLS.CA)
assert.Equal(t, `{"level":"warn","message":"config: client_ca is deprecated, set downstream_mtls.ca instead"}
`,
logOutput.String())
})
t.Run("CAFile", func(t *testing.T) {
logOutput.Reset()
o := NewDefaultOptions()
o.AutocertOptions.Enable = true // suppress an unrelated warning
o.ClientCAFile = caFile
err := o.Validate()
require.NoError(t, err)
assert.Equal(t, caFile, o.DownstreamMTLS.CAFile)
assert.Equal(t, `{"level":"warn","message":"config: client_ca_file is deprecated, set downstream_mtls.ca_file instead"}
`,
logOutput.String())
})
} }
func TestOptions_DefaultURL(t *testing.T) { func TestOptions_DefaultURL(t *testing.T) {