fix: timeout while fetching yarn pkgs in building docker image action

.github/FUNDING.yml

@@ -1 +1 @@
-custom: ["https://cloudreve.org/buy.php"]
+custom: ["https://cloudreve.org/pricing"]

README.md

@@ -1,3 +1,5 @@
+[中文版本](https://github.com/cloudreve/Cloudreve/blob/master/README_zh-CN.md)
+
 <h1 align="center">
   <br>
   <a href="https://cloudreve.org/" alt="logo" ><img src="https://raw.githubusercontent.com/cloudreve/frontend/master/public/static/img/logo192.png" width="150"/></a>
@@ -5,12 +7,11 @@
   Cloudreve
   <br>
 </h1>
-
-<h4 align="center">支持多家云存储驱动的公有云文件系统.</h4>
+<h4 align="center">Self-hosted file management system with muilt-cloud support.</h4>
 
 <p align="center">
   <a href="https://github.com/cloudreve/Cloudreve/actions/workflows/test.yml">
-    <img src="https://img.shields.io/github/workflow/status/cloudreve/Cloudreve/Test?style=flat-square"
+    <img src="https://img.shields.io/github/actions/workflow/status/cloudreve/Cloudreve/test.yml?branch=master&style=flat-square"
          alt="GitHub Test Workflow">
   </a>
   <a href="https://codecov.io/gh/cloudreve/Cloudreve"><img src="https://img.shields.io/codecov/c/github/cloudreve/Cloudreve?style=flat-square"></a>
@@ -24,108 +25,106 @@
      <img src="https://img.shields.io/docker/image-size/cloudreve/cloudreve?style=flat-square"/>
   </a>
 </p>
-
 <p align="center">
-  <a href="https://demo.cloudreve.org">演示站</a> •
-  <a href="https://forum.cloudreve.org/">讨论社区</a> •
-  <a href="https://docs.cloudreve.org/">文档</a> •
-  <a href="https://github.com/cloudreve/Cloudreve/releases">下载</a> •
-  <a href="https://t.me/cloudreve_official">Telegram 群组</a> •
-  <a href="#scroll-许可证">许可证</a>
+  <a href="https://cloudreve.org">Homepage</a> •
+  <a href="https://demo.cloudreve.org">Demo</a> •
+  <a href="https://forum.cloudreve.org/">Discussion</a> •
+  <a href="https://docs.cloudreve.org/v/en/">Documents</a> •
+  <a href="https://github.com/cloudreve/Cloudreve/releases">Download</a> •
+  <a href="https://t.me/cloudreve_official">Telegram Group</a> •
+  <a href="#scroll-License">License</a>
 </p>
 
+
+
 ![Screenshot](https://raw.githubusercontent.com/cloudreve/docs/master/images/homepage.png)
 
-## :sparkles: 特性
+## :sparkles: Features
 
-* :cloud: 支持本机、从机、七牛、阿里云 OSS、腾讯云 COS、又拍云、OneDrive (包括世纪互联版) 作为存储端
-* :outbox_tray: 上传/下载 支持客户端直传，支持下载限速
-* 💾 可对接 Aria2 离线下载，可使用多个从机节点分担下载任务
-* 📚 在线 压缩/解压缩、多文件打包下载
-* 💻 覆盖全部存储策略的 WebDAV 协议支持
-* :zap: 拖拽上传、目录上传、流式上传处理
-* :card_file_box: 文件拖拽管理
-*  :family_woman_girl_boy:   多用户、用户组
-* :link: 创建文件、目录的分享链接，可设定自动过期
-* :eye_speech_bubble: 视频、图像、音频、文本、Office 文档在线预览
-* :art: 自定义配色、黑暗模式、PWA 应用、全站单页应用
-* :rocket: All-In-One 打包，开箱即用
+* :cloud: Support storing files into Local storage, Remote storage, Qiniu, Aliyun OSS, Tencent COS, Upyun, OneDrive, S3 compatible API.
+* :outbox_tray: Upload/Download in directly transmission with speed limiting support.
+* 💾 Integrate with Aria2 to download files offline, use multiple download nodes to share the load.
+* 📚 Compress/Extract files, download files in batch.
+* 💻 WebDAV support covering all storage providers.
+* :zap:Drag&Drop to upload files or folders, with streaming upload processing.
+* :card_file_box: Drag & Drop to manage your files.
+* :family_woman_girl_boy:   Multi-users with multi-groups.
+* :link: Create share links for files and folders with expiration date.
+* :eye_speech_bubble: Preview videos, images, audios, texts, Office documents, ePub files online.
+* :art: Customize theme colors, dark mode, PWA application, SPA, i18n.
+* :rocket: All-In-One packing, with all features out-of-the-box.
 * 🌈 ... ...
 
-## :hammer_and_wrench: 部署
+## :hammer_and_wrench: Deploy
 
-下载适用于您目标机器操作系统、CPU架构的主程序，直接运行即可。
+Download the main binary for your target machine OS, CPU architecture and run it directly.
 
 ```shell
-# 解压程序包
+# Extract Cloudreve binary
 tar -zxvf cloudreve_VERSION_OS_ARCH.tar.gz
 
-# 赋予执行权限
+# Grant execute permission
 chmod +x ./cloudreve
 
-# 启动 Cloudreve
+# Start Cloudreve
 ./cloudreve
 ```
 
-以上为最简单的部署示例，您可以参考 [文档 - 起步](https://docs.cloudreve.org/) 进行更为完善的部署。
+The above is a minimum deploy example, you can refer to [Getting started](https://docs.cloudreve.org/v/en/getting-started/install) for a completed deployment.
 
-## :gear: 构建
+## :gear: Build
 
-自行构建前需要拥有 `Go >= 1.18`、`node.js`、`yarn`、`zip` 等必要依赖。
+You need to have `Go >= 1.18`, `node.js`, `yarn`, `zip` and other necessary dependencies before you can build it yourself.
 
-#### 克隆代码
+#### Clone the code
 
 ```shell
 git clone --recurse-submodules https://github.com/cloudreve/Cloudreve.git
 ```
 
-#### 构建静态资源
+#### Build static resources
 
 ```shell
-# 进入前端子模块
+# Enter frontend sub-module
 cd assets
-# 安装依赖
+# Install dependencies
 yarn install
-# 开始构建
+# Start building
 yarn run build
-# 构建完成后删除映射文件
+# Delete unused map files
 cd build
 find . -name "*.map" -type f -delete
-# 返回项目主目录打包静态资源
+# Return to main folder to pack static files
 cd ../../
 zip -r - assets/build >assets.zip
 ```
 
-#### 编译项目
+#### Compile
 
 ```shell
-# 获得当前版本号、Commit
+# Obtain version number, commit SHA
 export COMMIT_SHA=$(git rev-parse --short HEAD)
 export VERSION=$(git describe --tags)
 
-# 开始编译
+# Compile
 go build -a -o cloudreve -ldflags "-s -w -X 'github.com/cloudreve/Cloudreve/v3/pkg/conf.BackendVersion=$VERSION' -X 'github.com/cloudreve/Cloudreve/v3/pkg/conf.LastCommit=$COMMIT_SHA'"
 ```
 
-你也可以使用项目根目录下的 `build.sh` 快速开始构建：
+You can also start a quick build using `build.sh` in the project root directory:
 
 ```shell
 ./build.sh  [-a] [-c] [-b] [-r]
-	a - 构建静态资源
-	c - 编译二进制文件
-	b - 构建前端 + 编译二进制文件
-	r - 交叉编译，构建用于release的版本
+	a - Build assets
+	c - Build binary backend
+	b - Build both assets and backend
+	r - Cross-compilation for final release
 ```
 
-## :alembic: 技术栈
+## :alembic: Stacks
 
 * [Go](https://golang.org/) + [Gin](https://github.com/gin-gonic/gin)
 * [React](https://github.com/facebook/react) + [Redux](https://github.com/reduxjs/redux) + [Material-UI](https://github.com/mui-org/material-ui)
 
-## :scroll: 许可证
+## :scroll: License
 
 GPL V3
-
----
-> GitHub [@HFO4](https://github.com/HFO4) &nbsp;&middot;&nbsp;
-> Twitter [@abslant00](https://twitter.com/abslant00)

README_zh-CN.md

@@ -0,0 +1,130 @@
+[English Version](https://github.com/cloudreve/Cloudreve/blob/master/README.md)
+
+<h1 align="center">
+  <br>
+  <a href="https://cloudreve.org/" alt="logo" ><img src="https://raw.githubusercontent.com/cloudreve/frontend/master/public/static/img/logo192.png" width="150"/></a>
+  <br>
+  Cloudreve
+  <br>
+</h1>
+
+<h4 align="center">支持多家云存储驱动的公有云文件系统.</h4>
+
+<p align="center">
+  <a href="https://github.com/cloudreve/Cloudreve/actions/workflows/test.yml">
+    <img src="https://img.shields.io/github/actions/workflow/status/cloudreve/Cloudreve/test.yml?branch=master&style=flat-square"
+         alt="GitHub Test Workflow">
+  </a>
+  <a href="https://codecov.io/gh/cloudreve/Cloudreve"><img src="https://img.shields.io/codecov/c/github/cloudreve/Cloudreve?style=flat-square"></a>
+  <a href="https://goreportcard.com/report/github.com/cloudreve/Cloudreve">
+      <img src="https://goreportcard.com/badge/github.com/cloudreve/Cloudreve?style=flat-square">
+  </a>
+  <a href="https://github.com/cloudreve/Cloudreve/releases">
+    <img src="https://img.shields.io/github/v/release/cloudreve/Cloudreve?include_prereleases&style=flat-square" />
+  </a>
+  <a href="https://hub.docker.com/r/cloudreve/cloudreve">
+     <img src="https://img.shields.io/docker/image-size/cloudreve/cloudreve?style=flat-square"/>
+  </a>
+</p>
+<p align="center">
+  <a href="https://cloudreve.org">主页</a> •
+  <a href="https://demo.cloudreve.org">演示站</a> •
+  <a href="https://forum.cloudreve.org/">讨论社区</a> •
+  <a href="https://docs.cloudreve.org/">文档</a> •
+  <a href="https://github.com/cloudreve/Cloudreve/releases">下载</a> •
+  <a href="https://t.me/cloudreve_official">Telegram 群组</a> •
+  <a href="#scroll-许可证">许可证</a>
+</p>
+
+
+![Screenshot](https://raw.githubusercontent.com/cloudreve/docs/master/images/homepage.png)
+
+## :sparkles: 特性
+
+* :cloud: 支持本机、从机、七牛、阿里云 OSS、腾讯云 COS、又拍云、OneDrive (包括世纪互联版) 、S3兼容协议 作为存储端
+* :outbox_tray: 上传/下载 支持客户端直传，支持下载限速
+* 💾 可对接 Aria2 离线下载，可使用多个从机节点分担下载任务
+* 📚 在线 压缩/解压缩、多文件打包下载
+* 💻 覆盖全部存储策略的 WebDAV 协议支持
+* :zap: 拖拽上传、目录上传、流式上传处理
+* :card_file_box: 文件拖拽管理
+* :family_woman_girl_boy:   多用户、用户组、多存储策略
+* :link: 创建文件、目录的分享链接，可设定自动过期
+* :eye_speech_bubble: 视频、图像、音频、文本、Office 文档、 ePub 在线预览
+* :art: 自定义配色、黑暗模式、PWA 应用、全站单页应用、国际化支持
+* :rocket: All-In-One 打包，开箱即用
+* 🌈 ... ...
+
+## :hammer_and_wrench: 部署
+
+下载适用于您目标机器操作系统、CPU架构的主程序，直接运行即可。
+
+```shell
+# 解压程序包
+tar -zxvf cloudreve_VERSION_OS_ARCH.tar.gz
+
+# 赋予执行权限
+chmod +x ./cloudreve
+
+# 启动 Cloudreve
+./cloudreve
+```
+
+以上为最简单的部署示例，您可以参考 [文档 - 起步](https://docs.cloudreve.org/) 进行更为完善的部署。
+
+## :gear: 构建
+
+自行构建前需要拥有 `Go >= 1.18`、`node.js`、`yarn`、`zip` 等必要依赖。
+
+#### 克隆代码
+
+```shell
+git clone --recurse-submodules https://github.com/cloudreve/Cloudreve.git
+```
+
+#### 构建静态资源
+
+```shell
+# 进入前端子模块
+cd assets
+# 安装依赖
+yarn install
+# 开始构建
+yarn run build
+# 构建完成后删除映射文件
+cd build
+find . -name "*.map" -type f -delete
+# 返回项目主目录打包静态资源
+cd ../../
+zip -r - assets/build >assets.zip
+```
+
+#### 编译项目
+
+```shell
+# 获得当前版本号、Commit
+export COMMIT_SHA=$(git rev-parse --short HEAD)
+export VERSION=$(git describe --tags)
+
+# 开始编译
+go build -a -o cloudreve -ldflags "-s -w -X 'github.com/cloudreve/Cloudreve/v3/pkg/conf.BackendVersion=$VERSION' -X 'github.com/cloudreve/Cloudreve/v3/pkg/conf.LastCommit=$COMMIT_SHA'"
+```
+
+你也可以使用项目根目录下的 `build.sh` 快速开始构建：
+
+```shell
+./build.sh  [-a] [-c] [-b] [-r]
+	a - 构建静态资源
+	c - 编译二进制文件
+	b - 构建前端 + 编译二进制文件
+	r - 交叉编译，构建用于release的版本
+```
+
+## :alembic: 技术栈
+
+* [Go](https://golang.org/) + [Gin](https://github.com/gin-gonic/gin)
+* [React](https://github.com/facebook/react) + [Redux](https://github.com/reduxjs/redux) + [Material-UI](https://github.com/mui-org/material-ui)
+
+## :scroll: 许可证
+
+GPL V3

build.sh

@@ -28,6 +28,7 @@ buildAssets() {
 
   cd $REPO/assets
 
+  yarn install --network-timeout 1000000
   yarn install
   yarn run build
   cd build

middleware/common.go

@@ -3,9 +3,11 @@ package middleware
 import (
 	"fmt"
 	model "github.com/cloudreve/Cloudreve/v3/models"
+	"github.com/cloudreve/Cloudreve/v3/pkg/auth"
 	"github.com/cloudreve/Cloudreve/v3/pkg/hashid"
 	"github.com/cloudreve/Cloudreve/v3/pkg/serializer"
 	"github.com/gin-gonic/gin"
+	"net/http"
 )
 
 // HashID 将给定对象的HashID转换为真实ID
@@ -60,3 +62,16 @@ func StaticResourceCache() gin.HandlerFunc {
 
 	}
 }
+
+// MobileRequestOnly
+func MobileRequestOnly() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if c.GetHeader(auth.CrHeaderPrefix+"ios") == "" {
+			c.Redirect(http.StatusMovedPermanently, model.GetSiteURL().String())
+			c.Abort()
+			return
+		}
+
+		c.Next()
+	}
+}

pkg/conf/version.go

@@ -1,13 +1,13 @@
 package conf
 
 // BackendVersion 当前后端版本号
-var BackendVersion = "3.6.1"
+var BackendVersion = "3.6.2"
 
 // RequiredDBVersion 与当前版本匹配的数据库版本
 var RequiredDBVersion = "3.6.0"
 
 // RequiredStaticVersion 与当前版本匹配的静态资源版本
-var RequiredStaticVersion = "3.6.1"
+var RequiredStaticVersion = "3.6.2"
 
 // IsPro 是否为Pro版本
 var IsPro = "false"

routers/controllers/user.go

@@ -377,3 +377,22 @@ func UserInit2FA(c *gin.Context) {
 		c.JSON(200, ErrorResponse(err))
 	}
 }
+
+// UserPrepareCopySession generates URL for copy session
+func UserPrepareCopySession(c *gin.Context) {
+	var service user.CopySessionService
+	res := service.Prepare(c, CurrentUser(c))
+	c.JSON(200, res)
+
+}
+
+// UserPerformCopySession copy to create new session or refresh current session
+func UserPerformCopySession(c *gin.Context) {
+	var service user.CopySessionService
+	if err := c.ShouldBindUri(&service); err == nil {
+		res := service.Copy(c)
+		c.JSON(200, res)
+	} else {
+		c.JSON(200, ErrorResponse(err))
+	}
+}

routers/router.go

@@ -233,6 +233,13 @@ func InitMasterRouter() *gin.Engine {
 				// 打包并下载文件
 				file.GET("archive/:sessionID/archive.zip", controllers.DownloadArchive)
 			}
+
+			// Copy user session
+			sign.GET(
+				"user/session/copy/:id",
+				middleware.MobileRequestOnly(),
+				controllers.UserPerformCopySession,
+			)
 		}
 
 		// 从机的 RPC 通信
@@ -523,6 +530,9 @@ func InitMasterRouter() *gin.Engine {
 				user.GET("storage", controllers.UserStorage)
 				// 退出登录
 				user.DELETE("session", controllers.UserSignOut)
+				// Generate temp URL for copying client-side session, used in adding accounts
+				// for mobile App.
+				user.GET("session", controllers.UserPrepareCopySession)
 
 				// WebAuthn 注册相关
 				authn := user.Group("authn",

service/user/login.go

@@ -3,12 +3,14 @@ package user
 import (
 	"fmt"
 	model "github.com/cloudreve/Cloudreve/v3/models"
+	"github.com/cloudreve/Cloudreve/v3/pkg/auth"
 	"github.com/cloudreve/Cloudreve/v3/pkg/cache"
 	"github.com/cloudreve/Cloudreve/v3/pkg/email"
 	"github.com/cloudreve/Cloudreve/v3/pkg/hashid"
 	"github.com/cloudreve/Cloudreve/v3/pkg/serializer"
 	"github.com/cloudreve/Cloudreve/v3/pkg/util"
 	"github.com/gin-gonic/gin"
+	"github.com/gofrs/uuid"
 	"github.com/pquerna/otp/totp"
 	"net/url"
 )
@@ -154,3 +156,48 @@ func (service *UserLoginService) Login(c *gin.Context) serializer.Response {
 	return serializer.BuildUserResponse(expectedUser)
 
 }
+
+// CopySessionService service for copy user session
+type CopySessionService struct {
+	ID string `uri:"id" binding:"required,uuid4"`
+}
+
+const CopySessionTTL = 60
+
+// Prepare generates the URL with short expiration duration
+func (s *CopySessionService) Prepare(c *gin.Context, user *model.User) serializer.Response {
+	// 用户组有效期
+	urlID := uuid.Must(uuid.NewV4())
+	if err := cache.Set(fmt.Sprintf("copy_session_%s", urlID.String()), user.ID, CopySessionTTL); err != nil {
+		return serializer.Err(serializer.CodeInternalSetting, "Failed to create copy session", err)
+	}
+
+	base := model.GetSiteURL()
+	apiBaseURI, _ := url.Parse("/api/v3/user/session/copy/" + urlID.String())
+	apiURL := base.ResolveReference(apiBaseURI)
+	res, err := auth.SignURI(auth.General, apiURL.String(), CopySessionTTL)
+	if err != nil {
+		return serializer.Err(serializer.CodeInternalSetting, "Failed to sign temp URL", err)
+	}
+
+	return serializer.Response{
+		Data: res.String(),
+	}
+}
+
+// Copy a new session from active session, refresh max-age
+func (s *CopySessionService) Copy(c *gin.Context) serializer.Response {
+	// 用户组有效期
+	cacheKey := fmt.Sprintf("copy_session_%s", s.ID)
+	uid, ok := cache.Get(cacheKey)
+	if !ok {
+		return serializer.Err(serializer.CodeNotFound, "", nil)
+	}
+
+	cache.Deletes([]string{cacheKey}, "")
+	util.SetSession(c, map[string]interface{}{
+		"user_id": uid.(uint),
+	})
+
+	return serializer.Response{}
+}