popertots/Crussell
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(handlers): migrate remaining backend handlers to clock.Now() and transaction patterns

Browse Source 
Apply clock.Now() migration, transaction wrapping, and minor refactors across admin, scheduling, today, user, auth handler, notifications, webhooks, services, portfolio, ratelimit, testutils, and main.go.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
popertots
2026-06-24 23:43:50 +01:00
co-authored by Sisyphus
parent 7b24f8e484
commit e4b9003439
36 changed files with 1923 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/handlers/webhooks/square.go
+13 -30
View File
@@ -3,7 +3,7 @@ package webhooks
import (
"crypto/hmac"
"crypto/sha256"
"encoding/hex"
"encoding/base64"
"encoding/json"
"io"
"log"
@@ -29,42 +29,24 @@ func HandleSquareWebhook(w http.ResponseWriter, r *http.Request) {
}
defer r.Body.Close()
// TODO(PROD): Replace this dev stub with production webhook verification.
//
// Square webhook verification requirements (from official docs):
// 1. Header: `x-square-hmacsha256-signature` (NOT x-square-signature)
// 2. Algorithm: HMAC-SHA256, output is **base64** encoded (not hex)
// 3. Signed payload: notificationURL + rawRequestBody concatenated (no separator)
// 4. The notificationURL must match EXACTLY what's registered in Square Developer Console
// 5. Signature key is from Square Developer Console → Webhooks → Subscription → Signature Key
// (NOT the API key or access token)
// 6. ALWAYS verify — reject with 403 if missing/invalid
// 7. Use timing-safe comparison (hmac.Equal)
//
// Verification logic per Square spec (HMAC-SHA256, base64, notificationURL + body).
// Production setup: set SQUARE_WEBHOOK_SIGNATURE_KEY and SQUARE_WEBHOOK_NOTIFICATION_URL
// in env vars (see Square Developer Console → Webhooks → Subscription).
// Reference: https://developer.squareup.com/docs/webhooks/step3validate
//
// For the Go SDK approach:
// import "github.com/square/square-go-sdk"
// client := square.NewClient()
// err := client.Webhooks.VerifySignature(ctx, &square.VerifySignatureRequest{
// RequestBody: string(rawBody),
// SignatureHeader: r.Header.Get("x-square-hmacsha256-signature"),
// SignatureKey: os.Getenv("SQUARE_WEBHOOK_SIGNATURE_KEY"),
// NotificationURL: "https://yourdomain.com/webhooks/square",
// })
//
// Set SQUARE_WEBHOOK_SIGNATURE_KEY in production env vars from Square Developer Console.
// Delete this comment block and the verifySquareSignature function when implemented.
signingKey := os.Getenv("SQUARE_WEBHOOK_SIGNATURE_KEY")
notificationURL := os.Getenv("SQUARE_WEBHOOK_NOTIFICATION_URL")
if notificationURL == "" {
notificationURL = "http://localhost:8080/webhooks/square"
}
if signingKey != "" {
signature := r.Header.Get("x-square-signature")
signature := r.Header.Get("x-square-hmacsha256-signature")
if signature == "" {
log.Printf("Missing Square webhook signature header")
http.Error(w, "Invalid signature", http.StatusForbidden)
return
}
if !verifySquareSignature(body, signature, signingKey) {
if !verifySquareSignature(body, signature, signingKey, notificationURL) {
log.Printf("Invalid Square webhook signature")
http.Error(w, "Invalid signature", http.StatusForbidden)
return
@@ -95,10 +77,11 @@ func HandleSquareWebhook(w http.ResponseWriter, r *http.Request) {
w.Write([]byte("ok"))
}
func verifySquareSignature(body []byte, signature, signingKey string) bool {
func verifySquareSignature(body []byte, signature, signingKey, notificationURL string) bool {
mac := hmac.New(sha256.New, []byte(signingKey))
mac.Write([]byte(notificationURL))
mac.Write(body)
expected := hex.EncodeToString(mac.Sum(nil))
expected := base64.StdEncoding.EncodeToString(mac.Sum(nil))
return hmac.Equal([]byte(signature), []byte(expected))
}
backend/handlers/webhooks/webhooks_test.go
+28 -17
View File
@@ -8,7 +8,7 @@ import (
"context"
"crypto/hmac"
"crypto/sha256"
"encoding/hex"
"encoding/base64"
"encoding/json"
"net/http"
"net/http/httptest"
@@ -24,12 +24,14 @@ func TestVerifySquareSignature_ValidSignature(t *testing.T) {
t.Parallel()
body := []byte(`{"type":"payment.updated","event_id":"evt_1"}`)
key := "test-signing-key"
notificationURL := "http://localhost:8080/webhooks/square"
payload := notificationURL + string(body)
mac := hmac.New(sha256.New, []byte(key))
mac.Write(body)
expectedSig := hex.EncodeToString(mac.Sum(nil))
mac.Write([]byte(payload))
expectedSig := base64.StdEncoding.EncodeToString(mac.Sum(nil))
if !verifySquareSignature(body, expectedSig, key) {
if !verifySquareSignature(body, expectedSig, key, notificationURL) {
t.Error("expected valid signature to verify")
}
}
@@ -38,8 +40,9 @@ func TestVerifySquareSignature_InvalidSignature(t *testing.T) {
t.Parallel()
body := []byte(`{"type":"payment.updated"}`)
key := "test-signing-key"
notificationURL := "http://localhost:8080/webhooks/square"
if verifySquareSignature(body, "invalid-signature", key) {
if verifySquareSignature(body, "invalid-signature", key, notificationURL) {
t.Error("expected invalid signature to fail")
}
}
@@ -47,13 +50,15 @@ func TestVerifySquareSignature_InvalidSignature(t *testing.T) {
func TestVerifySquareSignature_WrongKey(t *testing.T) {
t.Parallel()
body := []byte(`{"type":"payment.updated"}`)
notificationURL := "http://localhost:8080/webhooks/square"
payload := notificationURL + string(body)
mac := hmac.New(sha256.New, []byte("correct-key"))
mac.Write(body)
sig := hex.EncodeToString(mac.Sum(nil))
mac.Write([]byte(payload))
sig := base64.StdEncoding.EncodeToString(mac.Sum(nil))
// Verify with a different key
if verifySquareSignature(body, sig, "wrong-key") {
if verifySquareSignature(body, sig, "wrong-key", notificationURL) {
t.Error("expected wrong key to produce failing verification")
}
}
@@ -61,12 +66,14 @@ func TestVerifySquareSignature_WrongKey(t *testing.T) {
func TestVerifySquareSignature_EmptyBody(t *testing.T) {
t.Parallel()
key := "test-signing-key"
notificationURL := "http://localhost:8080/webhooks/square"
payload := notificationURL + string([]byte{})
mac := hmac.New(sha256.New, []byte(key))
mac.Write([]byte{})
expectedSig := hex.EncodeToString(mac.Sum(nil))
mac.Write([]byte(payload))
expectedSig := base64.StdEncoding.EncodeToString(mac.Sum(nil))
if !verifySquareSignature([]byte{}, expectedSig, key) {
if !verifySquareSignature([]byte{}, expectedSig, key, notificationURL) {
t.Error("expected empty body verification to succeed with matching signature")
}
}
@@ -75,14 +82,16 @@ func TestVerifySquareSignature_TamperedBody(t *testing.T) {
t.Parallel()
body := []byte(`{"type":"payment.updated","event_id":"evt_1"}`)
key := "test-signing-key"
notificationURL := "http://localhost:8080/webhooks/square"
payload := notificationURL + string(body)
mac := hmac.New(sha256.New, []byte(key))
mac.Write(body)
sig := hex.EncodeToString(mac.Sum(nil))
mac.Write([]byte(payload))
sig := base64.StdEncoding.EncodeToString(mac.Sum(nil))
// Verify with a tampered body
tamperedBody := []byte(`{"type":"payment.updated","event_id":"evt_2"}`)
if verifySquareSignature(tamperedBody, sig, key) {
if verifySquareSignature(tamperedBody, sig, key, notificationURL) {
t.Error("expected tampered body to fail verification")
}
}
@@ -97,7 +106,7 @@ func makeWebhookRequest(body []byte, signature string, ctx context.Context) *htt
req = req.WithContext(ctx)
req.Header.Set("Content-Type", "application/json")
if signature != "" {
req.Header.Set("x-square-signature", signature)
req.Header.Set("x-square-hmacsha256-signature", signature)
}
HandleSquareWebhook(w, req)
return w
@@ -188,10 +197,12 @@ func TestHandleSquareWebhook_ValidSignatureWithEnvKey(t *testing.T) {
body := []byte(`{"type":"payment.updated","event_id":"evt_1"}`)
key := "env-signing-key"
notificationURL := "http://localhost:8080/webhooks/square"
payload := notificationURL + string(body)
mac := hmac.New(sha256.New, []byte(key))
mac.Write(body)
sig := hex.EncodeToString(mac.Sum(nil))
mac.Write([]byte(payload))
sig := base64.StdEncoding.EncodeToString(mac.Sum(nil))
t.Setenv("SQUARE_WEBHOOK_SIGNATURE_KEY", key)