feat(api): reclaim squatted usernames for Mojang-priority players (spec §B3)
When the configured third-party Yggdrasil and the official Mojang service
issue the same username under different UUIDs, the non-genuine squatter is
displaced in favour of the real Mojang owner (正版优先). This adds the
Go-verifiable data layer of that flow on the internal (velocity) face.
- migration 0006: username_blacklist (barred squatter UUIDs) and
player_data_holds (the displaced account's 30-day data stash), both keyed
by mc_uuid so the genuine Mojang player — identical username, different
UUID — is never caught by the bar.
- POST /api/v1/internal/player/reclaim bars the squatter UUID and stashes
its data in one transaction (all-or-nothing). It is idempotent on a
retried callback and returns the hold's effective expiry — the first
reclaim's window, never a fresh now()+30d — so the rejected player is told
the truth about how long their data is kept.
- GET /api/v1/internal/player/blacklist/{mc_uuid} is the login-gate check
velocity calls to reject a barred squatter before admitting them.
Scope: velocity collision-routing, the limbo prompt, the authlib
dual-backend and the data-inherit flow are code-only (Java plus a QR-bound
device session a row cannot express) and are not part of this slice. Unit
tests cover the handlers and the in-memory repo contract; the Postgres SQL
path is exercised by integration only.
This commit is contained in:
8 files changed
+611
No files matched your search
@@ -0,0 +1,239 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Username-collision reclaim (spec §B3) is Mojang-priority: when a non-genuine
|
||||
// player squats a name the official service also issues, velocity bars the
|
||||
// squatter's UUID and stashes its data for 30 days. These tests pin the
|
||||
// Go-verifiable data layer of that flow — the bar, the stash, idempotency, and
|
||||
// the one safety property that must never regress: the block is keyed by UUID, so
|
||||
// the genuine Mojang player (same name, DIFFERENT UUID) is never caught.
|
||||
|
||||
// TestReclaimBarsSquatterAndStashes is the happy path: a reclaim bars the
|
||||
// squatter UUID, the subsequent gate check for that UUID reports barred, and the
|
||||
// data hold lands with the API-clock 30-day expiry.
|
||||
func TestReclaimBarsSquatterAndStashes(t *testing.T) {
|
||||
const squatter = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
|
||||
repo := newFakeRepo()
|
||||
api := newTestAPI(repo, newFakeCluster())
|
||||
ih := api.InternalHandler()
|
||||
|
||||
body := `{"squatter_uuid":"` + squatter + `","username":"Notch","data_ref":"s3://holds/notch"}`
|
||||
w := do(ih, "POST", "/api/v1/internal/player/reclaim", body, nil)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("reclaim: code = %d, want 200 (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
b := acctBody(t, w)
|
||||
if b["blacklisted"] != true || b["username"] != "Notch" {
|
||||
t.Fatalf("reclaim body = %v, want blacklisted:true username:Notch", b)
|
||||
}
|
||||
|
||||
// The squatter UUID is now barred — what the velocity login gate checks.
|
||||
if !repo.blacklist[squatter] {
|
||||
t.Fatal("squatter UUID was not barred")
|
||||
}
|
||||
// The data is stashed for inherit with the authoritative-clock 30-day window.
|
||||
hold, ok := repo.holds[squatter]
|
||||
if !ok {
|
||||
t.Fatal("no data hold was stashed for the squatter")
|
||||
}
|
||||
if hold.username != "Notch" || hold.dataRef != "s3://holds/notch" {
|
||||
t.Errorf("hold = %+v, want username:Notch dataRef:s3://holds/notch", hold)
|
||||
}
|
||||
if want := api.now().Add(reclaimHoldTTL); !hold.expiresAt.Equal(want) {
|
||||
t.Errorf("hold.expiresAt = %v, want %v", hold.expiresAt, want)
|
||||
}
|
||||
|
||||
// The gate check for the barred UUID reports it.
|
||||
w = do(ih, "GET", "/api/v1/internal/player/blacklist/"+squatter, "", nil)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("blacklist check: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
if acctBody(t, w)["blacklisted"] != true {
|
||||
t.Fatalf("blacklist check body = %s, want blacklisted:true", w.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
// TestReclaimNeverCatchesGenuineMojangPlayer is the load-bearing safety property:
|
||||
// the block is keyed by UUID, never by the contested name. A genuine Mojang
|
||||
// player shares the username but carries a different UUID, so the gate must let
|
||||
// them through even after the squatter is barred. If this ever regresses,正版优先
|
||||
// becomes正版连不上 — the exact outcome the design forbids.
|
||||
func TestReclaimNeverCatchesGenuineMojangPlayer(t *testing.T) {
|
||||
const (
|
||||
squatter = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
|
||||
genuine = "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb" // same name, real owner
|
||||
)
|
||||
repo := newFakeRepo()
|
||||
api := newTestAPI(repo, newFakeCluster())
|
||||
ih := api.InternalHandler()
|
||||
|
||||
body := `{"squatter_uuid":"` + squatter + `","username":"Notch"}`
|
||||
if w := do(ih, "POST", "/api/v1/internal/player/reclaim", body, nil); w.Code != http.StatusOK {
|
||||
t.Fatalf("reclaim: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
|
||||
// The genuine owner — identical username, different UUID — is NOT barred.
|
||||
w := do(ih, "GET", "/api/v1/internal/player/blacklist/"+genuine, "", nil)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("genuine check: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
if got := acctBody(t, w)["blacklisted"]; got != false {
|
||||
t.Fatalf("genuine Mojang player blacklisted = %v, want false", got)
|
||||
}
|
||||
}
|
||||
|
||||
// TestReclaimIsIdempotent proves a retried velocity callback is harmless: a repeat
|
||||
// reclaim of an already-barred UUID still answers 200 and does not disturb the
|
||||
// original hold (matching the ON CONFLICT DO NOTHING in both inserts).
|
||||
func TestReclaimIsIdempotent(t *testing.T) {
|
||||
const squatter = "cccccccc-cccc-cccc-cccc-cccccccccccc"
|
||||
repo := newFakeRepo()
|
||||
api := newTestAPI(repo, newFakeCluster())
|
||||
ih := api.InternalHandler()
|
||||
|
||||
first := `{"squatter_uuid":"` + squatter + `","username":"Herobrine","data_ref":"ref-1"}`
|
||||
if w := do(ih, "POST", "/api/v1/internal/player/reclaim", first, nil); w.Code != http.StatusOK {
|
||||
t.Fatalf("first reclaim: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
original := repo.holds[squatter]
|
||||
|
||||
// A retry with a different data_ref must not overwrite the original stash.
|
||||
retry := `{"squatter_uuid":"` + squatter + `","username":"Herobrine","data_ref":"ref-2"}`
|
||||
if w := do(ih, "POST", "/api/v1/internal/player/reclaim", retry, nil); w.Code != http.StatusOK {
|
||||
t.Fatalf("retry reclaim: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
if got := repo.holds[squatter]; got != original {
|
||||
t.Errorf("idempotent retry altered the hold: got %+v, want %+v", got, original)
|
||||
}
|
||||
}
|
||||
|
||||
// TestReclaimRetryReportsOriginalWindow is the regression for the response-honesty
|
||||
// fix: the squatter reconnects days later, velocity re-fires the reclaim, and the
|
||||
// hold keeps its FIRST 30-day window (ON CONFLICT preserves it). The response must
|
||||
// report that persisted window, NOT a fresh now()+30d — otherwise velocity tells
|
||||
// the player a kept-until date the stored hold does not actually have. A frozen
|
||||
// clock cannot catch this, so the clock is advanced between the two reclaims.
|
||||
func TestReclaimRetryReportsOriginalWindow(t *testing.T) {
|
||||
const squatter = "eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee"
|
||||
repo := newFakeRepo()
|
||||
api := newTestAPI(repo, newFakeCluster())
|
||||
clock := time.Unix(1_700_000_000, 0)
|
||||
api.Now = func() time.Time { return clock }
|
||||
ih := api.InternalHandler()
|
||||
|
||||
body := `{"squatter_uuid":"` + squatter + `","username":"Notch"}`
|
||||
w := do(ih, "POST", "/api/v1/internal/player/reclaim", body, nil)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("first reclaim: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
first := acctBody(t, w)["hold_expires_at"]
|
||||
|
||||
// Three days pass; velocity re-fires the reclaim on the squatter's next attempt.
|
||||
clock = clock.Add(72 * time.Hour)
|
||||
w = do(ih, "POST", "/api/v1/internal/player/reclaim", body, nil)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("retry reclaim: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
second := acctBody(t, w)["hold_expires_at"]
|
||||
|
||||
if first != second {
|
||||
t.Fatalf("retry hold_expires_at = %v, want the original %v — the response must reflect the persisted hold, not a fresh clock", second, first)
|
||||
}
|
||||
// And it must equal the first reclaim's window, not the retry-time clock.
|
||||
if want := time.Unix(1_700_000_000, 0).Add(reclaimHoldTTL).UTC().Format(time.RFC3339Nano); second != want {
|
||||
t.Errorf("hold_expires_at = %v, want %v (first reclaim's window)", second, want)
|
||||
}
|
||||
}
|
||||
|
||||
// TestReclaimAudited proves a reclaim writes a security-significant accountability
|
||||
// row: a player is barred and their world stashed, so the event lands in
|
||||
// audit_logs as player.reclaim from velocity over the internal source, with the
|
||||
// contested name and squatter UUID in the structured payload.
|
||||
func TestReclaimAudited(t *testing.T) {
|
||||
const squatter = "dddddddd-dddd-dddd-dddd-dddddddddddd"
|
||||
repo := newFakeRepo()
|
||||
api := newTestAPI(repo, newFakeCluster())
|
||||
ih := api.InternalHandler()
|
||||
|
||||
body := `{"squatter_uuid":"` + squatter + `","username":"Steve"}`
|
||||
if w := do(ih, "POST", "/api/v1/internal/player/reclaim", body, nil); w.Code != http.StatusOK {
|
||||
t.Fatalf("reclaim: code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
if len(repo.audits) != 1 {
|
||||
t.Fatalf("audits = %d, want 1", len(repo.audits))
|
||||
}
|
||||
a := repo.audits[0]
|
||||
if a.Action != "player.reclaim" || a.Actor != "velocity" || a.Source != "internal" {
|
||||
t.Fatalf("audit = %+v, want player.reclaim/velocity/internal", a)
|
||||
}
|
||||
var p map[string]string
|
||||
if err := json.Unmarshal(a.Payload, &p); err != nil {
|
||||
t.Fatalf("audit payload not JSON: %v (%s)", err, a.Payload)
|
||||
}
|
||||
if p["username"] != "Steve" || p["squatter_uuid"] != squatter {
|
||||
t.Errorf("audit payload = %v, want username:Steve squatter_uuid:%s", p, squatter)
|
||||
}
|
||||
}
|
||||
|
||||
// TestReclaimValidation is the input matrix: a reclaim with no UUID or no username
|
||||
// is a 400, strict decoding rejects unknown fields, and a rejected request neither
|
||||
// bars anyone nor stashes anything.
|
||||
func TestReclaimValidation(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
body string
|
||||
}{
|
||||
{"missing squatter_uuid", `{"username":"Notch"}`},
|
||||
{"empty squatter_uuid", `{"squatter_uuid":"","username":"Notch"}`},
|
||||
{"missing username", `{"squatter_uuid":"aaaa"}`},
|
||||
{"empty username", `{"squatter_uuid":"aaaa","username":""}`},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
repo := newFakeRepo()
|
||||
api := newTestAPI(repo, newFakeCluster())
|
||||
w := do(api.InternalHandler(), "POST", "/api/v1/internal/player/reclaim", tc.body, nil)
|
||||
if w.Code != http.StatusBadRequest || decodeErr(t, w) != "bad_request" {
|
||||
t.Fatalf("code = %d body %s, want 400 bad_request", w.Code, w.Body.String())
|
||||
}
|
||||
if len(repo.blacklist) != 0 || len(repo.holds) != 0 {
|
||||
t.Fatal("a rejected reclaim must not bar or stash anything")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
t.Run("unknown field rejected", func(t *testing.T) {
|
||||
repo := newFakeRepo()
|
||||
api := newTestAPI(repo, newFakeCluster())
|
||||
body := `{"squatter_uuid":"aaaa","username":"Notch","reason":"smuggled"}`
|
||||
w := do(api.InternalHandler(), "POST", "/api/v1/internal/player/reclaim", body, nil)
|
||||
if w.Code != http.StatusBadRequest {
|
||||
t.Fatalf("strict decode must reject unknown field, code = %d (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TestReclaimFaceSeparation enforces that the reclaim and gate-check endpoints are
|
||||
// internal-only: velocity holds a service token, a web Principal never reaches
|
||||
// them. Crossing onto the external face must 404, not silently work — a logged-in
|
||||
// user could otherwise bar an arbitrary UUID.
|
||||
func TestReclaimFaceSeparation(t *testing.T) {
|
||||
user := &Principal{UserID: "u1", Email: "[email protected]", Role: "user"}
|
||||
api := newTestAPI(newFakeRepo(), newFakeCluster())
|
||||
api.External = staticExternal{p: user}
|
||||
eh := api.ExternalHandler()
|
||||
|
||||
body := `{"squatter_uuid":"aaaa","username":"Notch"}`
|
||||
if w := do(eh, "POST", "/api/v1/internal/player/reclaim", body, nil); w.Code != http.StatusNotFound {
|
||||
t.Errorf("reclaim on external face: code = %d, want 404", w.Code)
|
||||
}
|
||||
if w := do(eh, "GET", "/api/v1/internal/player/blacklist/aaaa", "", nil); w.Code != http.StatusNotFound {
|
||||
t.Errorf("blacklist check on external face: code = %d, want 404", w.Code)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user