feat: Tested (with curl) server implementation of the secrets store.
This commit is contained in:
1 parent
9bdbc79458
commit
7b715da87f
4 files changed
+195
No files matched your search
@@ -0,0 +1,102 @@
|
||||
package secretsserver
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"git.handmadecities.com/HMC/shhh/pkg/secretsstore"
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
store secretsstore.SecretsStore
|
||||
}
|
||||
|
||||
// New creates a new secrets server that auths through mTLS.
|
||||
func New(
|
||||
store secretsstore.SecretsStore,
|
||||
) *Server {
|
||||
return &Server{
|
||||
store: store,
|
||||
}
|
||||
}
|
||||
|
||||
// ListenAndServeTLS binds the server to addr.
|
||||
// cert must have been signed by ca, any client cert also
|
||||
// signed by ca will be able to call the serice.
|
||||
func (s *Server) ListenAndServeTLS(addr, ca, cert, key string) error {
|
||||
tlsConfig, err := mTLSConfigFromCA(ca)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
server := &http.Server{
|
||||
Addr: addr,
|
||||
Handler: s,
|
||||
TLSConfig: tlsConfig,
|
||||
// TODO: Tune the rest of the server parameters for robustness.
|
||||
}
|
||||
return server.ListenAndServeTLS(cert, key)
|
||||
}
|
||||
|
||||
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
// All operations are on the root path.
|
||||
if r.URL.Path != "" && r.URL.Path != "/" {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
// TODO: Better handling of `Write` failing.
|
||||
w.Write([]byte("requests are only accepted to the root (/) path"))
|
||||
return
|
||||
}
|
||||
|
||||
// Decode key from query string parameters.
|
||||
b64Key := r.URL.Query().Get("key")
|
||||
if b64Key == "" {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.Write([]byte("missing \"key\" query string parameter"))
|
||||
return
|
||||
}
|
||||
key, err := base64.RawURLEncoding.DecodeString(b64Key)
|
||||
if err != nil {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.Write([]byte("key was not base64 encoded"))
|
||||
return
|
||||
}
|
||||
|
||||
// TODO: Control flow is a little clumsy here, clean it up.
|
||||
switch r.Method {
|
||||
case http.MethodGet:
|
||||
secret, err := s.store.Get(secretsstore.Key(key))
|
||||
if err != nil {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte("could not retrieve requested secret: " + err.Error()))
|
||||
return
|
||||
}
|
||||
// We're writing raw bytes.
|
||||
w.Header().Add("Content-Type", "application/octet-stream")
|
||||
w.Write(secret)
|
||||
return
|
||||
case http.MethodPut:
|
||||
secret, err := io.ReadAll(r.Body)
|
||||
if err != nil {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.Write([]byte("could not read secret bytes from request body: " + err.Error()))
|
||||
return
|
||||
}
|
||||
if err := s.store.Put(secretsstore.Key(key), secret); err != nil {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte("could not store secret: " + err.Error()))
|
||||
return
|
||||
}
|
||||
return
|
||||
case http.MethodDelete:
|
||||
if err := s.store.Delete(secretsstore.Key(key)); err != nil {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte("could not delete secret: " + err.Error()))
|
||||
return
|
||||
}
|
||||
return
|
||||
default:
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.Write([]byte(r.Method + " method is not allowd"))
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package secretsserver
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"errors"
|
||||
"os"
|
||||
)
|
||||
|
||||
// mTLSConfigFromCA returns a tls config that enforces client auth with certs
|
||||
// issued by the provided ca.
|
||||
func mTLSConfigFromCA(ca string) (*tls.Config, error) {
|
||||
caPEMBytes, err := os.ReadFile(ca)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
caCertPool := x509.NewCertPool()
|
||||
if added := caCertPool.AppendCertsFromPEM(caPEMBytes); !added {
|
||||
return nil, errors.New("ca file did not contain a valid cert")
|
||||
}
|
||||
return &tls.Config{
|
||||
// Force server to deman and verify cert from clients.
|
||||
ClientAuth: tls.RequireAndVerifyClientCert,
|
||||
// CAs that will be used to verify client certs.
|
||||
ClientCAs: caCertPool,
|
||||
// Safer to default to tls 1.3
|
||||
MinVersion: tls.VersionTLS13,
|
||||
}, nil
|
||||
}
|
||||
Reference in new issue
Block a user