major refactor based on README.md and TODOs

Updated types, improved units tests, isolated most test data to have
it in one place, renamed and created new files to improve readability,
and fixed a bunch of minor TODOs.

1 files changed, 0 insertions, 245 deletions

diff --git a/handler.go b/handler.go
deleted file mode 100644
index 8c7e332..0000000
--- a/handler.go
+++ /dev/null
@@ -1,245 +0,0 @@
-package stfe
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"net/http"
-
-	"github.com/golang/glog"
-	"github.com/google/trillian"
-)
-
-// Handler implements the http.Handler interface, and contains a reference
-// to an STFE server instance as well as a function that uses it.
-type Handler struct {
-	instance *Instance // STFE server instance
-	endpoint Endpoint  // e.g., add-entry
-	method   string    // e.g., GET
-	handler  func(context.Context, *Instance, http.ResponseWriter, *http.Request) (int, error)
-}
-
-// Path returns a path that should be configured for this handler
-func (h Handler) Path() string {
-	return h.endpoint.Path("", h.instance.LogParameters.Prefix)
-}
-
-// ServeHTTP is part of the http.Handler interface
-func (a Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	// export prometheus metrics
-	var now time.Time = time.Now()
-	var statusCode int
-	defer func() {
-		rspcnt.Inc(a.instance.LogParameters.id(), string(a.endpoint), fmt.Sprintf("%d", statusCode))
-		latency.Observe(time.Now().Sub(now).Seconds(), a.instance.LogParameters.id(), string(a.endpoint), fmt.Sprintf("%d", statusCode))
-	}()
-	reqcnt.Inc(a.instance.LogParameters.id(), string(a.endpoint))
-
-	ctx, cancel := context.WithDeadline(r.Context(), now.Add(a.instance.LogParameters.Deadline))
-	defer cancel()
-
-	if r.Method != a.method {
-		glog.Warningf("%s/%s: got HTTP %s, wanted HTTP %s", a.instance.LogParameters.Prefix, string(a.endpoint), r.Method, a.method)
-		a.sendHTTPError(w, http.StatusMethodNotAllowed, fmt.Errorf("method not allowed: %s", r.Method))
-		return
-	}
-
-	statusCode, err := a.handler(ctx, a.instance, w, r)
-	if err != nil {
-		glog.Warningf("handler error %s/%s: %v", a.instance.LogParameters.Prefix, a.endpoint, err)
-		a.sendHTTPError(w, statusCode, err)
-	}
-}
-
-func (a Handler) sendHTTPError(w http.ResponseWriter, statusCode int, err error) {
-	http.Error(w, http.StatusText(statusCode), statusCode)
-}
-
-// addEntry accepts log entries from trusted submitters
-func addEntry(ctx context.Context, i *Instance, w http.ResponseWriter, r *http.Request) (int, error) {
-	glog.V(3).Info("handling add-entry request")
-	req, err := i.LogParameters.newAddEntryRequest(r)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	trsp, err := i.Client.QueueLeaf(ctx, &trillian.QueueLeafRequest{
-		LogId: i.LogParameters.TreeId,
-		Leaf: &trillian.LogLeaf{
-			LeafValue: req.Item,
-			ExtraData: req.Signature,
-		},
-	})
-	if errInner := checkQueueLeaf(trsp, err); errInner != nil {
-		return http.StatusInternalServerError, fmt.Errorf("bad QueueLeafResponse: %v", errInner)
-	}
-
-	sdi, err := i.LogParameters.genV1Sdi(trsp.QueuedLeaf.Leaf.LeafValue)
-	if err != nil {
-		return http.StatusInternalServerError, fmt.Errorf("failed creating signed debug info: %v", err)
-	}
-	rsp, err := sdi.MarshalB64()
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	if err := writeJsonResponse(rsp, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// getEntries provides a list of entries from the Trillian backend
-func getEntries(ctx context.Context, i *Instance, w http.ResponseWriter, r *http.Request) (int, error) {
-	glog.V(3).Info("handling get-entries request")
-	req, err := i.LogParameters.newGetEntriesRequest(r)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	trsp, err := i.Client.GetLeavesByRange(ctx, &trillian.GetLeavesByRangeRequest{
-		LogId:      i.LogParameters.TreeId,
-		StartIndex: req.Start,
-		Count:      req.End - req.Start + 1,
-	})
-	if status, errInner := checkGetLeavesByRange(req, trsp, err); errInner != nil {
-		return status, fmt.Errorf("bad GetLeavesByRangeResponse: %v", errInner)
-	}
-
-	rsp, err := i.LogParameters.newGetEntriesResponse(trsp.Leaves)
-	if err != nil {
-		return http.StatusInternalServerError, fmt.Errorf("failed creating GetEntriesResponse: %v", err)
-	}
-	if err := writeJsonResponse(rsp, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// getAnchors provides a list of configured trust anchors
-func getAnchors(_ context.Context, i *Instance, w http.ResponseWriter, _ *http.Request) (int, error) {
-	glog.V(3).Info("handling get-anchors request")
-	data := i.LogParameters.newGetAnchorsResponse()
-	if err := writeJsonResponse(data, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// getProofByHash provides an inclusion proof based on a given leaf hash
-func getProofByHash(ctx context.Context, i *Instance, w http.ResponseWriter, r *http.Request) (int, error) {
-	glog.V(3).Info("handling get-proof-by-hash request")
-	req, err := i.LogParameters.newGetProofByHashRequest(r)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	trsp, err := i.Client.GetInclusionProofByHash(ctx, &trillian.GetInclusionProofByHashRequest{
-		LogId:           i.LogParameters.TreeId,
-		LeafHash:        req.Hash,
-		TreeSize:        req.TreeSize,
-		OrderBySequence: true,
-	})
-	if errInner := checkGetInclusionProofByHash(i.LogParameters, trsp, err); errInner != nil {
-		return http.StatusInternalServerError, fmt.Errorf("bad GetInclusionProofByHashResponse: %v", errInner)
-	}
-
-	rsp, err := NewInclusionProofV1(i.LogParameters.LogId, uint64(req.TreeSize), uint64(trsp.Proof[0].LeafIndex), trsp.Proof[0].Hashes).MarshalB64()
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	if err := writeJsonResponse(rsp, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// getConsistencyProof provides a consistency proof between two STHs
-func getConsistencyProof(ctx context.Context, i *Instance, w http.ResponseWriter, r *http.Request) (int, error) {
-	glog.V(3).Info("handling get-consistency-proof request")
-	req, err := i.LogParameters.newGetConsistencyProofRequest(r)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	trsp, err := i.Client.GetConsistencyProof(ctx, &trillian.GetConsistencyProofRequest{
-		LogId:          i.LogParameters.TreeId,
-		FirstTreeSize:  int64(req.First),
-		SecondTreeSize: int64(req.Second),
-	})
-	if errInner := checkGetConsistencyProof(i.LogParameters, trsp, err); errInner != nil {
-		return http.StatusInternalServerError, fmt.Errorf("bad GetConsistencyProofResponse: %v", errInner)
-	}
-
-	rsp, err := NewConsistencyProofV1(i.LogParameters.LogId, uint64(req.First), uint64(req.Second), trsp.Proof.Hashes).MarshalB64()
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	if err := writeJsonResponse(rsp, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// getSth provides the most recent STH
-func getSth(ctx context.Context, i *Instance, w http.ResponseWriter, _ *http.Request) (int, error) {
-	glog.V(3).Info("handling get-sth request")
-	sth, err := i.SthSource.Latest(ctx)
-	if err != nil {
-		return http.StatusInternalServerError, fmt.Errorf("Latest: %v", err)
-	}
-	rsp, err := sth.MarshalB64()
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	if err := writeJsonResponse(rsp, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// getStableSth provides an STH that is stable for a fixed period of time
-func getStableSth(ctx context.Context, i *Instance, w http.ResponseWriter, _ *http.Request) (int, error) {
-	glog.V(3).Info("handling get-stable-sth request")
-	sth, err := i.SthSource.Stable(ctx)
-	if err != nil {
-		return http.StatusInternalServerError, fmt.Errorf("Latest: %v", err)
-	}
-	rsp, err := sth.MarshalB64()
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	if err := writeJsonResponse(rsp, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// getCosi provides a cosigned STH
-func getCosi(ctx context.Context, i *Instance, w http.ResponseWriter, _ *http.Request) (int, error) {
-	costh, err := i.SthSource.Cosigned(ctx)
-	if err != nil {
-		return http.StatusInternalServerError, fmt.Errorf("Cosigned: %v", err)
-	}
-	rsp, err := costh.MarshalB64()
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	if err := writeJsonResponse(rsp, w); err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusOK, nil
-}
-
-// addCosi accepts cosigned STHs from trusted witnesses
-func addCosi(ctx context.Context, i *Instance, w http.ResponseWriter, r *http.Request) (int, error) {
-	glog.V(3).Info("handling add-cosignature request")
-	costh, err := i.LogParameters.newAddCosignatureRequest(r)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-	if err := i.SthSource.AddCosignature(ctx, costh); err != nil {
-		return http.StatusBadRequest, err
-	}
-	return http.StatusOK, nil
-}