Merge branch 'main' into dev-vhost

fix(vhost): fix vhost function error
2026-10-10 21:13:10 +08:00 · 2026-07-06 18:04:07 +08:00 · 2026-05-26 14:13:03 +08:00 · 2026-05-26 14:12:21 +08:00 · 2026-05-26 13:03:29 +08:00 · 2026-05-26 12:37:57 +08:00
71 changed files with 1713 additions and 3062 deletions
@@ -18,7 +18,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -108,12 +108,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

      - name: Setup Go
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
+        uses: actions/setup-go@v6
        with:
          go-version: "1.26.4"

@@ -25,13 +25,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

-      - uses: benjlevesque/short-sha@dbe07338b37c456ce06d23409b35a56a7815eef4 # v4.0
+      - uses: benjlevesque/short-sha@v3.0
        id: short-sha

      - name: Setup Go
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
+        uses: actions/setup-go@v6
        with:
          go-version: "1.26.4"

@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -44,12 +44,12 @@ jobs:
          swap-storage: true

      - name: Setup Go
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
+        uses: actions/setup-go@v6
        with:
          go-version: '1.26.4'

      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 1
          fetch-tags: true
@@ -43,15 +43,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

-      - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
+      - uses: actions/setup-go@v6
        with:
          go-version: '1.26'

      - name: Cache Musl
        id: cache-musl
-        uses: actions/cache@v6
+        uses: actions/cache@v4
        with:
          path: build/musl-libs
          key: docker-musl-libs-v2
@@ -83,15 +83,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

-      - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
+      - uses: actions/setup-go@v6
        with:
          go-version: '1.26.4'

      - name: Cache Musl
        id: cache-musl
-        uses: actions/cache@v6
+        uses: actions/cache@v4
        with:
          path: build/musl-libs
          key: docker-musl-libs-v2
@@ -146,21 +146,21 @@ jobs:
            tag_favor: "suffix=-aio,onlatest=true"
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
-      - uses: actions/download-artifact@v8
+        uses: actions/checkout@v6
+      - uses: actions/download-artifact@v4
        with:
          name: ${{ env.ARTIFACT_NAME }}
          path: 'build/'

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+        uses: docker/setup-buildx-action@v3

      - name: Login to GitHub Container Registry
        if: env.IMAGE_PUSH == 'true'
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -168,14 +168,14 @@ jobs:

      - name: Login to DockerHub Container Registry
        if: env.IMAGE_PUSH == 'true'
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        uses: docker/login-action@v3
        with:
          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ env.REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
@@ -190,7 +190,7 @@ jobs:

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
+        uses: docker/build-push-action@v6
        with:
          context: .
          file: Dockerfile.ci
@@ -230,21 +230,21 @@ jobs:
            tag_favor: "suffix=-lite-aio,onlatest=true"
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
-      - uses: actions/download-artifact@v8
+        uses: actions/checkout@v6
+      - uses: actions/download-artifact@v4
        with:
          name: ${{ env.ARTIFACT_NAME_LITE }}
          path: 'build/'

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+        uses: docker/setup-buildx-action@v3

      - name: Login to GitHub Container Registry
        if: env.IMAGE_PUSH == 'true'
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -252,14 +252,14 @@ jobs:

      - name: Login to DockerHub Container Registry
        if: env.IMAGE_PUSH == 'true'
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        uses: docker/login-action@v3
        with:
          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ env.REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
@@ -274,7 +274,7 @@ jobs:

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
+        uses: docker/build-push-action@v6
        with:
          context: .
          file: Dockerfile.ci
@@ -12,7 +12,7 @@ jobs:
    name: Sync GitHub to Gitee
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -32,15 +32,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

-      - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
+      - uses: actions/setup-go@v6
        with:
          go-version: '1.26.4'

      - name: Cache Musl
        id: cache-musl
-        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+        uses: actions/cache@v4
        with:
          path: build/musl-libs
          key: docker-musl-libs-v2
@@ -97,21 +97,21 @@ jobs:
            tag_favor: "suffix=-aio,onlatest=true"
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
-      - uses: actions/download-artifact@v8
+        uses: actions/checkout@v6
+      - uses: actions/download-artifact@v4
        with:
          name: ${{ env.ARTIFACT_NAME }}
          path: 'build/'

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+        uses: docker/setup-buildx-action@v3

      - name: Login to GitHub Container Registry
        if: env.IMAGE_PUSH == 'true'
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -119,14 +119,14 @@ jobs:

      - name: Login to DockerHub Container Registry
        if: env.IMAGE_PUSH == 'true'
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        uses: docker/login-action@v3
        with:
          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ env.REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
@@ -137,7 +137,7 @@ jobs:

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
+        uses: docker/build-push-action@v6
        with:
          context: .
          file: Dockerfile.ci
@@ -67,7 +67,7 @@ Thank you for your support and understanding of the OpenList project.
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Personal, Family, Group, Share)
+  - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -50,7 +50,7 @@ OpenList has no official association with third-party derivative projects that u
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Personal, Family, Group, Share)
+  - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -67,7 +67,7 @@ OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [分秒帧](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [和彩云](https://yun.139.com)（个人、家庭、群组、分享）
+  - [x] [和彩云](https://yun.139.com)（个人、家庭、群组）
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [百度网盘](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -50,7 +50,7 @@ OpenList has no official association with third-party derivative projects that u
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Personal, Family, Group, Share)
+  - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -50,7 +50,7 @@ OpenList has no official association with third-party derivative projects that u
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Personal, Family, Group, Share)
+  - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -50,7 +50,7 @@ OpenList has no official association with third-party derivative projects that u
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Personal, Family, Group, Share)
+  - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -66,7 +66,7 @@ OpenListプロジェクトへのご支援とご理解をありがとうござい
  - [x] Teambition([中国](https://www.teambition.com), [国際](https://us.teambition.com))
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com)（個人、家族、グループ、共有）
+  - [x] [139yun](https://yun.139.com)（個人、家族、グループ）
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -50,7 +50,7 @@ OpenList has no official association with third-party derivative projects that u
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Personal, Family, Group, Share)
+  - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -67,7 +67,7 @@ Dank u voor uw ondersteuning en begrip
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Persoonlijk, Familie, Groep, Delen)
+  - [x] [139yun](https://yun.139.com) (Persoonlijk, Familie, Groep)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -50,7 +50,7 @@ OpenList has no official association with third-party derivative projects that u
  - [x] [MediaFire](https://www.mediafire.com)
  - [x] [Mediatrack](https://www.mediatrack.cn)
  - [x] [ProtonDrive](https://proton.me/drive)
-  - [x] [139yun](https://yun.139.com) (Personal, Family, Group, Share)
+  - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
  - [x] [YandexDisk](https://disk.yandex.com)
  - [x] [BaiduNetdisk](http://pan.baidu.com)
  - [x] [Terabox](https://www.terabox.com/main)
@@ -5,6 +5,7 @@ import (
 	"strings"
 	"sync"

+	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	streamPkg "github.com/OpenListTeam/OpenList/v4/internal/stream"
@@ -68,6 +69,9 @@ func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		return nil, err
 	}
 	userAgent := args.Header.Get("User-Agent")
+	if userAgent == "" {
+		userAgent = base.UserAgent
+	}
 	downloadInfo, err := d.client.DownloadWithUA(file.(*FileObj).PickCode, userAgent)
 	if err != nil {
 		return nil, err
@@ -172,59 +172,17 @@ func (d *Open115) Get(ctx context.Context, path string) (model.Obj, error) {
 	resp, err := d.client.GetFolderInfoByPath(ctx, path)
 	if err != nil {
 		if errors.Is(err, sdk.ErrObjectNotFound) {
-			return d.getFromParent(ctx, path, "")
+			return nil, errs.ObjectNotFound
 		}
 		return nil, err
 	}
-	obj := &Obj{
+	return &Obj{
 		Fid:  resp.FileID,
 		Fn:   resp.FileName,
 		Fc:   resp.FileCategory,
 		Sha1: resp.Sha1,
 		Pc:   resp.PickCode,
-		FS:   resp.SizeByte,
-		Upt:  parseTime(resp.UTime),
-		UpPt: parseTime(resp.PTime),
-	}
-	if !obj.IsDir() && obj.ModTime().Unix() <= 0 {
-		return d.getFromParent(ctx, path, obj.GetID())
-	}
-	return obj, nil
-}
-
-func (d *Open115) getFromParent(ctx context.Context, path, id string) (model.Obj, error) {
-	path = stdpath.Clean(path)
-	parent, name := stdpath.Split(path)
-	parent = stdpath.Clean(parent)
-	parentID := d.GetRootId()
-	if stdpath.Clean(parent) != stdpath.Clean(d.parentPath) {
-		if err := d.WaitLimit(ctx); err != nil {
-			return nil, err
-		}
-		parentInfo, err := d.client.GetFolderInfoByPath(ctx, parent)
-		if err != nil {
-			if !errors.Is(err, sdk.ErrObjectNotFound) {
-				return nil, err
-			}
-			parentObj, err := d.getFromParent(ctx, parent, "")
-			if err != nil {
-				return nil, err
-			}
-			parentID = parentObj.GetID()
-		} else {
-			parentID = parentInfo.FileID
-		}
-	}
-	files, err := d.List(ctx, &Obj{Fid: parentID, Fc: "0"}, model.ListArgs{})
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if (id != "" && file.GetID() == id) || (id == "" && file.GetName() == name) {
-			return file, nil
-		}
-	}
-	return nil, errs.ObjectNotFound
+	}, nil
 }

 func (d *Open115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
@@ -1,9 +1,6 @@
 package _115_open

-import (
-	"encoding/json"
-	"strconv"
-)
+import "encoding/json"

 func ParseInt64(v json.Number) (int64, error) {
 	i, err := v.Int64()
@@ -16,8 +13,3 @@ func ParseInt64(v json.Number) (int64, error) {
 	}
 	return int64(0), err
 }
-
-func parseTime(value string) int64 {
-	timestamp, _ := strconv.ParseInt(value, 10, 64)
-	return timestamp
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pikachu Ren	3bfd422b4a	Merge branch 'main' into dev-vhost	2026-07-06 18:04:07 +08:00
Pikachu Ren	c8b0f5ebe7	Merge branch 'main' into dev-vhost	2026-05-26 14:13:03 +08:00
pikachuim	da588ba5f2	fix(vhost): fix vhost function error	2026-05-26 14:12:21 +08:00
pikachuim	4ae2d1f9a8	fix(vhost): fix vhost function error	2026-05-26 13:03:29 +08:00
pikachuim	379958b5ef	fix(vhost): remove useless files	2026-05-26 12:37:57 +08:00
pikachuim	8b3ef7c658	Merge branch 'main' into dev-vhost # Conflicts: # server/middlewares/down.go	2026-05-26 11:05:03 +08:00
pikachuim	a5f92bddaa	Merge branch 'dev-vhost' of https://github.com/OpenListTeam/OpenList into dev-vhost	2026-05-14 12:14:35 +08:00
pikachuim	ae00551b4e	feat(func): merge vhost_db to sharing_db	2026-05-14 12:13:32 +08:00
Pikachu Ren	bedf0a9447	Merge branch 'main' into dev-vhost Signed-off-by: Pikachu Ren <40362270+PIKACHUIM@users.noreply.github.com>	2026-04-08 14:19:08 +08:00
Pikachu Ren	8489950a94	Merge branch 'main' into dev-vhost	2026-03-25 17:36:06 +08:00
Copilot	d825769779	[WIP] Add support for virtual host functionality (#2212 ) * Initial plan * Fix vhost security and code quality issues from review feedback Co-authored-by: PIKACHUIM <40362270+PIKACHUIM@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: PIKACHUIM <40362270+PIKACHUIM@users.noreply.github.com>	2026-03-09 21:47:18 +08:00
Pikachu Ren	166af74388	Update server/middlewares/virtual_host.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Pikachu Ren <40362270+PIKACHUIM@users.noreply.github.com>	2026-03-09 21:34:48 +08:00
Pikachu Ren	a3b10298a1	Merge branch 'main' into dev-vhost	2026-03-09 21:33:45 +08:00
Pikachu Ren	0b54be27a7	Update internal/db/virtual_host.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Pikachu Ren <40362270+PIKACHUIM@users.noreply.github.com>	2026-03-09 15:20:42 +08:00
Pikachu Ren	38f761f1b1	Update internal/op/virtual_host.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Pikachu Ren <40362270+PIKACHUIM@users.noreply.github.com>	2026-03-09 15:19:23 +08:00
pikachuim	8a878fa98d	feat(func): support virtual host	2026-03-09 14:49:05 +08:00
pikachuim	12bd5a048d	add(func): spuuort virtual host	2026-03-09 13:02:28 +08:00