Skip to content

Commit 45af86c

Browse files
committed
fix(settings): reset anisette data per account
The engine provisions Anisette state per account and now requires --username on `anisette reset`, so the account-less call failed with a missing-argument error. Pass the account through the endpoint (JSON body), have the engine discard exactly that account's state, and pick the account in the settings advanced section with an account select next to the reset button. Without any account the section explains that a reset needs one instead of offering a button that cannot work.
1 parent 533aee4 commit 45af86c

11 files changed

Lines changed: 206 additions & 62 deletions

File tree

‎internal/manager/anisette.go‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
package manager
22

33
import (
4+
"errors"
5+
"strings"
6+
47
"github.com/bitxeno/atvloadly/internal/exec"
58
"github.com/bitxeno/atvloadly/internal/log"
69
)
710

8-
// ResetAnisette deletes the local Anisette provisioning data through the
9-
// engine, so it is generated again on the next login or install. The engine
10-
// owns the location of its data and drops every file that belongs to it; the
11-
// command is local, so it needs no working directory or proxy environment.
12-
func ResetAnisette() error {
13-
if _, err := exec.NewCommand("plumesign", "anisette", "reset").CombinedOutput(); err != nil {
14-
log.Err(err).Msg("Error resetting anisette data")
11+
// ResetAnisette drops the Anisette provisioning data of a single account
12+
// through the engine, so a new device identity is generated the next time that
13+
// account is used. Anisette state is provisioned per account, so the engine
14+
// needs the account to know which state to discard. The command is local, so
15+
// it needs no working directory or proxy environment.
16+
func ResetAnisette(email string) error {
17+
email = strings.TrimSpace(email)
18+
if email == "" {
19+
return errors.New("account email is required")
20+
}
21+
22+
if _, err := exec.NewCommand("plumesign", "anisette", "reset", "-u", email).CombinedOutput(); err != nil {
23+
log.Err(err).Msgf("Error resetting anisette data for %s", email)
1524
return err
1625
}
17-
log.Infof("Reset anisette data")
26+
log.Infof("Reset anisette data for %s", email)
1827
return nil
1928
}

‎internal/manager/anisette_test.go‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,40 @@ func fakeAnisetteEngine(t *testing.T, exitCode string) string {
2323
return record
2424
}
2525

26-
// Anisette data is reset by the engine rather than by deleting files this
27-
// process guesses, so the engine owns the location of its provisioning data.
28-
func TestResetAnisetteRunsEngineCommand(t *testing.T) {
26+
// Anisette state is provisioned per account, so the reset names the account
27+
// and the engine discards exactly that state.
28+
func TestResetAnisetteRunsEngineCommandForAccount(t *testing.T) {
2929
record := fakeAnisetteEngine(t, "0")
3030

31-
if err := ResetAnisette(); err != nil {
31+
if err := ResetAnisette("user@example.com"); err != nil {
3232
t.Fatalf("ResetAnisette() error = %v", err)
3333
}
3434

35-
if got := strings.Join(recordedArgs(t, record), " "); got != "anisette reset" {
36-
t.Errorf("arguments = %q, want %q", got, "anisette reset")
35+
want := "anisette reset -u user@example.com"
36+
if got := strings.Join(recordedArgs(t, record), " "); got != want {
37+
t.Errorf("arguments = %q, want %q", got, want)
38+
}
39+
}
40+
41+
// A blank account names no Anisette state, so the call is rejected before any
42+
// command runs.
43+
func TestResetAnisetteRequiresAccount(t *testing.T) {
44+
record := fakeAnisetteEngine(t, "0")
45+
46+
if err := ResetAnisette(" "); err == nil {
47+
t.Fatal("ResetAnisette() error = nil, want an error")
48+
}
49+
50+
if _, err := os.Stat(record); !os.IsNotExist(err) {
51+
t.Errorf("the engine was run for a blank account (stat err = %v)", err)
3752
}
3853
}
3954

4055
// A failing engine surfaces its error instead of reporting a successful reset.
4156
func TestResetAnisetteReportsEngineFailure(t *testing.T) {
4257
fakeAnisetteEngine(t, "1")
4358

44-
if err := ResetAnisette(); err == nil {
59+
if err := ResetAnisette("user@example.com"); err == nil {
4560
t.Fatal("ResetAnisette() error = nil, want an error")
4661
}
4762
}

‎locales/en.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
,
318318
"login_modal": {
319319
"title": "Login Apple Account",
320-
"2fa_warning": "Only trusted devices can receive the 2FA code. Receiving it by SMS is not supported.",
320+
"setup_2fa_help": "How to set up an iPhone as a trusted device for 2FA?",
321321
"button": {
322322
"close": "Close",
323323
"login": "Login",
@@ -484,13 +484,18 @@
484484
"update_coreadi": "Update CoreADI",
485485
"update_coreadi_confirm": "Are you sure you want update the CoreADI libraries?",
486486
"reset_anisette": "Reset Anisette Data",
487-
"reset_anisette_confirm": "Are you sure you want to reset the Anisette data? It will be provisioned again on the next login or install.",
487+
"reset_anisette_select": "Select an account",
488+
"reset_anisette_empty": "Anisette data is reset per account. Add an Apple ID account first.",
489+
"reset_anisette_confirm": "Are you sure you want to reset the Anisette data of {{email}}? A new device identity is generated on its next use, so the account must log in again.",
490+
"reset": "Reset",
488491
"cancel": "Cancel",
489492
"confirm": "Confirm",
490493
"toast": {
491494
"downloading": "Downloading...",
492495
"success": "Update completed",
493-
"failed": "Update failed"
496+
"failed": "Update failed",
497+
"reset_success": "Anisette data of {{email}} reset",
498+
"reset_failed": "Reset failed"
494499
}
495500
}
496501
},

‎locales/sr-Latn.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
},
316316
"login_modal": {
317317
"title": "Prijava na Apple nalog",
318-
"2fa_warning": "Samo pouzdani uređaji mogu da prime 2FA kod. Prijem putem SMS-a nije podržan.",
318+
"setup_2fa_help": "Kako podesiti iPhone kao pouzdani uređaj za 2FA kod?",
319319
"button": {
320320
"close": "Zatvori",
321321
"login": "Prijavi se",
@@ -481,13 +481,18 @@
481481
"update_coreadi": "Ažuriraj CoreADI",
482482
"update_coreadi_confirm": "Da li ste sigurni da želite da ažurirate CoreADI biblioteke?",
483483
"reset_anisette": "Resetuj Anisette podatke",
484-
"reset_anisette_confirm": "Da li ste sigurni da želite da resetujete Anisette podatke? Biće ponovo kreirani pri sledećem prijavljivanju ili instalaciji.",
484+
"reset_anisette_select": "Izaberite nalog",
485+
"reset_anisette_empty": "Anisette podaci se resetuju po nalogu. Prvo dodajte Apple ID nalog.",
486+
"reset_anisette_confirm": "Da li ste sigurni da želite da resetujete Anisette podatke za {{email}}? Novi identitet uređaja biće kreiran pri sledećem korišćenju, pa se nalog mora ponovo prijaviti.",
487+
"reset": "Resetuj",
485488
"cancel": "Otkaži",
486489
"confirm": "Potvrdi",
487490
"toast": {
488491
"downloading": "Preuzimanje...",
489492
"success": "Ažuriranje je završeno",
490-
"failed": "Ažuriranje nije uspelo"
493+
"failed": "Ažuriranje nije uspelo",
494+
"reset_success": "Anisette podaci za {{email}} su resetovani",
495+
"reset_failed": "Resetovanje nije uspelo"
491496
}
492497
}
493498
},

‎locales/sr.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
},
316316
"login_modal": {
317317
"title": "Пријава на Apple налог",
318-
"2fa_warning": "Само поуздани уређаји могу да приме 2FA код. Пријем путем СМС-а није подржан.",
318+
"setup_2fa_help": "Како подесити iPhone као поуздани уређај за 2FA код?",
319319
"button": {
320320
"close": "Затвори",
321321
"login": "Пријави се",
@@ -481,13 +481,18 @@
481481
"update_coreadi": "Ажурирај CoreADI",
482482
"update_coreadi_confirm": "Да ли сте сигурни да желите да ажурирате CoreADI библиотеке?",
483483
"reset_anisette": "Ресетуј Anisette податке",
484-
"reset_anisette_confirm": "Да ли сте сигурни да желите да ресетујете Anisette податке? Биће поново креирани при следећем пријављивању или инсталацији.",
484+
"reset_anisette_select": "Изаберите налог",
485+
"reset_anisette_empty": "Anisette подаци се ресетују по налогу. Прво додајте Apple ID налог.",
486+
"reset_anisette_confirm": "Да ли сте сигурни да желите да ресетујете Anisette податке за {{email}}? Нови идентитет уређаја биће креиран при следећем коришћењу, па се налог мора поново пријавити.",
487+
"reset": "Ресетуј",
485488
"cancel": "Откажи",
486489
"confirm": "Потврди",
487490
"toast": {
488491
"downloading": "Преузимање...",
489492
"success": "Ажурирање је завршено",
490-
"failed": "Ажурирање није успело"
493+
"failed": "Ажурирање није успело",
494+
"reset_success": "Anisette подаци за {{email}} су ресетовани",
495+
"reset_failed": "Ресетовање није успело"
491496
}
492497
}
493498
},

‎locales/sv.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
},
316316
"login_modal": {
317317
"title": "Logga in på ett Apple-konto",
318-
"2fa_warning": "Endast betrodda enheter kan ta emot 2FA-koden. Att ta emot den via SMS stöds inte.",
318+
"setup_2fa_help": "Hur sätter man upp en iPhone som betrodd enhet för 2FA?",
319319
"button": {
320320
"close": "Stäng",
321321
"login": "Logga in",
@@ -481,13 +481,18 @@
481481
"update_coreadi": "Uppdatera CoreADI",
482482
"update_coreadi_confirm": "Vill du verkligen uppdatera CoreADI-biblioteken?",
483483
"reset_anisette": "Återställ Anisette-data",
484-
"reset_anisette_confirm": "Vill du verkligen återställa Anisette-data? Den skapas på nytt vid nästa inloggning eller installation.",
484+
"reset_anisette_select": "Välj ett konto",
485+
"reset_anisette_empty": "Anisette-data återställs per konto. Lägg till ett Apple ID-konto först.",
486+
"reset_anisette_confirm": "Vill du verkligen återställa Anisette-data för {{email}}? En ny enhetsidentitet skapas vid nästa användning, så kontot måste logga in igen.",
487+
"reset": "Återställ",
485488
"cancel": "Avbryt",
486489
"confirm": "Bekräfta",
487490
"toast": {
488491
"downloading": "Laddar ned…",
489492
"success": "Uppdateringen är klar",
490-
"failed": "Uppdateringen misslyckades"
493+
"failed": "Uppdateringen misslyckades",
494+
"reset_success": "Anisette-data för {{email}} har återställts",
495+
"reset_failed": "Återställningen misslyckades"
491496
}
492497
}
493498
},

‎locales/zh_cn.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
,
318318
"login_modal": {
319319
"title": "登录 Apple 帐号",
320-
"2fa_warning": "只支持受信任的设备接收 2FA,不支持短信接收",
320+
"setup_2fa_help": "如何把 iPhone 设为 2FA 授信设备?",
321321
"button": {
322322
"close": "关闭",
323323
"login": "登录",
@@ -484,13 +484,18 @@
484484
"update_coreadi": "更新 CoreADI",
485485
"update_coreadi_confirm": "确认要下载并更新 CoreADI 库文件吗?",
486486
"reset_anisette": "重置 Anisette 数据",
487-
"reset_anisette_confirm": "确认要重置 Anisette 数据吗?下次登录或安装时将重新生成。",
487+
"reset_anisette_select": "请选择帐号",
488+
"reset_anisette_empty": "Anisette 数据按帐号重置,请先添加 Apple ID 帐号。",
489+
"reset_anisette_confirm": "确认要重置 {{email}} 的 Anisette 数据吗?下次使用该帐号时将生成新的设备身份,需要重新登录。",
490+
"reset": "重置",
488491
"cancel": "取消",
489492
"confirm": "确认",
490493
"toast": {
491494
"downloading": "正在下载...",
492495
"success": "更新完成",
493-
"failed": "更新失败"
496+
"failed": "更新失败",
497+
"reset_success": "已重置 {{email}} 的 Anisette 数据",
498+
"reset_failed": "重置失败"
494499
}
495500
}
496501
},

‎web/router.go‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,9 +847,19 @@ func route(fi *fiber.App) {
847847
return c.Status(http.StatusOK).JSON(apiSuccess(true))
848848
})
849849

850-
// Reset the Anisette data through the engine; it is generated again on next use
850+
// Reset one account's Anisette data through the engine; a new device
851+
// identity is generated the next time that account is used.
851852
api.Post("/settings/reset/anisette", func(c *fiber.Ctx) error {
852-
if err := manager.ResetAnisette(); err != nil {
853+
var req struct {
854+
Email string `json:"email"`
855+
}
856+
if err := c.BodyParser(&req); err != nil {
857+
return c.Status(http.StatusOK).JSON(apiError("Invalid argument"))
858+
}
859+
if strings.TrimSpace(req.Email) == "" {
860+
return c.Status(http.StatusOK).JSON(apiError("email is required"))
861+
}
862+
if err := manager.ResetAnisette(req.Email); err != nil {
853863
return c.Status(http.StatusOK).JSON(apiError("reset failed: " + err.Error()))
854864
}
855865
return c.Status(http.StatusOK).JSON(apiSuccess(true))

‎web/settings_test.go‎

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ func TestSaveUpdateSettingsReplacesAndClearsToken(t *testing.T) {
182182
}
183183
}
184184

185-
// The reset endpoint delegates to the engine command; the flag it reports is
186-
// the engine result, so a missing engine is reported as a failure.
187-
func TestResetAnisetteRouteRunsEngineCommand(t *testing.T) {
185+
// The reset endpoint names the account it resets, because Anisette state is
186+
// provisioned per account; the flag it reports is the engine result.
187+
func TestResetAnisetteRouteRunsEngineCommandForAccount(t *testing.T) {
188188
engineDir := t.TempDir()
189189
record := filepath.Join(engineDir, "args")
190190
script := "#!/bin/sh\n" +
@@ -196,7 +196,9 @@ func TestResetAnisetteRouteRunsEngineCommand(t *testing.T) {
196196
t.Setenv("PATH", engineDir+string(os.PathListSeparator)+os.Getenv("PATH"))
197197

198198
server, _ := newTestServer(t)
199-
resp, err := server.Test(httptest.NewRequest(http.MethodPost, "/api/settings/reset/anisette", nil))
199+
req := httptest.NewRequest(http.MethodPost, "/api/settings/reset/anisette", strings.NewReader(`{"email":"user@example.com"}`))
200+
req.Header.Set("Content-Type", "application/json")
201+
resp, err := server.Test(req)
200202
if err != nil {
201203
t.Fatal(err)
202204
}
@@ -206,7 +208,45 @@ func TestResetAnisetteRouteRunsEngineCommand(t *testing.T) {
206208
if err != nil {
207209
t.Fatalf("the engine was not run: %v", err)
208210
}
209-
if got := strings.Join(strings.Fields(string(data)), " "); got != "anisette reset" {
210-
t.Errorf("arguments = %q, want %q", got, "anisette reset")
211+
want := "anisette reset -u user@example.com"
212+
if got := strings.Join(strings.Fields(string(data)), " "); got != want {
213+
t.Errorf("arguments = %q, want %q", got, want)
214+
}
215+
}
216+
217+
// Without an account the request names no Anisette state to reset, so it is
218+
// rejected instead of resetting an unrelated account.
219+
func TestResetAnisetteRouteRejectsMissingAccount(t *testing.T) {
220+
engineDir := t.TempDir()
221+
record := filepath.Join(engineDir, "args")
222+
script := "#!/bin/sh\n" +
223+
"printf '%s\\n' \"$@\" > " + record + "\n" +
224+
"exit 0\n"
225+
if err := os.WriteFile(filepath.Join(engineDir, "plumesign"), []byte(script), 0o755); err != nil {
226+
t.Fatal(err)
227+
}
228+
t.Setenv("PATH", engineDir+string(os.PathListSeparator)+os.Getenv("PATH"))
229+
230+
server, _ := newTestServer(t)
231+
resp, err := server.Test(httptest.NewRequest(http.MethodPost, "/api/settings/reset/anisette", nil))
232+
if err != nil {
233+
t.Fatal(err)
234+
}
235+
defer func() { _ = resp.Body.Close() }()
236+
body, err := io.ReadAll(resp.Body)
237+
if err != nil {
238+
t.Fatal(err)
239+
}
240+
var result struct {
241+
Code int `json:"code"`
242+
}
243+
if err := json.Unmarshal(body, &result); err != nil {
244+
t.Fatalf("decode %q: %v", body, err)
245+
}
246+
if result.Code == 200 {
247+
t.Fatalf("a missing account was accepted, body %q", body)
248+
}
249+
if _, err := os.Stat(record); !os.IsNotExist(err) {
250+
t.Errorf("the engine was run without an account (stat err = %v)", err)
211251
}
212252
}

‎web/static/src/api/api.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,11 +422,12 @@ export default {
422422
timeout: 600000,
423423
});
424424
},
425-
resetAnisette: () => {
425+
resetAnisette: (data) => {
426426
return request({
427427
url: "/api/settings/reset/anisette",
428428
method: "post",
429429
timeout: 30000,
430+
data,
430431
});
431432
},
432433
importPair: (data) => {

0 commit comments

Comments
 (0)
⌂ 换网址