mirror of
https://codeberg.org/forgejo-aneksajo/forgejo-aneksajo.git
synced 2025-08-04 14:00:03 +02:00
4819d4a29a
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/8596 - This reverts behavior that was partially unintentionally introduced in forgejo/forgejo#8143, symbolic links were no longer followed (if they escaped the asset folder) for local assets. - Having symbolic links for user-added files is, to my understanding, a ,common usecase for NixOS and would thus have symbolic links in the asset folders. Avoiding symbolic links is not easy. - The previous code used `http.Dir`, we cannot use that as it's not of the same type. The equivalent is `os.DirFS`. - Unit test to prevent this regression from happening again. Reported-by: bloxx12 (Matrix). Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8610 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
138 lines
3.6 KiB
Go
138 lines
3.6 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package assetfs
|
|
|
|
import (
|
|
"io"
|
|
"io/fs"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestLayered(t *testing.T) {
|
|
dir := filepath.Join(t.TempDir(), "assetfs-layers")
|
|
dir1 := filepath.Join(dir, "l1")
|
|
dir2 := filepath.Join(dir, "l2")
|
|
|
|
mkdir := func(elems ...string) {
|
|
require.NoError(t, os.MkdirAll(filepath.Join(elems...), 0o755))
|
|
}
|
|
write := func(content string, elems ...string) {
|
|
require.NoError(t, os.WriteFile(filepath.Join(elems...), []byte(content), 0o644))
|
|
}
|
|
|
|
// d1 & f1: only in "l1"; d2 & f2: only in "l2"
|
|
// da & fa: in both "l1" and "l2"
|
|
mkdir(dir1, "d1")
|
|
mkdir(dir1, "da")
|
|
mkdir(dir1, "da/sub1")
|
|
|
|
mkdir(dir2, "d2")
|
|
mkdir(dir2, "da")
|
|
mkdir(dir2, "da/sub2")
|
|
|
|
write("dummy", dir1, ".DS_Store")
|
|
write("f1", dir1, "f1")
|
|
write("fa-1", dir1, "fa")
|
|
write("d1-f", dir1, "d1/f")
|
|
write("da-f-1", dir1, "da/f")
|
|
|
|
write("f2", dir2, "f2")
|
|
write("fa-2", dir2, "fa")
|
|
write("d2-f", dir2, "d2/f")
|
|
write("da-f-2", dir2, "da/f")
|
|
|
|
assets := Layered(Local("l1", dir1), Local("l2", dir2))
|
|
|
|
f, err := assets.Open("f1")
|
|
require.NoError(t, err)
|
|
bs, err := io.ReadAll(f)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "f1", string(bs))
|
|
_ = f.Close()
|
|
|
|
assertRead := func(expected string, expectedErr error, elems ...string) {
|
|
bs, err := assets.ReadFile(elems...)
|
|
if err != nil {
|
|
require.ErrorIs(t, err, expectedErr)
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, expected, string(bs))
|
|
}
|
|
}
|
|
assertRead("f1", nil, "f1")
|
|
assertRead("f2", nil, "f2")
|
|
assertRead("fa-1", nil, "fa")
|
|
|
|
assertRead("d1-f", nil, "d1/f")
|
|
assertRead("d2-f", nil, "d2/f")
|
|
assertRead("da-f-1", nil, "da/f")
|
|
|
|
assertRead("", fs.ErrNotExist, "no-such")
|
|
|
|
files, err := assets.ListFiles(".", true)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []string{"f1", "f2", "fa"}, files)
|
|
|
|
files, err = assets.ListFiles(".", false)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []string{"d1", "d2", "da"}, files)
|
|
|
|
files, err = assets.ListFiles(".")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []string{"d1", "d2", "da", "f1", "f2", "fa"}, files)
|
|
|
|
files, err = assets.ListAllFiles(".", true)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []string{"d1/f", "d2/f", "da/f", "f1", "f2", "fa"}, files)
|
|
|
|
files, err = assets.ListAllFiles(".", false)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []string{"d1", "d2", "da", "da/sub1", "da/sub2"}, files)
|
|
|
|
files, err = assets.ListAllFiles(".")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []string{
|
|
"d1", "d1/f",
|
|
"d2", "d2/f",
|
|
"da", "da/f", "da/sub1", "da/sub2",
|
|
"f1", "f2", "fa",
|
|
}, files)
|
|
|
|
assert.Empty(t, assets.GetFileLayerName("no-such"))
|
|
assert.Equal(t, "l1", assets.GetFileLayerName("f1"))
|
|
assert.Equal(t, "l2", assets.GetFileLayerName("f2"))
|
|
}
|
|
|
|
// Allow layers to read symlink outside the layer root.
|
|
func TestLayeredSymlink(t *testing.T) {
|
|
dir := t.TempDir()
|
|
dirl1 := filepath.Join(dir, "l1")
|
|
require.NoError(t, os.MkdirAll(dirl1, 0o755))
|
|
|
|
// Open layer in dir/l1
|
|
layer := Local("l1", dirl1)
|
|
|
|
// Create a file in dir/outside
|
|
fileContents := []byte("I am outside the layer")
|
|
require.NoError(t, os.WriteFile(filepath.Join(dir, "outside"), fileContents, 0o600))
|
|
// Symlink dir/l1/outside to dir/outside
|
|
require.NoError(t, os.Symlink(filepath.Join(dir, "outside"), filepath.Join(dirl1, "outside")))
|
|
|
|
// Open dir/l1/outside.
|
|
f, err := layer.Open("outside")
|
|
require.NoError(t, err)
|
|
defer f.Close()
|
|
|
|
// Confirm it contains the output of dir/outside
|
|
contents, err := io.ReadAll(f)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, fileContents, contents)
|
|
}
|