Skip to content

Commit 196e52d

Browse files
authored
fix(app): confine deletion to the app's storage directory (#244)
* fix(app): confine deletion to the app's storage directory * fix(app): reject deletion without a configured storage root
1 parent cc38550 commit 196e52d

3 files changed

Lines changed: 129 additions & 2 deletions

File tree

‎internal/service/db.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,19 @@ func UpdateAppRefreshResult(app model.InstalledApp) error {
296296
}
297297

298298
func DeleteApp(id uint) (bool, error) {
299-
if v, err := GetApp(id); err == nil {
299+
if _, err := GetApp(id); err == nil {
300+
// Refuse deletion when storage ownership cannot be established.
301+
// Otherwise an empty data directory would resolve relative to the
302+
// process working directory instead of the configured app storage.
303+
if conf.Config == nil || conf.Config.Server.DataDir == "" {
304+
return false, errors.New("app data directory is not configured")
305+
}
300306
if result := db.Store().Delete(&model.InstalledApp{}, id); result.Error != nil {
301307
return false, result.Error
302308
}
303-
ipaDir := filepath.Dir(v.IpaPath)
309+
// Only the app's own storage directory is ours to remove. The saved
310+
// IPA path may be empty, remote or point to an unrelated file.
311+
ipaDir := filepath.Join(conf.Config.Server.DataDir, "ipa", fmt.Sprintf("%d", id))
304312
_ = os.RemoveAll(ipaDir)
305313
}
306314

‎internal/service/db_delete_test.go‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
package service
2+
3+
import (
4+
"errors"
5+
"fmt"
6+
"os"
7+
"path/filepath"
8+
"testing"
9+
10+
"github.com/bitxeno/atvloadly/internal/app"
11+
"github.com/bitxeno/atvloadly/internal/db"
12+
"github.com/bitxeno/atvloadly/internal/model"
13+
)
14+
15+
func TestDeleteAppOnlyRemovesOwnedDirectory(t *testing.T) {
16+
for _, test := range []struct {
17+
name string
18+
path string
19+
}{
20+
{name: "external path", path: "external"},
21+
{name: "staged upload", path: "upload"},
22+
{name: "empty path"},
23+
{name: "another app path", path: "other-app"},
24+
} {
25+
t.Run(test.name, func(t *testing.T) {
26+
setupTestDB(t)
27+
dataDir := app.Config.Server.DataDir
28+
29+
installed := &model.InstalledApp{IpaName: "To remove"}
30+
if err := db.Store().Create(installed).Error; err != nil {
31+
t.Fatal(err)
32+
}
33+
34+
ownedDir := filepath.Join(dataDir, "ipa", fmt.Sprintf("%d", installed.ID))
35+
ownedFile := writeTestFile(t, filepath.Join(ownedDir, "app.ipa"))
36+
37+
var unrelatedFile, storedPath string
38+
switch test.path {
39+
case "external":
40+
unrelatedFile = writeTestFile(t, filepath.Join(t.TempDir(), "unrelated", "keep.ipa"))
41+
storedPath = unrelatedFile
42+
case "upload":
43+
storedPath = writeTestFile(t, filepath.Join(dataDir, "tmp", "staged.ipa"))
44+
unrelatedFile = writeTestFile(t, filepath.Join(dataDir, "tmp", "keep.ipa"))
45+
case "other-app":
46+
other := &model.InstalledApp{IpaName: "Keep"}
47+
if err := db.Store().Create(other).Error; err != nil {
48+
t.Fatal(err)
49+
}
50+
unrelatedFile = writeTestFile(t, filepath.Join(dataDir, "ipa", fmt.Sprintf("%d", other.ID), "app.ipa"))
51+
storedPath = unrelatedFile
52+
}
53+
if err := db.Store().Model(installed).Update("ipa_path", storedPath).Error; err != nil {
54+
t.Fatal(err)
55+
}
56+
57+
removed, err := DeleteApp(installed.ID)
58+
if err != nil || !removed {
59+
t.Fatalf("DeleteApp = %t, %v", removed, err)
60+
}
61+
if _, err := GetApp(installed.ID); err == nil {
62+
t.Fatal("app record still exists")
63+
}
64+
if _, err := os.Stat(ownedFile); !errors.Is(err, os.ErrNotExist) {
65+
t.Fatalf("own app directory was not removed: %v", err)
66+
}
67+
if unrelatedFile != "" {
68+
if _, err := os.Stat(unrelatedFile); err != nil {
69+
t.Fatalf("another file was removed: %v", err)
70+
}
71+
}
72+
})
73+
}
74+
}
75+
76+
func TestDeleteAppWithoutStorageRootKeepsRecord(t *testing.T) {
77+
for _, tc := range []struct {
78+
name string
79+
nilConfig bool
80+
}{
81+
{name: "nil config", nilConfig: true},
82+
{name: "empty data directory"},
83+
} {
84+
t.Run(tc.name, func(t *testing.T) {
85+
setupTestDB(t)
86+
dataDir := app.Config.Server.DataDir
87+
88+
record := &model.InstalledApp{IpaName: "Keep"}
89+
if err := db.Store().Create(record).Error; err != nil {
90+
t.Fatal(err)
91+
}
92+
ownedFile := writeTestFile(t, filepath.Join(dataDir, "ipa", fmt.Sprintf("%d", record.ID), "app.ipa"))
93+
94+
if tc.nilConfig {
95+
app.Config = nil
96+
} else {
97+
app.Config.Server.DataDir = ""
98+
}
99+
deleted, err := DeleteApp(record.ID)
100+
if err == nil || deleted {
101+
t.Fatalf("DeleteApp with missing storage root = %t, %v; want error without deletion", deleted, err)
102+
}
103+
if _, err := GetApp(record.ID); err != nil {
104+
t.Fatalf("app record was deleted: %v", err)
105+
}
106+
if _, err := os.Stat(ownedFile); err != nil {
107+
t.Fatalf("app files were altered: %v", err)
108+
}
109+
})
110+
}
111+
}

‎internal/service/signing_identity_test.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88
"time"
99

10+
"github.com/bitxeno/atvloadly/internal/app"
1011
"github.com/bitxeno/atvloadly/internal/db"
1112
"github.com/bitxeno/atvloadly/internal/model"
1213
"github.com/bitxeno/atvloadly/internal/signing"
@@ -15,6 +16,13 @@ import (
1516
// openTestStore opens a fresh migrated database as the global store.
1617
func openTestStore(t *testing.T) {
1718
t.Helper()
19+
// Signing identity tests also delete app rows, which must have a
20+
// configured storage root even when their IPA paths are empty.
21+
previousConfig := app.Config
22+
app.Config = &app.Configuration{}
23+
app.Config.Server.DataDir = t.TempDir()
24+
t.Cleanup(func() { app.Config = previousConfig })
25+
1826
store := db.Open(db.Config{Path: t.TempDir(), FileName: "test.db"})
1927
if err := store.AutoMigrate(&model.InstalledApp{}, &model.SigningIdentity{}); err != nil {
2028
t.Fatalf("migrate: %v", err)

0 commit comments

Comments
 (0)
⌂ 换网址