de6020a240
The package defined various special errors; these errors existed for two reasons; - being able to distinguish "not found" errors from other errors (as "not found" errors can be ignored in various cases). - to be able to update the context _name_ in the error message after the error was created. This was needed in cases where the name was not available at the location where the error was produced (e.g. only the "id" was present), and the helpers to detect "not found" errors did not support wrapped errors (so wrapping the error with a "name" could break logic); a `setContextName` interface and corresponding `patchErrContextName()` utility was created for this (which was a "creative", but not very standard approach). This patch: - Removes the special error-types, replacing them with errdefs definitions (which is a more common approach in our code-base to detect error types / classes). - Removes the internal utilities for error-handling, and deprecates the exported utilities (to allow external consumers to adjust their code). - Some errors have been enriched with detailed information (which may be useful for debugging / problem solving). - Note that in some cases, `patchErrContextName()` was called, but the code producing the error would never return a `setContextName` error, so would never update the error message. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
99 lines
2.2 KiB
Go
99 lines
2.2 KiB
Go
package context
|
|
|
|
import (
|
|
"os"
|
|
|
|
"github.com/docker/cli/cli/context/store"
|
|
"github.com/pkg/errors"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
const (
|
|
caKey = "ca.pem"
|
|
certKey = "cert.pem"
|
|
keyKey = "key.pem"
|
|
)
|
|
|
|
// TLSData holds ca/cert/key raw data
|
|
type TLSData struct {
|
|
CA []byte
|
|
Key []byte
|
|
Cert []byte
|
|
}
|
|
|
|
// ToStoreTLSData converts TLSData to the store representation
|
|
func (data *TLSData) ToStoreTLSData() *store.EndpointTLSData {
|
|
if data == nil {
|
|
return nil
|
|
}
|
|
result := store.EndpointTLSData{
|
|
Files: make(map[string][]byte),
|
|
}
|
|
if data.CA != nil {
|
|
result.Files[caKey] = data.CA
|
|
}
|
|
if data.Cert != nil {
|
|
result.Files[certKey] = data.Cert
|
|
}
|
|
if data.Key != nil {
|
|
result.Files[keyKey] = data.Key
|
|
}
|
|
return &result
|
|
}
|
|
|
|
// LoadTLSData loads TLS data from the store
|
|
func LoadTLSData(s store.Reader, contextName, endpointName string) (*TLSData, error) {
|
|
tlsFiles, err := s.ListTLSFiles(contextName)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, "failed to retrieve TLS files for context %q", contextName)
|
|
}
|
|
if epTLSFiles, ok := tlsFiles[endpointName]; ok {
|
|
var tlsData TLSData
|
|
for _, f := range epTLSFiles {
|
|
data, err := s.GetTLSData(contextName, endpointName, f)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, "failed to retrieve TLS data (%s) for context %q", f, contextName)
|
|
}
|
|
switch f {
|
|
case caKey:
|
|
tlsData.CA = data
|
|
case certKey:
|
|
tlsData.Cert = data
|
|
case keyKey:
|
|
tlsData.Key = data
|
|
default:
|
|
logrus.Warnf("unknown file in context %s TLS bundle: %s", contextName, f)
|
|
}
|
|
}
|
|
return &tlsData, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// TLSDataFromFiles reads files into a TLSData struct (or returns nil if all paths are empty)
|
|
func TLSDataFromFiles(caPath, certPath, keyPath string) (*TLSData, error) {
|
|
var (
|
|
ca, cert, key []byte
|
|
err error
|
|
)
|
|
if caPath != "" {
|
|
if ca, err = os.ReadFile(caPath); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if certPath != "" {
|
|
if cert, err = os.ReadFile(certPath); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if keyPath != "" {
|
|
if key, err = os.ReadFile(keyPath); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if ca == nil && cert == nil && key == nil {
|
|
return nil, nil
|
|
}
|
|
return &TLSData{CA: ca, Cert: cert, Key: key}, nil
|
|
}
|