mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-08 19:27:42 +00:00
Mitrahsoft
7733f1953f
## Issue Gitea fails to dump LFS (and other object-storage) files when Azure Blob Storage is configured as the storage backend. The dump reports: Failed to dump LFS objects: /file/path: copying contents: file does not exist This happens with any non-empty base path (the default for LFS storage), which is why the user could only work around it by using `--skip-*` flags. The root cause is in `AzureBlobStorage.IterateObjects()`: Azure's list API already returns each blob's name including the configured base path, but the code was building the read client by running that name through the base-path-prepending helper a second time. This doubled the base path (e.g. `gitea-lfs/gitea-lfs/aa/bb/hash`), pointing at a blob that doesn't exist. `Stat()` still succeeded because it doesn't touch the network, so the failure only surfaced when the dumper actually tried to read the object's contents. ## Solution Add `getBlobClientByFullName()`, which builds a blob client from a name that is already fully qualified, without re-applying `buildAzureBlobPath()`. `IterateObjects()` now uses it for names obtained from Azure's list API. `getBlobClient()` (used by `Open`, `Stat`, `Delete`, `ServeDirectURL`, which take relative paths) is unchanged in behavior. Also add `TestAzureBlobStorageDumpArchive`, a regression test that drives the real dump path (`IterateObjects` → `Stat` → `dump.Dumper.AddFileByReader` → `mholt/archives` zip writer) against a **non-empty** `BasePath`, and verifies the produced archive contains the object with the correct content. The existing Azure tests use an empty `BasePath` and never read object content via `IterateObjects`, which is why they didn't catch this. Fixes #35476 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
107 lines
2.6 KiB
Go
107 lines
2.6 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package storage
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
"gitea.dev/modules/setting"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestLocalStorage(t *testing.T) {
|
|
objStore, err := NewStorage(setting.LocalStorageType, &setting.Storage{Path: t.TempDir()})
|
|
require.NoError(t, err)
|
|
testStorageGeneral(t, objStore)
|
|
}
|
|
|
|
func TestBuildLocalPath(t *testing.T) {
|
|
kases := []struct {
|
|
localDir string
|
|
path string
|
|
expected string
|
|
}{
|
|
{
|
|
"/a",
|
|
"0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/a",
|
|
"../0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/a",
|
|
"0\\a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/b",
|
|
"a/../0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/b",
|
|
"a\\..\\0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
}
|
|
|
|
for _, k := range kases {
|
|
t.Run(k.path, func(t *testing.T) {
|
|
l := LocalStorage{dir: k.localDir}
|
|
|
|
assert.Equal(t, k.expected, l.buildLocalPath(k.path))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestLocalStorageDelete(t *testing.T) {
|
|
rootDir := t.TempDir()
|
|
st, err := NewLocalStorage(t.Context(), &setting.Storage{Path: rootDir})
|
|
require.NoError(t, err)
|
|
|
|
assertExists := func(t *testing.T, path string, exists bool) {
|
|
_, err = os.Stat(rootDir + "/" + path)
|
|
if exists {
|
|
require.NoError(t, err)
|
|
} else {
|
|
require.ErrorIs(t, err, os.ErrNotExist)
|
|
}
|
|
}
|
|
|
|
_, err = st.Save("dir/sub1/1-a.txt", strings.NewReader(""), -1)
|
|
require.NoError(t, err)
|
|
_, err = st.Save("dir/sub1/1-b.txt", strings.NewReader(""), -1)
|
|
require.NoError(t, err)
|
|
_, err = st.Save("dir/sub2/2-a.txt", strings.NewReader(""), -1)
|
|
require.NoError(t, err)
|
|
|
|
assertExists(t, "dir/sub1/1-a.txt", true)
|
|
assertExists(t, "dir/sub1/1-b.txt", true)
|
|
assertExists(t, "dir/sub2/2-a.txt", true)
|
|
|
|
require.NoError(t, st.Delete("dir/sub1/1-a.txt"))
|
|
assertExists(t, "dir/sub1", true)
|
|
assertExists(t, "dir/sub1/1-a.txt", false)
|
|
assertExists(t, "dir/sub1/1-b.txt", true)
|
|
assertExists(t, "dir/sub2/2-a.txt", true)
|
|
|
|
require.NoError(t, st.Delete("dir/sub1/1-b.txt"))
|
|
assertExists(t, ".", true)
|
|
assertExists(t, "dir/sub1", false)
|
|
assertExists(t, "dir/sub1/1-a.txt", false)
|
|
assertExists(t, "dir/sub1/1-b.txt", false)
|
|
assertExists(t, "dir/sub2/2-a.txt", true)
|
|
|
|
require.NoError(t, st.Delete("dir/sub2/2-a.txt"))
|
|
assertExists(t, ".", true)
|
|
assertExists(t, "dir", false)
|
|
}
|