Fix the wrong derive path

modules/setting/storage.go

@@ -153,31 +153,44 @@ func getStorage(rootCfg ConfigProvider, name, typ string, sec ConfigSection) (*S
 		return nil, fmt.Errorf("invalid storage type %q", targetType)
 	}
 
+	// extra config section will be read SERVE_DIRECT, PATH, MINIO_BASE_PATH, MINIO_BUCKET to override the targetsec when possible
+	extraConfigSec := sec
+	if extraConfigSec == nil {
+		extraConfigSec = storageNameSec
+	}
+
 	var storage Storage
 	storage.Type = StorageType(targetType)
 
 	switch targetType {
 	case string(LocalStorageType):
-		storage.Path = ConfigSectionKeyString(targetSec, "PATH", filepath.Join(AppDataPath, name))
-		if !filepath.IsAbs(storage.Path) {
-			storage.Path = filepath.Join(AppWorkPath, storage.Path)
+		targetPath := ConfigSectionKeyString(targetSec, "PATH", "")
+		if targetPath == "" {
+			targetPath = AppDataPath
+		} else if !filepath.IsAbs(targetPath) {
+			targetPath = filepath.Join(AppDataPath, targetPath)
+		}
+
+		if extraConfigSec == nil {
+			storage.Path = filepath.Join(targetPath, name)
+		} else {
+			storage.Path = ConfigSectionKeyString(extraConfigSec, "PATH", filepath.Join(targetPath, name))
+			if !filepath.IsAbs(storage.Path) {
+				storage.Path = filepath.Join(AppDataPath, storage.Path)
+			}
 		}
-	case string(MinioStorageType):
-		storage.MinioConfig.BasePath = name + "/"
 
+	case string(MinioStorageType):
 		if err := targetSec.MapTo(&storage.MinioConfig); err != nil {
 			return nil, fmt.Errorf("map minio config failed: %v", err)
 		}
-		// extra config section will be read SERVE_DIRECT, PATH, MINIO_BASE_PATH to override the targetsec
-		extraConfigSec := sec
-		if extraConfigSec == nil {
-			extraConfigSec = storageNameSec
-		}
 
 		if extraConfigSec != nil {
 			storage.MinioConfig.ServeDirect = ConfigSectionKeyBool(extraConfigSec, "SERVE_DIRECT", storage.MinioConfig.ServeDirect)
 			storage.MinioConfig.BasePath = ConfigSectionKeyString(extraConfigSec, "MINIO_BASE_PATH", storage.MinioConfig.BasePath)
 			storage.MinioConfig.Bucket = ConfigSectionKeyString(extraConfigSec, "MINIO_BUCKET", storage.MinioConfig.Bucket)
+		} else {
+			storage.MinioConfig.BasePath = name + "/"
 		}
 	}
 

modules/setting/storage_test.go

@@ -4,6 +4,7 @@
 package setting
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -90,3 +91,206 @@ STORAGE_TYPE = minio
 	assert.EqualValues(t, "gitea", RepoAvatar.Storage.MinioConfig.Bucket)
 	assert.EqualValues(t, "repo-avatars/", RepoAvatar.Storage.MinioConfig.BasePath)
 }
+
+func Test_getStorageInheritStorageTypeLocal(t *testing.T) {
+	iniStr := `
+[storage]
+STORAGE_TYPE = local
+`
+	cfg, err := NewConfigProviderFromData(iniStr)
+	assert.NoError(t, err)
+
+	assert.NoError(t, loadPackagesFrom(cfg))
+	assert.EqualValues(t, "local", Packages.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "packages"), Packages.Storage.Path)
+
+	assert.NoError(t, loadRepoArchiveFrom(cfg))
+	assert.EqualValues(t, "local", RepoArchive.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "repo-archive"), RepoArchive.Storage.Path)
+
+	assert.NoError(t, loadActionsFrom(cfg))
+	assert.EqualValues(t, "local", Actions.LogStorage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "actions_log"), Actions.LogStorage.Path)
+
+	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "actions_artifacts"), Actions.ArtifactStorage.Path)
+
+	assert.NoError(t, loadAvatarsFrom(cfg))
+	assert.EqualValues(t, "local", Avatar.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "avatars"), Avatar.Storage.Path)
+
+	assert.NoError(t, loadRepoAvatarFrom(cfg))
+	assert.EqualValues(t, "local", RepoAvatar.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "repo-avatars"), RepoAvatar.Storage.Path)
+}
+
+func Test_getStorageInheritStorageTypeLocalDataPath(t *testing.T) {
+	iniStr := `
+[storage]
+STORAGE_TYPE = local
+`
+	cfg, err := NewConfigProviderFromData(iniStr)
+	assert.NoError(t, err)
+	AppDataPath = "/tmp/gitea"
+
+	assert.NoError(t, loadPackagesFrom(cfg))
+	assert.EqualValues(t, "local", Packages.Storage.Type)
+	assert.EqualValues(t, "/tmp/gitea/packages", Packages.Storage.Path)
+
+	assert.NoError(t, loadRepoArchiveFrom(cfg))
+	assert.EqualValues(t, "local", RepoArchive.Storage.Type)
+	assert.EqualValues(t, "/tmp/gitea/repo-archive", RepoArchive.Storage.Path)
+
+	assert.NoError(t, loadActionsFrom(cfg))
+	assert.EqualValues(t, "local", Actions.LogStorage.Type)
+	assert.EqualValues(t, "/tmp/gitea/actions_log", Actions.LogStorage.Path)
+
+	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
+	assert.EqualValues(t, "/tmp/gitea/actions_artifacts", Actions.ArtifactStorage.Path)
+
+	assert.NoError(t, loadAvatarsFrom(cfg))
+	assert.EqualValues(t, "local", Avatar.Storage.Type)
+	assert.EqualValues(t, "/tmp/gitea/avatars", Avatar.Storage.Path)
+
+	assert.NoError(t, loadRepoAvatarFrom(cfg))
+	assert.EqualValues(t, "local", RepoAvatar.Storage.Type)
+	assert.EqualValues(t, "/tmp/gitea/repo-avatars", RepoAvatar.Storage.Path)
+}
+
+func Test_getStorageInheritStorageTypeLocalPath(t *testing.T) {
+	iniStr := `
+[storage]
+STORAGE_TYPE = local
+PATH = /data/gitea
+`
+	cfg, err := NewConfigProviderFromData(iniStr)
+	assert.NoError(t, err)
+
+	assert.NoError(t, loadPackagesFrom(cfg))
+	assert.EqualValues(t, "local", Packages.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/packages", Packages.Storage.Path)
+
+	assert.NoError(t, loadRepoArchiveFrom(cfg))
+	assert.EqualValues(t, "local", RepoArchive.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/repo-archive", RepoArchive.Storage.Path)
+
+	assert.NoError(t, loadActionsFrom(cfg))
+	assert.EqualValues(t, "local", Actions.LogStorage.Type)
+	assert.EqualValues(t, "/data/gitea/actions_log", Actions.LogStorage.Path)
+
+	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
+	assert.EqualValues(t, "/data/gitea/actions_artifacts", Actions.ArtifactStorage.Path)
+
+	assert.NoError(t, loadAvatarsFrom(cfg))
+	assert.EqualValues(t, "local", Avatar.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/avatars", Avatar.Storage.Path)
+
+	assert.NoError(t, loadRepoAvatarFrom(cfg))
+	assert.EqualValues(t, "local", RepoAvatar.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/repo-avatars", RepoAvatar.Storage.Path)
+}
+
+func Test_getStorageInheritStorageTypeLocalRelativePath(t *testing.T) {
+	iniStr := `
+[storage]
+STORAGE_TYPE = local
+PATH = storages
+`
+	cfg, err := NewConfigProviderFromData(iniStr)
+	assert.NoError(t, err)
+
+	assert.NoError(t, loadPackagesFrom(cfg))
+	assert.EqualValues(t, "local", Packages.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "storages", "packages"), Packages.Storage.Path)
+
+	assert.NoError(t, loadRepoArchiveFrom(cfg))
+	assert.EqualValues(t, "local", RepoArchive.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "storages", "repo-archive"), RepoArchive.Storage.Path)
+
+	assert.NoError(t, loadActionsFrom(cfg))
+	assert.EqualValues(t, "local", Actions.LogStorage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "storages", "actions_log"), Actions.LogStorage.Path)
+
+	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "storages", "actions_artifacts"), Actions.ArtifactStorage.Path)
+
+	assert.NoError(t, loadAvatarsFrom(cfg))
+	assert.EqualValues(t, "local", Avatar.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "storages", "avatars"), Avatar.Storage.Path)
+
+	assert.NoError(t, loadRepoAvatarFrom(cfg))
+	assert.EqualValues(t, "local", RepoAvatar.Storage.Type)
+	assert.EqualValues(t, filepath.Join(AppDataPath, "storages", "repo-avatars"), RepoAvatar.Storage.Path)
+}
+
+func Test_getStorageInheritStorageTypeLocalPathOverride(t *testing.T) {
+	iniStr := `
+[storage]
+STORAGE_TYPE = local
+PATH = /data/gitea
+
+[repo-archive]
+PATH = /data/gitea/archives
+`
+	cfg, err := NewConfigProviderFromData(iniStr)
+	assert.NoError(t, err)
+
+	assert.NoError(t, loadPackagesFrom(cfg))
+	assert.EqualValues(t, "local", Packages.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/packages", Packages.Storage.Path)
+
+	assert.NoError(t, loadRepoArchiveFrom(cfg))
+	assert.EqualValues(t, "local", RepoArchive.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/archives", RepoArchive.Storage.Path)
+
+	assert.NoError(t, loadActionsFrom(cfg))
+	assert.EqualValues(t, "local", Actions.LogStorage.Type)
+	assert.EqualValues(t, "/data/gitea/actions_log", Actions.LogStorage.Path)
+
+	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
+	assert.EqualValues(t, "/data/gitea/actions_artifacts", Actions.ArtifactStorage.Path)
+
+	assert.NoError(t, loadAvatarsFrom(cfg))
+	assert.EqualValues(t, "local", Avatar.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/avatars", Avatar.Storage.Path)
+
+	assert.NoError(t, loadRepoAvatarFrom(cfg))
+	assert.EqualValues(t, "local", RepoAvatar.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/repo-avatars", RepoAvatar.Storage.Path)
+}
+
+func Test_getStorageInheritStorageTypeLocalPathOverride2(t *testing.T) {
+	iniStr := `
+[storage]
+STORAGE_TYPE = local
+PATH = /data/gitea
+
+[storage.repo-archive]
+PATH = /data/gitea/archives
+`
+	cfg, err := NewConfigProviderFromData(iniStr)
+	assert.NoError(t, err)
+
+	assert.NoError(t, loadPackagesFrom(cfg))
+	assert.EqualValues(t, "local", Packages.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/packages", Packages.Storage.Path)
+
+	assert.NoError(t, loadRepoArchiveFrom(cfg))
+	assert.EqualValues(t, "local", RepoArchive.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/archives", RepoArchive.Storage.Path)
+
+	assert.NoError(t, loadActionsFrom(cfg))
+	assert.EqualValues(t, "local", Actions.LogStorage.Type)
+	assert.EqualValues(t, "/data/gitea/actions_log", Actions.LogStorage.Path)
+
+	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
+	assert.EqualValues(t, "/data/gitea/actions_artifacts", Actions.ArtifactStorage.Path)
+
+	assert.NoError(t, loadAvatarsFrom(cfg))
+	assert.EqualValues(t, "local", Avatar.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/avatars", Avatar.Storage.Path)
+
+	assert.NoError(t, loadRepoAvatarFrom(cfg))
+	assert.EqualValues(t, "local", RepoAvatar.Storage.Type)
+	assert.EqualValues(t, "/data/gitea/repo-avatars", RepoAvatar.Storage.Path)
+}