dapr
/
components-contrib
mirror of https://github.com/dapr/components-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2463 from pravinpushkar/read_tls_config 

[HTTP Binding] fix error: filename too long
This commit is contained in:
Bernd Verst 2023-01-24 10:45:39 -08:00 committed by GitHub
parent b81f8ef63e 6656fdbf7a
commit 570f67b797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bindings/http/http.go
View File

@ -38,7 +38,6 @@ import (
) )
const ( const (
MTLSEnable = "MTLSEnable"
MTLSRootCA = "MTLSRootCA" MTLSRootCA = "MTLSRootCA"
MTLSClientCert = "MTLSClientCert" MTLSClientCert = "MTLSClientCert"
MTLSClientKey = "MTLSClientKey" MTLSClientKey = "MTLSClientKey"
@ -146,23 +145,19 @@ func (h *HTTPSource) readMTLSCertificates() (*tls.Config, error) {
} }
// getPemBytes returns the PEM encoded bytes from the provided certName and certData. // getPemBytes returns the PEM encoded bytes from the provided certName and certData.
// If the certData is a file path, it reads the file and returns the bytes. // If the certData is a PEM encoded string, it returns the bytes.
// Else if the certData is a PEM encoded string, it returns the bytes. // If there is an error in decoding the PEM, assume it is a filepath and try to read its content.
// Else it returns an error. // Return the error occurred while reading the file.
func (h *HTTPSource) getPemBytes(certName, certData string) ([]byte, error) { func (h *HTTPSource) getPemBytes(certName, certData string) ([]byte, error) {
// Read the file if !isValidPEM(certData) {
pemBytes, err := os.ReadFile(certData) // Read the file
// If there is an error assume it is already PEM encoded string not a file path. pemBytes, err := os.ReadFile(certData)
if err != nil { if err != nil {
if !errors.Is(err, os.ErrNotExist) { return nil, fmt.Errorf("provided %q value is neither a valid file path or nor a valid pem encoded string: %w", certName, err)
return nil, fmt.Errorf("failed to read %q file: %w", certName, err)
} }
if !isValidPEM(certData) { return pemBytes, nil
return nil, fmt.Errorf("provided %q value is neither a valid file path or nor a valid pem encoded string", certName)
}
return []byte(certData), nil
} }
return pemBytes, nil return []byte(certData), nil
} }
// isValidPEM validates the provided input has PEM formatted block. // isValidPEM validates the provided input has PEM formatted block.