diff options
Diffstat (limited to 'internal/middleware/nollamas_test.go')
| -rw-r--r-- | internal/middleware/nollamas_test.go | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/internal/middleware/nollamas_test.go b/internal/middleware/nollamas_test.go index 92a044d32..d6fdb5ff6 100644 --- a/internal/middleware/nollamas_test.go +++ b/internal/middleware/nollamas_test.go @@ -30,6 +30,7 @@ import ( "testing" "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "code.superseriousbusiness.org/gotosocial/internal/config" "code.superseriousbusiness.org/gotosocial/internal/gtserror" "code.superseriousbusiness.org/gotosocial/internal/middleware" @@ -52,7 +53,7 @@ func TestNoLLaMasMiddleware(t *testing.T) { assert.NoError(t, err) // Add middleware to the gin engine handler stack. - middleware := middleware.NoLLaMas(getInstanceV1) + middleware := middleware.NoLLaMas(apiutil.CookiePolicy{}, getInstanceV1) e.Use(middleware) // Set test handler we can @@ -94,8 +95,9 @@ func testNoLLaMasMiddleware(t *testing.T, e *gin.Engine, userAgent string) { panic(err) } - var difficulty uint64 var challenge string + var diff1 uint64 + var diff2 uint8 // Parse output body and find the challenge / difficulty. for _, line := range strings.Split(string(b), "\n") { @@ -105,17 +107,22 @@ func testNoLLaMasMiddleware(t *testing.T, e *gin.Engine, userAgent string) { line = line[25:] line = line[:len(line)-1] challenge = line - case strings.HasPrefix(line, "data-nollamas-difficulty=\""): - line = line[26:] + case strings.HasPrefix(line, "data-nollamas-difficulty1=\""): + line = line[27:] line = line[:len(line)-1] var err error - difficulty, err = strconv.ParseUint(line, 10, 8) + diff1, err = strconv.ParseUint(line, 10, 8) assert.NoError(t, err) + case strings.HasPrefix(line, "data-nollamas-difficulty2=\""): + line = line[27:] + line = line[:len(line)-1] + diff2 = line[0] } } // Ensure valid posed challenge. - assert.NotZero(t, difficulty) + assert.NotZero(t, diff1) + assert.NotZero(t, diff2) assert.NotEmpty(t, challenge) // Prepare a test request for gin engine. @@ -124,9 +131,14 @@ func testNoLLaMasMiddleware(t *testing.T, e *gin.Engine, userAgent string) { rw = httptest.NewRecorder() // Now compute and set solution query paramater. - solution := computeSolution(challenge, difficulty) + solution := computeSolution(challenge, diff1, diff2) r.URL.RawQuery = "nollamas_solution=" + solution + t.Logf("challenge=%s", challenge) + t.Logf("diff1=%d", diff1) + t.Logf("diff2='%c'", diff2) + t.Logf("solution=%s", solution) + // Pass req through // engine handler. e.ServeHTTP(rw, r) @@ -147,18 +159,21 @@ func testNoLLaMasMiddleware(t *testing.T, e *gin.Engine, userAgent string) { } // computeSolution does the functional equivalent of our nollamas workerTask.js. -func computeSolution(challenge string, difficulty uint64) string { +func computeSolution(challenge string, diff1 uint64, diff2 uint8) string { outer: for i := 0; ; i++ { solution := strconv.Itoa(i) combined := challenge + solution hash := sha256.Sum256(byteutil.S2B(combined)) encoded := hex.EncodeToString(hash[:]) - for i := range difficulty { + for i := range diff1 { if encoded[i] != '0' { continue outer } } + if encoded[diff1] >= diff2 { + continue outer + } return solution } } |