x/safebin
1
0
Fork 0
mirror of https://github.com/skidoodle/safebin.git synced 2026-04-28 11:17:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: unhandled errors

Browse Source 
Signed-off-by: skidoodle <contact@albert.lol>
This commit is contained in:
albert
2026-01-18 21:19:42 +01:00
parent 73ee7a9a14
commit 8b638275b8
5 changed files with 160 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/app/db.go
+1 -1
View File
@@ -27,7 +27,7 @@ func InitDB(storageDir string) (*bbolt.DB, error) {
})
if err != nil {
db.Close()
_ = db.Close()
return nil, err
}
internal/app/db_test.go
+10 -2
View File
@@ -17,7 +17,11 @@ func TestInitDB(t *testing.T) {
if err != nil {
t.Fatalf("InitDB failed: %v", err)
}
defer db.Close()
defer func() {
if err := db.Close(); err != nil {
t.Errorf("Failed to close DB: %v", err)
}
}()
dbPath := filepath.Join(tmpDir, DBFileName)
if _, err := os.Stat(dbPath); os.IsNotExist(err) {
@@ -42,7 +46,11 @@ func TestDB_MetadataLifecycle(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer db.Close()
defer func() {
if err := db.Close(); err != nil {
t.Errorf("Failed to close DB: %v", err)
}
}()
app := &App{
Conf: Config{StorageDir: tmpDir, MaxMB: 100},
internal/app/server_test.go
+74 -21
View File
@@ -16,13 +16,21 @@ import (
func setupTestApp(t *testing.T) (*App, string) {
storageDir := t.TempDir()
os.MkdirAll(filepath.Join(storageDir, TempDirName), 0700)
if err := os.MkdirAll(filepath.Join(storageDir, TempDirName), 0700); err != nil {
t.Fatalf("Failed to create temp dir: %v", err)
}
webDir := filepath.Join(storageDir, "web")
os.MkdirAll(webDir, 0700)
if err := os.MkdirAll(webDir, 0700); err != nil {
t.Fatalf("Failed to create web dir: %v", err)
}
os.WriteFile(filepath.Join(webDir, "layout.html"), []byte(`{{define "layout"}}{{template "content" .}}{{end}}`), 0600)
os.WriteFile(filepath.Join(webDir, "home.html"), []byte(`{{define "content"}}OK{{end}}`), 0600)
if err := os.WriteFile(filepath.Join(webDir, "layout.html"), []byte(`{{define "layout"}}{{template "content" .}}{{end}}`), 0600); err != nil {
t.Fatalf("Failed to write layout.html: %v", err)
}
if err := os.WriteFile(filepath.Join(webDir, "home.html"), []byte(`{{define "content"}}OK{{end}}`), 0600); err != nil {
t.Fatalf("Failed to write home.html: %v", err)
}
testFS := os.DirFS(webDir)
tmpl := ParseTemplates(testFS)
@@ -31,7 +39,11 @@ func setupTestApp(t *testing.T) (*App, string) {
if err != nil {
t.Fatalf("Failed to init db: %v", err)
}
t.Cleanup(func() { db.Close() })
t.Cleanup(func() {
if err := db.Close(); err != nil {
t.Errorf("Failed to close DB: %v", err)
}
})
app := &App{
Conf: Config{
@@ -58,10 +70,17 @@ func TestIntegration_StandardUploadAndDownload(t *testing.T) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
part, _ := writer.CreateFormFile("file", "test.txt")
part, err := writer.CreateFormFile("file", "test.txt")
if err != nil {
t.Fatalf("CreateFormFile failed: %v", err)
}
content := []byte("Hello Safebin")
part.Write(content)
writer.Close()
if _, err := part.Write(content); err != nil {
t.Fatalf("Write part failed: %v", err)
}
if err := writer.Close(); err != nil {
t.Fatalf("Writer close failed: %v", err)
}
req, _ := http.NewRequest("POST", server.URL+"/", body)
req.Header.Set("Content-Type", writer.FormDataContentType())
@@ -70,7 +89,11 @@ func TestIntegration_StandardUploadAndDownload(t *testing.T) {
if err != nil {
t.Fatalf("Upload request failed: %v", err)
}
defer resp.Body.Close()
defer func() {
if err := resp.Body.Close(); err != nil {
t.Errorf("Failed to close response body: %v", err)
}
}()
if resp.StatusCode != http.StatusOK {
t.Fatalf("Upload failed status: %d", resp.StatusCode)
@@ -86,7 +109,11 @@ func TestIntegration_StandardUploadAndDownload(t *testing.T) {
if err != nil {
t.Fatalf("Download request failed: %v", err)
}
defer resp.Body.Close()
defer func() {
if err := resp.Body.Close(); err != nil {
t.Errorf("Failed to close download response body: %v", err)
}
}()
if resp.StatusCode != http.StatusOK {
t.Fatalf("Download failed status: %d", resp.StatusCode)
@@ -119,7 +146,11 @@ func TestIntegration_ChunkedUpload(t *testing.T) {
}
resp := postForm(t, finishURL, form)
defer resp.Body.Close()
defer func() {
if err := resp.Body.Close(); err != nil {
t.Errorf("Failed to close finish response body: %v", err)
}
}()
if resp.StatusCode != http.StatusOK {
t.Fatalf("Finish failed: %d", resp.StatusCode)
@@ -131,9 +162,14 @@ func TestIntegration_ChunkedUpload(t *testing.T) {
slugWithExt := parts[len(parts)-1]
downloadURL := fmt.Sprintf("%s/%s", server.URL, slugWithExt)
dlResp, _ := http.Get(downloadURL)
dlResp, err := http.Get(downloadURL)
if err != nil {
t.Fatalf("Download request failed: %v", err)
}
dlBytes, _ := io.ReadAll(dlResp.Body)
dlResp.Body.Close()
if err := dlResp.Body.Close(); err != nil {
t.Errorf("Failed to close download response body: %v", err)
}
if !bytes.Equal(content, dlBytes) {
t.Errorf("Chunked reassembly failed. Want %s, got %s", content, dlBytes)
@@ -143,11 +179,22 @@ func TestIntegration_ChunkedUpload(t *testing.T) {
func uploadChunk(t *testing.T, baseURL, uid string, idx int, data []byte) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
writer.WriteField("upload_id", uid)
writer.WriteField("index", fmt.Sprintf("%d", idx))
part, _ := writer.CreateFormFile("chunk", "blob")
part.Write(data)
writer.Close()
if err := writer.WriteField("upload_id", uid); err != nil {
t.Fatalf("WriteField upload_id failed: %v", err)
}
if err := writer.WriteField("index", fmt.Sprintf("%d", idx)); err != nil {
t.Fatalf("WriteField index failed: %v", err)
}
part, err := writer.CreateFormFile("chunk", "blob")
if err != nil {
t.Fatalf("CreateFormFile failed: %v", err)
}
if _, err := part.Write(data); err != nil {
t.Fatalf("Write part failed: %v", err)
}
if err := writer.Close(); err != nil {
t.Fatalf("Writer close failed: %v", err)
}
req, _ := http.NewRequest("POST", baseURL+"/upload/chunk", body)
req.Header.Set("Content-Type", writer.FormDataContentType())
@@ -155,16 +202,22 @@ func uploadChunk(t *testing.T, baseURL, uid string, idx int, data []byte) {
if err != nil || resp.StatusCode != http.StatusOK {
t.Fatalf("Chunk %d upload failed: %v", idx, err)
}
resp.Body.Close()
if err := resp.Body.Close(); err != nil {
t.Errorf("Failed to close chunk response body: %v", err)
}
}
func postForm(t *testing.T, url string, fields map[string]string) *http.Response {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
for k, v := range fields {
writer.WriteField(k, v)
if err := writer.WriteField(k, v); err != nil {
t.Fatalf("WriteField %s failed: %v", k, err)
}
}
if err := writer.Close(); err != nil {
t.Fatalf("Writer close failed: %v", err)
}
writer.Close()
req, _ := http.NewRequest("POST", url, body)
req.Header.Set("Content-Type", writer.FormDataContentType())
internal/app/storage_test.go
+60 -18
View File
@@ -13,10 +13,19 @@ import (
func TestCleanup_AbandonedMerge(t *testing.T) {
tmpDir := t.TempDir()
tmpStorage := filepath.Join(tmpDir, TempDirName)
os.MkdirAll(tmpStorage, 0700)
if err := os.MkdirAll(tmpStorage, 0700); err != nil {
t.Fatalf("MkdirAll failed: %v", err)
}
db, _ := InitDB(tmpDir)
defer db.Close()
db, err := InitDB(tmpDir)
if err != nil {
t.Fatalf("InitDB failed: %v", err)
}
defer func() {
if err := db.Close(); err != nil {
t.Errorf("Failed to close DB: %v", err)
}
}()
app := &App{
Conf: Config{StorageDir: tmpDir},
@@ -44,10 +53,19 @@ func TestCleanup_AbandonedMerge(t *testing.T) {
func TestCleanup_AbandonedChunks(t *testing.T) {
tmpDir := t.TempDir()
tmpStorage := filepath.Join(tmpDir, TempDirName)
os.MkdirAll(tmpStorage, 0700)
if err := os.MkdirAll(tmpStorage, 0700); err != nil {
t.Fatalf("MkdirAll failed: %v", err)
}
db, _ := InitDB(tmpDir)
defer db.Close()
db, err := InitDB(tmpDir)
if err != nil {
t.Fatalf("InitDB failed: %v", err)
}
defer func() {
if err := db.Close(); err != nil {
t.Errorf("Failed to close DB: %v", err)
}
}()
app := &App{
Conf: Config{StorageDir: tmpDir},
@@ -56,11 +74,17 @@ func TestCleanup_AbandonedChunks(t *testing.T) {
}
chunkDir := filepath.Join(tmpStorage, "some_upload_id")
os.MkdirAll(chunkDir, 0700)
os.WriteFile(filepath.Join(chunkDir, "0"), []byte("chunk data"), 0600)
if err := os.MkdirAll(chunkDir, 0700); err != nil {
t.Fatalf("MkdirAll chunkDir failed: %v", err)
}
if err := os.WriteFile(filepath.Join(chunkDir, "0"), []byte("chunk data"), 0600); err != nil {
t.Fatalf("WriteFile chunk failed: %v", err)
}
oldTime := time.Now().Add(-TempExpiry - time.Hour)
os.Chtimes(chunkDir, oldTime, oldTime)
if err := os.Chtimes(chunkDir, oldTime, oldTime); err != nil {
t.Fatalf("Chtimes failed: %v", err)
}
app.CleanTemp(tmpStorage)
@@ -71,8 +95,15 @@ func TestCleanup_AbandonedChunks(t *testing.T) {
func TestCleanup_ExpiredStorage(t *testing.T) {
storageDir := t.TempDir()
db, _ := InitDB(storageDir)
defer db.Close()
db, err := InitDB(storageDir)
if err != nil {
t.Fatalf("InitDB failed: %v", err)
}
defer func() {
if err := db.Close(); err != nil {
t.Errorf("Failed to close DB: %v", err)
}
}()
app := &App{
Conf: Config{
@@ -85,9 +116,16 @@ func TestCleanup_ExpiredStorage(t *testing.T) {
filename := "large_file_id"
path := filepath.Join(storageDir, filename)
f, _ := os.Create(path)
f.Truncate(100 * MegaByte)
f.Close()
f, err := os.Create(path)
if err != nil {
t.Fatalf("Create file failed: %v", err)
}
if err := f.Truncate(100 * MegaByte); err != nil {
t.Fatalf("Truncate failed: %v", err)
}
if err := f.Close(); err != nil {
t.Fatalf("Close file failed: %v", err)
}
expiredMeta := FileMeta{
ID: filename,
@@ -96,11 +134,13 @@ func TestCleanup_ExpiredStorage(t *testing.T) {
ExpiresAt: time.Now().Add(-time.Hour),
}
app.DB.Update(func(tx *bbolt.Tx) error {
if err := app.DB.Update(func(tx *bbolt.Tx) error {
b := tx.Bucket([]byte(DBBucketName))
data, _ := json.Marshal(expiredMeta)
return b.Put([]byte(filename), data)
})
}); err != nil {
t.Fatalf("DB Update failed: %v", err)
}
app.CleanStorage()
@@ -108,11 +148,13 @@ func TestCleanup_ExpiredStorage(t *testing.T) {
t.Error("Cleanup failed to remove expired large file")
}
app.DB.View(func(tx *bbolt.Tx) error {
if err := app.DB.View(func(tx *bbolt.Tx) error {
b := tx.Bucket([]byte(DBBucketName))
if v := b.Get([]byte(filename)); v != nil {
t.Error("Cleanup failed to remove metadata")
}
return nil
})
}); err != nil {
t.Fatalf("DB View failed: %v", err)
}
}