aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--reqres.go5
-rw-r--r--reqres_test.go193
-rw-r--r--reqres_tests.go88
3 files changed, 197 insertions, 89 deletions
diff --git a/reqres.go b/reqres.go
index 8e1c454..14729ea 100644
--- a/reqres.go
+++ b/reqres.go
@@ -114,12 +114,15 @@ func (lp *LogParameters) newGetProofByHashRequest(httpRequest *http.Request) (*G
return nil, fmt.Errorf("bad tree_size parameter: %v", err)
}
if size < 1 {
- return nil, fmt.Errorf("bad tree_size parameter: negative value")
+ return nil, fmt.Errorf("bad tree_size parameter: must be larger than zero")
}
hash, err := deb64(httpRequest.FormValue("hash"))
if err != nil {
return nil, fmt.Errorf("bad hash parameter: %v", err)
}
+ if len(hash) != lp.HashType.Size() {
+ return nil, fmt.Errorf("bad hash parameter: must be %d bytes", lp.HashType.Size())
+ }
return &GetProofByHashRequest{TreeSize: size, Hash: hash}, nil
}
diff --git a/reqres_test.go b/reqres_test.go
new file mode 100644
index 0000000..e118a4f
--- /dev/null
+++ b/reqres_test.go
@@ -0,0 +1,193 @@
+package stfe
+
+import (
+ "bytes"
+ "fmt"
+ "strconv"
+ "testing"
+
+ "net/http"
+)
+
+// TODO: TestNewAddEntryRequest
+func TestNewAddEntryRequest(t *testing.T) {
+}
+
+func TestNewGetEntriesRequest(t *testing.T) {
+ lp := makeTestLogParameters(t, nil)
+ for _, table := range []struct {
+ description string
+ start string
+ end string
+ wantErr bool
+ }{
+ {
+ description: "bad request: start must be an integer",
+ start: "start",
+ end: "10",
+ wantErr: true,
+ },
+ {
+ description: "bad request: end must be an integer",
+ start: "10",
+ end: "end",
+ wantErr: true,
+ },
+ {
+ description: "bad request: start must not be negative",
+ start: "-1",
+ end: "10",
+ wantErr: true,
+ },
+ {
+ description: "bad request: start must be larger than end",
+ start: "1",
+ end: "0",
+ wantErr: true,
+ },
+ {
+ description: "ok request but bad response: expected truncated",
+ start: "0",
+ end: fmt.Sprintf("%d", testMaxRange),
+ },
+ {
+ description: "ok request and response",
+ start: "0",
+ end: "0",
+ },
+ {
+ description: "ok request and response",
+ start: "0",
+ end: fmt.Sprintf("%d", testMaxRange-1),
+ },
+ } {
+ r, err := http.NewRequest("GET", "http://example.com/"+lp.Prefix+"/get-entries", nil)
+ if err != nil {
+ t.Fatalf("must make http request in test %q: %v", table.description, err)
+ }
+ q := r.URL.Query()
+ q.Add("start", table.start)
+ q.Add("end", table.end)
+ r.URL.RawQuery = q.Encode()
+
+ req, err := lp.newGetEntriesRequest(r)
+ if got, want := err != nil, table.wantErr; got != want {
+ t.Errorf("got error is %v but wanted %v in test %q: %v", got, want, table.description, err)
+ }
+ if err != nil {
+ continue
+ }
+
+ if got, want := req.Start, mustParseInt64(t, table.start); got != want {
+ t.Errorf("got start %d but wanted %d in test %q", got, want, table.description)
+ }
+ if got, want := req.End, min(mustParseInt64(t, table.end), req.Start+testMaxRange-1); got != want {
+ t.Errorf("got end %d but wanted %d in test %q", got, want, table.description)
+ }
+ }
+}
+
+func TestNewGetProofByHashRequest(t *testing.T) {
+ lp := makeTestLogParameters(t, nil)
+ for _, table := range []struct {
+ description string
+ treeSize string
+ hash string
+ wantErr bool
+ }{
+ {
+ description: "bad request: tree size must be an integer",
+ treeSize: "treeSize",
+ hash: b64(testNodeHash),
+ wantErr: true,
+ },
+ {
+ description: "bad request: tree size must be larger than zero",
+ treeSize: "0",
+ hash: b64(testNodeHash),
+ wantErr: true,
+ },
+ {
+ description: "bad request: hash is not base64",
+ treeSize: "1",
+ hash: "<(^_^)>",
+ wantErr: true,
+ },
+ {
+ description: "bad request: invalid node hash (too small)",
+ treeSize: "1",
+ hash: b64(testNodeHash[1:]),
+ wantErr: true,
+ },
+ {
+ description: "bad request: invalid node hash (too large)",
+ treeSize: "1",
+ hash: b64(append(testNodeHash, byte(0))),
+ wantErr: true,
+ },
+ {
+ description: "ok request",
+ treeSize: "1",
+ hash: b64(testNodeHash),
+ },
+ } {
+ r, err := http.NewRequest("GET", "http://example.com/"+lp.Prefix+"/get-proof-by-hash", nil)
+ if err != nil {
+ t.Fatalf("must make http request in test %q: %v", table.description, err)
+ }
+ q := r.URL.Query()
+ q.Add("tree_size", table.treeSize)
+ q.Add("hash", table.hash)
+ r.URL.RawQuery = q.Encode()
+
+ req, err := lp.newGetProofByHashRequest(r)
+ if got, want := err != nil, table.wantErr; got != want {
+ t.Errorf("got error is %v but wanted %v in test %q: %v", got, want, table.description, err)
+ }
+ if err != nil {
+ continue
+ }
+
+ if got, want := req.TreeSize, mustParseInt64(t, table.treeSize); got != want {
+ t.Errorf("got treeSize %d but wanted %d in test %q", got, want, table.description)
+ }
+ if got, want := req.Hash, mustDeb64(t, table.hash); !bytes.Equal(got, want) {
+ t.Errorf("got hash %X but wanted %X in test %q", got, want, table.description)
+ }
+ }
+}
+
+// TODO: TestNewGetConsistencyProofRequest
+func TestNewGetConsistencyProofRequest(t *testing.T) {
+}
+
+// TODO: TestNewGetEntryResponse
+func TestNewGetEntriesResponse(t *testing.T) {
+}
+
+// TODO: TestNewGetAnchorsResponse
+func TestNewGetAnchorsResponse(t *testing.T) {
+}
+
+func mustParseInt64(t *testing.T, num string) int64 {
+ n, err := strconv.ParseInt(num, 10, 64)
+ if err != nil {
+ t.Fatalf("must parse int: %v", err)
+ }
+ return n
+}
+
+func mustDeb64(t *testing.T, str string) []byte {
+ b, err := deb64(str)
+ if err != nil {
+ t.Fatalf("must base64 decode: %v", err)
+ }
+ return b
+}
+
+func min(a, b int64) int64 {
+ if a < b {
+ return a
+ }
+ return b
+}
diff --git a/reqres_tests.go b/reqres_tests.go
deleted file mode 100644
index a41c98f..0000000
--- a/reqres_tests.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package stfe
-
-import (
- "fmt"
- "testing"
-
- "net/http"
-)
-
-// TODO: TestNewAddEntryRequest
-func TestNewAddEntryRequest(t *testing.T) {
-}
-
-func TestNewGetEntriesRequest(t *testing.T) {
- lp := makeTestLogParameters(t, nil)
- for _, table := range []struct {
- description string
- start string
- end string
- wantErr bool
- }{
- {
- description: "bad request: start must be an integer",
- start: "start",
- end: "10",
- wantErr: true,
- },
- {
- description: "bad request: end must be an integer",
- start: "10",
- end: "end",
- wantErr: true,
- },
- {
- description: "bad request: start must not be negative",
- start: "-1",
- end: "10",
- wantErr: true,
- },
- {
- description: "bad request: start must be larger than end",
- start: "1",
- end: "0",
- wantErr: true,
- },
- {
- description: "ok request but bad response: expected truncated",
- start: "0",
- end: fmt.Sprintf("%d", testMaxRange),
- },
- {
- description: "ok request and response",
- start: "0",
- end: fmt.Sprintf("%d", testMaxRange-1),
- },
- } {
- req, err := http.NewRequest("GET", "http://example.com/"+lp.Prefix+"/get-entries", nil)
- q := req.URL.Query()
- q.Add("start", table.start)
- q.Add("end", table.end)
- req.URL.RawQuery = q.Encode()
-
- rsp, err := lp.newGetEntriesRequest(req)
- if got, want := err != nil, table.wantErr; got != want {
- t.Errorf("got error is %v but wanted %v in test %q: %v", got, want, table.description, err)
- }
-
- if n := rsp.End - rsp.Start + 1; n > int64(testMaxRange) {
- t.Errorf("get-entries range is too large in test %q: %d > %d", table.description, n, testMaxRange)
- }
- }
-}
-
-// TODO: TestNewGetProofByHashRequest
-func TestNewGetProofByHashRequest(t *testing.T) {
-}
-
-// TODO: TestNewGetConsistencyProofRequest
-func TestNewGetConsistencyProofRequest(t *testing.T) {
-}
-
-// TODO: TestNewGetEntryResponse
-func TestNewGetEntriesResponse(t *testing.T) {
-}
-
-// TODO: TestNewGetAnchorsResponse
-func TestNewGetAnchorsResponse(t *testing.T) {
-}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-31 03:44:20 +0000