Merge branch 'dev-media' of https://github.com/OpenListTeam/OpenList into dev-media

# Conflicts:
#	internal/db/db.go   resolved by dev-media version

Author: PIKACHUIM

go.mod

@@ -41,6 +41,7 @@ require (
 	github.com/foxxorcat/weiyun-sdk-go v0.1.4
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.10.1
+	github.com/glebarez/sqlite v1.11.0
 	github.com/go-resty/resty/v2 v2.16.5
 	github.com/go-webauthn/webauthn v0.13.4
 	github.com/golang-jwt/jwt/v4 v4.5.2
@@ -85,13 +86,13 @@ require (
 	gopkg.in/ldap.v3 v3.1.0
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/driver/postgres v1.5.9
-	gorm.io/driver/sqlite v1.5.6
-	gorm.io/gorm v1.25.11
+	gorm.io/driver/sqlite v1.6.0
+	gorm.io/gorm v1.30.0
 )
 
 require (
-	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
+	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf // indirect
 	github.com/ProtonMail/gluon v0.17.1-0.20230724134000-308be39be96e // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
@@ -105,6 +106,7 @@ require (
 	github.com/cloudsoda/sddl v0.0.0-20250224235906-926454e91efc // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cronokirby/saferith v0.33.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/ebitengine/purego v0.8.4 // indirect
 	github.com/emersion/go-message v0.18.2 // indirect
 	github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff // indirect
@@ -118,10 +120,12 @@ require (
 	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/lanrat/extsort v1.0.2 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/mikelolasagasti/xz v1.0.1 // indirect
 	github.com/minio/minlz v1.0.0 // indirect
 	github.com/minio/xxml v0.0.3 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/relvacode/iso8601 v1.6.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
@@ -204,6 +208,7 @@ require (
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
 	github.com/gin-contrib/sse v1.1.0 // indirect
+	github.com/glebarez/go-sqlite v1.22.0 // indirect
 	github.com/go-chi/chi/v5 v5.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
@@ -244,7 +249,6 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -272,6 +276,7 @@ require (
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.64.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rfjakob/eme v1.1.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
@@ -300,6 +305,10 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.1.7 // indirect
+	modernc.org/libc v1.55.3 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.8.0 // indirect
+	modernc.org/sqlite v1.33.1 // indirect
 )
 
 replace github.com/ProtonMail/go-proton-api => github.com/henrybear327/go-proton-api v1.0.0

internal/bootstrap/db.go

@@ -10,9 +10,9 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/db"
 	log "github.com/sirupsen/logrus"
+	"github.com/glebarez/sqlite"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
-	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"

internal/conf/const.go

@@ -198,4 +198,6 @@ const (
 	PathKey
 	SharingIDKey
 	SkipHookKey
+	VirtualHostKey
+	VhostPrefixKey
 )

internal/db/virtual_host.go

@@ -0,0 +1,45 @@
+package db
+
+import (
+	"github.com/OpenListTeam/OpenList/v4/internal/model"
+	"github.com/pkg/errors"
+)
+
+func GetVirtualHostByDomain(domain string) (*model.VirtualHost, error) {
+	var v model.VirtualHost
+	if err := db.Where("domain = ?", domain).First(&v).Error; err != nil {
+		return nil, errors.Wrapf(err, "failed select virtual host")
+	}
+	return &v, nil
+}
+
+func GetVirtualHostById(id uint) (*model.VirtualHost, error) {
+	var v model.VirtualHost
+	if err := db.First(&v, id).Error; err != nil {
+		return nil, errors.Wrapf(err, "failed get virtual host")
+	}
+	return &v, nil
+}
+
+func CreateVirtualHost(v *model.VirtualHost) error {
+	return errors.WithStack(db.Create(v).Error)
+}
+
+func UpdateVirtualHost(v *model.VirtualHost) error {
+	return errors.WithStack(db.Save(v).Error)
+}
+
+func GetVirtualHosts(pageIndex, pageSize int) (vhosts []model.VirtualHost, count int64, err error) {
+	vhostDB := db.Model(&model.VirtualHost{})
+	if err = vhostDB.Count(&count).Error; err != nil {
+		return nil, 0, errors.Wrapf(err, "failed get virtual hosts count")
+	}
+	if err = vhostDB.Order(columnName("id")).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&vhosts).Error; err != nil {
+		return nil, 0, errors.Wrapf(err, "failed find virtual hosts")
+	}
+	return vhosts, count, nil
+}
+
+func DeleteVirtualHostById(id uint) error {
+	return errors.WithStack(db.Delete(&model.VirtualHost{}, id).Error)
+}

internal/model/virtual_host.go

@@ -0,0 +1,9 @@
+package model
+
+type VirtualHost struct {
+	ID         uint   `json:"id" gorm:"primaryKey"`
+	Enabled    bool   `json:"enabled"`
+	Domain     string `json:"domain" gorm:"unique" binding:"required"`
+	Path       string `json:"path" binding:"required"`
+	WebHosting bool   `json:"web_hosting"`
+}

internal/op/virtual_host.go

@@ -0,0 +1,75 @@
+package op
+
+import (
+	"time"
+
+	"github.com/OpenListTeam/OpenList/v4/internal/db"
+	"github.com/OpenListTeam/OpenList/v4/internal/model"
+	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
+	"github.com/OpenListTeam/go-cache"
+	"github.com/pkg/errors"
+	"gorm.io/gorm"
+)
+
+var vhostCache = cache.NewMemCache(cache.WithShards[*model.VirtualHost](2))
+
+// GetVirtualHostByDomain 根据域名获取虚拟主机配置（带缓存）
+func GetVirtualHostByDomain(domain string) (*model.VirtualHost, error) {
+	if v, ok := vhostCache.Get(domain); ok {
+		if v == nil {
+			utils.Log.Infof("[VirtualHost] cache hit (nil) for domain=%q", domain)
+			return nil, errors.New("virtual host not found")
+		}
+		utils.Log.Infof("[VirtualHost] cache hit for domain=%q id=%d", domain, v.ID)
+		return v, nil
+	}
+	utils.Log.Infof("[VirtualHost] cache miss for domain=%q, querying db...", domain)
+	v, err := db.GetVirtualHostByDomain(domain)
+	if err != nil {
+		if errors.Is(errors.Cause(err), gorm.ErrRecordNotFound) {
+			utils.Log.Infof("[VirtualHost] domain=%q not found in db, caching nil", domain)
+			vhostCache.Set(domain, nil, cache.WithEx[*model.VirtualHost](time.Minute*5))
+			return nil, errors.New("virtual host not found")
+		}
+		utils.Log.Errorf("[VirtualHost] db error for domain=%q: %v", domain, err)
+		return nil, err
+	}
+	utils.Log.Infof("[VirtualHost] db found domain=%q id=%d enabled=%v web_hosting=%v", domain, v.ID, v.Enabled, v.WebHosting)
+	vhostCache.Set(domain, v, cache.WithEx[*model.VirtualHost](time.Hour))
+	return v, nil
+}
+
+func GetVirtualHostById(id uint) (*model.VirtualHost, error) {
+	return db.GetVirtualHostById(id)
+}
+
+func CreateVirtualHost(v *model.VirtualHost) error {
+	v.Path = utils.FixAndCleanPath(v.Path)
+	vhostCache.Del(v.Domain)
+	return db.CreateVirtualHost(v)
+}
+
+func UpdateVirtualHost(v *model.VirtualHost) error {
+	v.Path = utils.FixAndCleanPath(v.Path)
+	old, err := db.GetVirtualHostById(v.ID)
+	if err != nil {
+		return err
+	}
+	// 如果域名变更，清除旧域名缓存
+	vhostCache.Del(old.Domain)
+	vhostCache.Del(v.Domain)
+	return db.UpdateVirtualHost(v)
+}
+
+func DeleteVirtualHostById(id uint) error {
+	old, err := db.GetVirtualHostById(id)
+	if err != nil {
+		return err
+	}
+	vhostCache.Del(old.Domain)
+	return db.DeleteVirtualHostById(id)
+}
+
+func GetVirtualHosts(pageIndex, pageSize int) ([]model.VirtualHost, int64, error) {
+	return db.GetVirtualHosts(pageIndex, pageSize)
+}

server/handles/fsread.go

@@ -68,6 +68,8 @@ func FsListSplit(c *gin.Context) {
 		SharingList(c, &req)
 		return
 	}
+	// 虚拟主机路径重映射：根据 Host 头匹配虚拟主机规则，将请求路径映射到实际路径
+	req.Path = applyVhostPathMapping(c, req.Path)
 	user := c.Request.Context().Value(conf.UserKey).(*model.User)
 	if user.IsGuest() && user.Disabled {
 		common.ErrorStrResp(c, "Guest user is disabled, login please", 401)
@@ -273,6 +275,11 @@ func FsGetSplit(c *gin.Context) {
 		SharingGet(c, &req)
 		return
 	}
+	// 虚拟主机路径重映射：根据 Host 头匹配虚拟主机规则，将请求路径映射到实际路径
+	// 同时将 vhost.Path 前缀存入 context，供 FsGet 生成 /p/ 链接时去掉前缀
+	var vhostPrefix string
+	req.Path, vhostPrefix = applyVhostPathMappingWithPrefix(c, req.Path)
+	common.GinWithValue(c, conf.VhostPrefixKey, vhostPrefix)
 	user := c.Request.Context().Value(conf.UserKey).(*model.User)
 	if user.IsGuest() && user.Disabled {
 		common.ErrorStrResp(c, "Guest user is disabled, login please", 401)
@@ -322,12 +329,14 @@ func FsGet(c *gin.Context, req *FsGetReq, user *model.User) {
 			rawURL = common.GenerateDownProxyURL(storage.GetStorage(), reqPath)
 			if rawURL == "" {
 				query := ""
+				// 生成 /p/ 链接时，去掉 vhost 路径前缀，保持前端看到的路径一致
+				downPath := stripVhostPrefix(c, reqPath)
 				if isEncrypt(meta, reqPath) || setting.GetBool(conf.SignAll) {
 					query = "?sign=" + sign.Sign(reqPath)
 				}
 				rawURL = fmt.Sprintf("%s/p%s%s",
 					common.GetApiUrl(c),
-					utils.EncodePath(reqPath, true),
+					utils.EncodePath(downPath, true),
 					query)
 			}
 		} else {
@@ -432,3 +441,60 @@ func FsOther(c *gin.Context) {
 	}
 	common.SuccessResp(c, res)
 }
+
+// applyVhostPathMapping 根据请求的 Host 头匹配虚拟主机规则，将请求路径映射到实际路径。
+func applyVhostPathMapping(c *gin.Context, reqPath string) string {
+	mapped, _ := applyVhostPathMappingWithPrefix(c, reqPath)
+	return mapped
+}
+
+// applyVhostPathMappingWithPrefix 根据请求的 Host 头匹配虚拟主机规则，
+// 将请求路径映射到虚拟主机配置的实际路径，同时返回 vhost.Path 前缀（用于生成下载链接时去掉前缀）。
+// 例如：vhost.Path="/123pan/Downloads"，reqPath="/"，则返回 ("/123pan/Downloads", "/123pan/Downloads")
+// 例如：vhost.Path="/123pan/Downloads"，reqPath="/subdir"，则返回 ("/123pan/Downloads/subdir", "/123pan/Downloads")
+// 如果没有匹配的虚拟主机规则，则返回 (原始路径, "")
+func applyVhostPathMappingWithPrefix(c *gin.Context, reqPath string) (string, string) {
+	rawHost := c.Request.Host
+	domain := stripHostPortForVhost(rawHost)
+	if domain == "" {
+		return reqPath, ""
+	}
+	vhost, err := op.GetVirtualHostByDomain(domain)
+	if err != nil || vhost == nil {
+		return reqPath, ""
+	}
+	if !vhost.Enabled || vhost.WebHosting {
+		// 未启用，或者是 Web 托管模式（Web 托管不做路径重映射）
+		return reqPath, ""
+	}
+	// 路径重映射：将 reqPath 拼接到 vhost.Path 后面
+	mapped := stdpath.Join(vhost.Path, reqPath)
+	utils.Log.Debugf("[VirtualHost] API path remapping: domain=%q reqPath=%q -> mappedPath=%q", domain, reqPath, mapped)
+	return mapped, vhost.Path
+}
+
+// stripVhostPrefix 从 gin context 中取出 vhost 路径前缀，并从 path 中去掉该前缀。
+// 用于生成 /p/ 下载链接时，将真实路径还原为前端看到的路径。
+func stripVhostPrefix(c *gin.Context, path string) string {
+	prefix, ok := c.Request.Context().Value(conf.VhostPrefixKey).(string)
+	if !ok || prefix == "" {
+		return path
+	}
+	if strings.HasPrefix(path, prefix+"/") {
+		return path[len(prefix):]
+	}
+	if path == prefix {
+		return "/"
+	}
+	return path
+}
+
+// stripHostPortForVhost 去掉 host 中的端口号，返回纯域名
+func stripHostPortForVhost(host string) string {
+	if idx := strings.LastIndex(host, ":"); idx != -1 {
+		if !strings.Contains(host, "[") {
+			return host[:idx]
+		}
+	}
+	return host
+}