forked from openfaas/faas
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds key creation for http signatures
Resolves openfaas#1103 Signed-off-by: Edward Wilde <[email protected]>
- Loading branch information
Showing
7 changed files
with
220 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package handlers | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "log" | ||
| "net/http" | ||
| "os" | ||
| "path" | ||
|
|
||
| "github.com/gorilla/mux" | ||
| ) | ||
|
|
||
| var keyMap = map[string]string{ | ||
| "callback": "http-signing-public-key", | ||
| } | ||
|
|
||
| type KeyType struct { | ||
| Id string `json:"id"` | ||
| PEM string `json:"pem"` | ||
| } | ||
|
|
||
| type SecretsReader interface { | ||
| Read(key string) (string, error) | ||
| } | ||
|
|
||
| type FileSecretsReader struct { | ||
| SecretMountPath string | ||
| } | ||
|
|
||
| func (f *FileSecretsReader) Read(key string) (string, error) { | ||
| if len(f.SecretMountPath) == 0 { | ||
| return "", fmt.Errorf("invalid SecretMountPath specified for reading secrets used for certificates") | ||
| } | ||
|
|
||
| certificatePath := path.Join(f.SecretMountPath, key) | ||
| if _, err := os.Stat(certificatePath); os.IsNotExist(err) { | ||
| return "", fmt.Errorf("unable to find secret %s", key) | ||
| } | ||
|
|
||
| value, err := ioutil.ReadFile(certificatePath) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error reading find secret %s", certificatePath) | ||
| } | ||
|
|
||
| return string(value), nil | ||
| } | ||
|
|
||
| func MakeCertificatesHandler(reader SecretsReader) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| vars := mux.Vars(r) | ||
| keyID := vars["id"] | ||
| secretKey, ok := keyMap[keyID] | ||
| if !ok { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| message := fmt.Sprintf("Unable to find certificate %s.", keyID) | ||
| w.Write([]byte(message)) | ||
| log.Println(message) | ||
| return | ||
| } | ||
|
|
||
| publicKey, err := reader.Read(secretKey) | ||
| if err != nil { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| message := fmt.Sprintf("Unable to find secret for key %s.", keyID) | ||
| w.Write([]byte(message)) | ||
| log.Println(message) | ||
| return | ||
| } | ||
|
|
||
| key := &KeyType{ | ||
| Id: secretKey, | ||
| PEM: publicKey, | ||
| } | ||
|
|
||
| bytesOut, marshalErr := json.Marshal(key) | ||
| if marshalErr != nil { | ||
| w.WriteHeader(http.StatusInternalServerError) | ||
| message := fmt.Sprintf("error marshalling json for key %s. %v", keyID, err) | ||
| w.Write([]byte(message)) | ||
| log.Println(message) | ||
| } | ||
|
|
||
| w.Header().Set("Content-Type", "application/json") | ||
| w.WriteHeader(http.StatusOK) | ||
| w.Write(bytesOut) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package handlers | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "github.com/gorilla/mux" | ||
| ) | ||
|
|
||
| func TestMakeCertificatesHandler(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| keyID string | ||
| eval func(r *http.Response) error | ||
| reader SecretsReader | ||
| }{ | ||
| { | ||
| name: "Get certificate", | ||
| keyID: "callback", | ||
| eval: func(r *http.Response) error { | ||
| if r.StatusCode != 200 { | ||
| return fmt.Errorf("expected 200") | ||
| } | ||
|
|
||
| body, _ := ioutil.ReadAll(r.Body) | ||
| keyData := &KeyType{} | ||
| if err := json.Unmarshal(body, keyData); err != nil { | ||
| return fmt.Errorf("error unmarshalling result") | ||
| } | ||
|
|
||
| if keyData.PEM != testPublicKey { | ||
| return fmt.Errorf("PEM want %s got %s", testPublicKey, keyData.PEM) | ||
| } | ||
| return nil | ||
| }, | ||
| reader: &TestSecretsReader{readCallBack: func(key string) (s string, e error) { | ||
| return testPublicKey, nil | ||
| }}, | ||
| }, | ||
| { | ||
|
|
||
| name: "Unable to find certificate", | ||
| keyID: "missingID", | ||
| eval: func(r *http.Response) error { | ||
| if r.StatusCode != 404 { | ||
| return fmt.Errorf("expected 404") | ||
| } | ||
|
|
||
| return nil | ||
| }, | ||
| reader: &TestSecretsReader{readCallBack: func(key string) (s string, e error) { | ||
| return "", fmt.Errorf("key not found") | ||
| }}, | ||
| }, | ||
| } | ||
|
|
||
| r := mux.NewRouter() | ||
| ts := httptest.NewServer(r) | ||
| defer ts.Close() | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| r.HandleFunc("/certificates/{id}", MakeCertificatesHandler(tt.reader)) | ||
|
|
||
| url := ts.URL + "/certificates/" + tt.keyID | ||
| resp, err := http.Get(url) | ||
| if err != nil { | ||
| t.Errorf("MakeCertificatesHandler() call = %v", err) | ||
| } | ||
|
|
||
| if err := tt.eval(resp); err != nil { | ||
| t.Errorf("MakeCertificatesHandler() eval = %v", err) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| type TestSecretsReader struct { | ||
| readCallBack func(key string) (string, error) | ||
| } | ||
|
|
||
| func (r *TestSecretsReader) Read(key string) (string, error) { | ||
| return r.readCallBack(key) | ||
| } | ||
|
|
||
| const testPublicKey = `-----BEGIN PUBLIC KEY----- | ||
| MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7pEUKQ28pI5N3g/zG6OJ | ||
| 100N/DV2Q8Ob+gzRjd7HjXgVgZyjS3nA8FAYrxTLSihcIhXuQrYxyk2vp6YMNmSB | ||
| fOptkdmj4UgLYskfeqEt8JjS6ExBxSWEDgr1IXOPPDP61on8F65/ZYGnp2JF2wHY | ||
| k0OeD4ppNUV+mIHj/wXf7VLHGflwFQH/+mfUn+tVQRgX7hTadcYmGJ+1XP0py4kU | ||
| gJDHfw8eBsFurHWr2mXu3BdraSKKf1G9i+SifmOUUul6mBONmlvzQdKtDCr48o1H | ||
| QndRHcMWjKhlBhKz4qrmqku8oGBh6iHhGVVYf8D3mU1nzyjH4rOUXZwzj+SaqgGk | ||
| vQIDAQAB | ||
| -----END PUBLIC KEY-----` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters