Skip to content

Commit

Permalink
refactor: remove grpc api
Browse files Browse the repository at this point in the history
As we added GraphQL and HTTP endpoints to download attestations the GRPC
service found itself less and less used. This is a pretty hefty refactor
of the archivist server code to pull out the GRPC service.

WIP: SPIRE mTLS with the http service

Signed-off-by: Mikhail Swift <mikhail@testifysec.com>
  • Loading branch information
mikhailswift committed Oct 6, 2022
1 parent 0f4374c commit d75a31f
Show file tree
Hide file tree
Showing 16 changed files with 753 additions and 837 deletions.
48 changes: 48 additions & 0 deletions client/download.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Copyright 2022 The Witness Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package client

import (
"context"
"io"
"net/http"
"net/url"
)

func Download(ctx context.Context, baseUrl string, gitoid string, out io.Writer) error {
downloadUrl, err := url.JoinPath(baseUrl, "download", gitoid)
if err != nil {
return err
}

req, err := http.NewRequestWithContext(ctx, "GET", downloadUrl, nil)
if err != nil {
return err
}

req.Header.Set("Content-Type", "application/json")
hc := &http.Client{}
resp, err := hc.Do(req)
if err != nil {
return nil
}

defer resp.Body.Close()
if _, err := io.Copy(out, resp.Body); err != nil {
return err
}

return nil
}
81 changes: 81 additions & 0 deletions client/graphql.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
// Copyright 2022 The Witness Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package client

import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
"net/url"
)

type graphQLError struct {
Message string `json:"message"`
}

type graphQLResponse[T any] struct {
Data T `json:"data,omitempty"`
Errors []graphQLError `json:"errors,omitempty"`
}

type graphQLRequestBody[TVars any] struct {
Query string `json:"query"`
Variables TVars `json:"variables,omitempty"`
}

func GraphQlQuery[TRes any, TVars any](ctx context.Context, baseUrl, query string, vars TVars) (TRes, error) {
var response TRes
queryUrl, err := url.JoinPath(baseUrl, "query")
if err != nil {
return response, err
}

requestBody := graphQLRequestBody[TVars]{
Query: query,
Variables: vars,
}

reqBody, err := json.Marshal(requestBody)
if err != nil {
return response, err
}

req, err := http.NewRequestWithContext(ctx, "POST", queryUrl, bytes.NewReader(reqBody))
if err != nil {
return response, err
}

req.Header.Set("Content-Type", "application/json")
hc := &http.Client{}
res, err := hc.Do(req)
if err != nil {
return response, err
}

defer res.Body.Close()
dec := json.NewDecoder(res.Body)
gqlRes := graphQLResponse[TRes]{}
if err := dec.Decode(&gqlRes); err != nil {
return response, err
}

if len(gqlRes.Errors) > 0 {
return response, fmt.Errorf("graph ql query failed: %v", gqlRes.Errors)
}

return gqlRes.Data, nil
}
57 changes: 57 additions & 0 deletions client/store.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// Copyright 2022 The Witness Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package client

import (
"context"
"encoding/json"
"io"
"net/http"
"net/url"

"github.com/testifysec/archivist/internal/server"
)

func Store(ctx context.Context, baseUrl string, envelope io.Reader) (string, error) {
uploadPath, err := url.JoinPath(baseUrl, "upload")
if err != nil {
return "", err
}

req, err := http.NewRequestWithContext(ctx, "POST", uploadPath, envelope)
if err != nil {
return "", err
}

req.Header.Set("Content-Type", "application/json")
hc := &http.Client{}
resp, err := hc.Do(req)
if err != nil {
return "", err
}

defer resp.Body.Close()
bodyBytes, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}

storeResp := server.StoreResponse{}
if err := json.Unmarshal(bodyBytes, &storeResp); err != nil {
return "", err
}

return storeResp.Gitoid, nil
}
Loading

0 comments on commit d75a31f

Please sign in to comment.