Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit10f6d45

Browse files
committed
Add secret reader interface to fetch keys
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
1 parent5526383 commit10f6d45

File tree

1 file changed

+29
-3
lines changed

1 file changed

+29
-3
lines changed

‎web/tls_config.go‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ var (
3636
ErrNoListeners=errors.New("no web listen address or systemd socket flag specified")
3737
)
3838

39+
typeSecretReaderinterface {
40+
ReadSecret(pathstring) ([]byte,error)
41+
}
42+
43+
typefileReaderstruct{}
44+
45+
func (f*fileReader)ReadSecret(pathstring) ([]byte,error) {
46+
returnos.ReadFile(path)
47+
}
48+
3949
typeConfigstruct {
4050
TLSConfigTLSConfig`yaml:"tls_server_config"`
4151
HTTPConfigHTTPConfig`yaml:"http_server_config"`
@@ -52,6 +62,8 @@ type TLSConfig struct {
5262
MinVersionTLSVersion`yaml:"min_version"`
5363
MaxVersionTLSVersion`yaml:"max_version"`
5464
PreferServerCipherSuitesbool`yaml:"prefer_server_cipher_suites"`
65+
66+
ReaderSecretReader`yaml:"-"`
5567
}
5668

5769
typeFlagConfigstruct {
@@ -115,12 +127,26 @@ func ConfigToTLSConfig(c *TLSConfig) (*tls.Config, error) {
115127
returnnil,errors.New("missing key_file")
116128
}
117129

130+
reader:=c.Reader
131+
ifreader==nil {
132+
reader=&fileReader{}
133+
}
134+
118135
loadCert:=func() (*tls.Certificate,error) {
119-
cert,err:=tls.LoadX509KeyPair(c.TLSCertPath,c.TLSKeyPath)
136+
cert,err:=reader.ReadSecret(c.TLSCertPath)
137+
iferr!=nil {
138+
returnnil,fmt.Errorf("error loading cert: %w",err)
139+
}
140+
key,err:=reader.ReadSecret(c.TLSKeyPath)
141+
iferr!=nil {
142+
returnnil,fmt.Errorf("error loading key: %w",err)
143+
}
144+
145+
tlsCert,err:=tls.X509KeyPair(cert,key)
120146
iferr!=nil {
121147
returnnil,fmt.Errorf("failed to load X509KeyPair: %w",err)
122148
}
123-
return&cert,nil
149+
return&tlsCert,nil
124150
}
125151

126152
// Confirm that certificate and key paths are valid.
@@ -156,7 +182,7 @@ func ConfigToTLSConfig(c *TLSConfig) (*tls.Config, error) {
156182

157183
ifc.ClientCAs!="" {
158184
clientCAPool:=x509.NewCertPool()
159-
clientCAFile,err:=os.ReadFile(c.ClientCAs)
185+
clientCAFile,err:=reader.ReadSecret(c.ClientCAs)
160186
iferr!=nil {
161187
returnnil,err
162188
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp