fix file redirect status code

middleware/auth.go

@@ -116,11 +116,6 @@ func WebDAVAuth() gin.HandlerFunc {
 			return
 		}
 
-		// 用户组已启用WebDAV代理？
-		if !expectedUser.Group.OptionsSerialized.WebDAVProxy {
-			webdav.UseProxy = false
-		}
-
 		c.Set("user", &expectedUser)
 		c.Set("webdav", webdav)
 		c.Next()

models/folder.go

@@ -18,8 +18,7 @@ type Folder struct {
 	OwnerID  uint   `gorm:"index:owner_id"`
 
 	// 数据库忽略字段
-	Position      string `gorm:"-"`
-	WebdavDstName string `gorm:"-"`
+	Position string `gorm:"-"`
 }
 
 // Create 创建目录
@@ -170,11 +169,6 @@ func (folder *Folder) MoveOrCopyFileTo(files []uint, dstFolder *Folder, isCopy b
 			oldFile.FolderID = dstFolder.ID
 			oldFile.UserID = dstFolder.OwnerID
 
-			// webdav目标名重置
-			if dstFolder.WebdavDstName != "" {
-				oldFile.Name = dstFolder.WebdavDstName
-			}
-
 			if err := DB.Create(&oldFile).Error; err != nil {
 				return copiedSize, err
 			}
@@ -183,14 +177,6 @@ func (folder *Folder) MoveOrCopyFileTo(files []uint, dstFolder *Folder, isCopy b
 		}
 
 	} else {
-		var updates = map[string]interface{}{
-			"folder_id": dstFolder.ID,
-		}
-		// webdav目标名重置
-		if dstFolder.WebdavDstName != "" {
-			updates["name"] = dstFolder.WebdavDstName
-		}
-
 		// 更改顶级要移动文件的父目录指向
 		err := DB.Model(File{}).Where(
 			"id in (?) and user_id = ? and folder_id = ?",
@@ -198,7 +184,9 @@ func (folder *Folder) MoveOrCopyFileTo(files []uint, dstFolder *Folder, isCopy b
 			folder.OwnerID,
 			folder.ID,
 		).
-			Update(updates).
+			Update(map[string]interface{}{
+				"folder_id": dstFolder.ID,
+			}).
 			Error
 		if err != nil {
 			return 0, err
@@ -233,10 +221,6 @@ func (folder *Folder) CopyFolderTo(folderID uint, dstFolder *Folder) (size uint6
 		// 顶级目录直接指向新的目的目录
 		if folder.ID == folderID {
 			newID = dstFolder.ID
-			// webdav目标名重置
-			if dstFolder.WebdavDstName != "" {
-				folder.Name = dstFolder.WebdavDstName
-			}
 		} else if IDCache, ok := newIDCache[*folder.ParentID]; ok {
 			newID = IDCache
 		} else {
@@ -298,21 +282,15 @@ func (folder *Folder) MoveFolderTo(dirs []uint, dstFolder *Folder) error {
 		return errors.New("cannot move a folder into itself")
 	}
 
-	var updates = map[string]interface{}{
-		"parent_id": dstFolder.ID,
-	}
-	// webdav目标名重置
-	if dstFolder.WebdavDstName != "" {
-		updates["name"] = dstFolder.WebdavDstName
-	}
-
 	// 更改顶级要移动目录的父目录指向
 	err := DB.Model(Folder{}).Where(
 		"id in (?) and owner_id = ? and parent_id = ?",
 		dirs,
 		folder.OwnerID,
 		folder.ID,
-	).Update(updates).Error
+	).Update(map[string]interface{}{
+		"parent_id": dstFolder.ID,
+	}).Error
 
 	return err
 

models/group.go

@@ -35,7 +35,6 @@ type GroupOption struct {
 	RedirectedSource bool                   `json:"redirected_source,omitempty"`
 	Aria2BatchSize   int                    `json:"aria2_batch,omitempty"`
 	AdvanceDelete    bool                   `json:"advance_delete,omitempty"`
-	WebDAVProxy      bool                   `json:"webdav_proxy,omitempty"`
 }
 
 // GetGroupByID 用ID获取用户组

models/webdav.go

@@ -12,7 +12,6 @@ type Webdav struct {
 	UserID   uint   `gorm:"unique_index:password_only_on"` // 用户ID
 	Root     string `gorm:"type:text"`                     // 根目录
 	Readonly bool   `gorm:"type:bool"`                     // 是否只读
-	UseProxy bool   `gorm:"type:bool"`                     // 是否进行反代
 }
 
 // Create 创建账户
@@ -42,7 +41,7 @@ func DeleteWebDAVAccountByID(id, uid uint) {
 	DB.Where("user_id = ? and id = ?", uid, id).Delete(&Webdav{})
 }
 
-// UpdateWebDAVAccountByID 根据账户ID和UID更新账户
-func UpdateWebDAVAccountByID(id, uid uint, updates map[string]interface{}) {
-	DB.Model(&Webdav{Model: gorm.Model{ID: id}, UserID: uid}).Updates(updates)
+// UpdateWebDAVAccountReadonlyByID 根据账户ID和UID更新账户的只读性
+func UpdateWebDAVAccountReadonlyByID(id, uid uint, readonly bool) {
+	DB.Model(&Webdav{Model: gorm.Model{ID: id}, UserID: uid}).UpdateColumn("readonly", readonly)
 }

pkg/conf/version.go

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

pkg/email/smtp.go

@@ -1,8 +1,6 @@
 package email
 
 import (
-	"fmt"
-	"github.com/google/uuid"
 	"time"
 
 	"github.com/cloudreve/Cloudreve/v3/pkg/util"
@@ -52,7 +50,6 @@ func (client *SMTP) Send(to, title, body string) error {
 	m.SetAddressHeader("Reply-To", client.Config.ReplyTo, client.Config.Name)
 	m.SetHeader("To", to)
 	m.SetHeader("Subject", title)
-	m.SetHeader("Message-ID", fmt.Sprintf("<%s@%s>", uuid.NewString(), "cloudreve"))
 	m.SetBody("text/html", body)
 	client.ch <- m
 	return nil

pkg/filesystem/fsctx/context.go

@@ -35,10 +35,4 @@ const (
 	CancelFuncCtx
 	// 文件在从机节点中的路径
 	SlaveSrcPath
-	// Webdav目标名称
-	WebdavDstName
-	// WebDAVCtx WebDAV
-	WebDAVCtx
-	// WebDAV反代Url
-	WebDAVProxyUrlCtx
 )

pkg/filesystem/manage.go

@@ -69,11 +69,6 @@ func (fs *FileSystem) Copy(ctx context.Context, dirs, files []uint, src, dst str
 	// 记录复制的文件的总容量
 	var newUsedStorage uint64
 
-	// 设置webdav目标名
-	if dstName, ok := ctx.Value(fsctx.WebdavDstName).(string); ok {
-		dstFolder.WebdavDstName = dstName
-	}
-
 	// 复制目录
 	if len(dirs) > 0 {
 		subFileSizes, err := srcFolder.CopyFolderTo(dirs[0], dstFolder)
@@ -108,11 +103,6 @@ func (fs *FileSystem) Move(ctx context.Context, dirs, files []uint, src, dst str
 		return ErrPathNotExist
 	}
 
-	// 设置webdav目标名
-	if dstName, ok := ctx.Value(fsctx.WebdavDstName).(string); ok {
-		dstFolder.WebdavDstName = dstName
-	}
-
 	// 处理目录及子文件移动
 	err := srcFolder.MoveFolderTo(dirs, dstFolder)
 	if err != nil {

pkg/serializer/user.go

@@ -42,7 +42,6 @@ type group struct {
 	WebDAVEnabled        bool   `json:"webdav"`
 	SourceBatchSize      int    `json:"sourceBatch"`
 	AdvanceDelete        bool   `json:"advanceDelete"`
-	AllowWebDAVProxy     bool   `json:"allowWebDAVProxy"`
 }
 
 type tag struct {
@@ -101,7 +100,6 @@ func BuildUser(user model.User) User {
 			ShareDownload:        user.Group.OptionsSerialized.ShareDownload,
 			CompressEnabled:      user.Group.OptionsSerialized.ArchiveTask,
 			WebDAVEnabled:        user.Group.WebDAVEnabled,
-			AllowWebDAVProxy:     user.Group.OptionsSerialized.WebDAVProxy,
 			SourceBatchSize:      user.Group.OptionsSerialized.SourceBatchSize,
 			AdvanceDelete:        user.Group.OptionsSerialized.AdvanceDelete,
 		},

pkg/thumb/ffmpeg.go

@@ -67,8 +67,9 @@ func (f *FfmpegGenerator) Generate(ctx context.Context, file io.Reader, src, nam
 
 	// Invoke ffmpeg
 	scaleOpt := fmt.Sprintf("scale=%s:%s:force_original_aspect_ratio=decrease", options["thumb_width"], options["thumb_height"])
+	inputFormat := filepath.Ext(name)[1:]
 	cmd := exec.CommandContext(ctx,
-		ffmpegOpts["thumb_ffmpeg_path"], "-ss", ffmpegOpts["thumb_ffmpeg_seek"], "-i", tempInputPath,
+		ffmpegOpts["thumb_ffmpeg_path"], "-ss", ffmpegOpts["thumb_ffmpeg_seek"], "-f", inputFormat, "-i", tempInputPath,
 		"-vf", scaleOpt, "-vframes", "1", tempOutputPath)
 
 	// Redirect IO

pkg/webdav/file.go

@@ -9,12 +9,9 @@ import (
 	"net/http"
 	"path"
 	"path/filepath"
-	"strconv"
-	"time"
 
 	model "github.com/cloudreve/Cloudreve/v3/models"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem"
-	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx"
 )
 
 // slashClean is equivalent to but slightly more efficient than
@@ -26,31 +23,6 @@ func slashClean(name string) string {
 	return path.Clean(name)
 }
 
-// 更新Copy或Move后的修改时间
-func updateCopyMoveModtime(req *http.Request, fs *filesystem.FileSystem, dst string) error {
-	var modtime time.Time
-	if timeVal := req.Header.Get("X-OC-Mtime"); timeVal != "" {
-		timeUnix, err := strconv.ParseInt(timeVal, 10, 64)
-		if err == nil {
-			modtime = time.Unix(timeUnix, 0)
-		}
-	}
-
-	if modtime.IsZero() {
-		return nil
-	}
-
-	ok, fi := isPathExist(req.Context(), fs, dst)
-	if !ok {
-		return nil
-	}
-
-	if fi.IsDir() {
-		return model.DB.Model(fi.(*model.Folder)).UpdateColumn("updated_at", modtime).Error
-	}
-	return model.DB.Model(fi.(*model.File)).UpdateColumn("updated_at", modtime).Error
-}
-
 // moveFiles moves files and/or directories from src to dst.
 //
 // See section 9.9.4 for when various HTTP status codes apply.
@@ -72,17 +44,20 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
 		}
 	}
 
+
 	// 判断是否需要移动
 	if src.GetPosition() != path.Dir(dst) {
 		err = fs.Move(
-			context.WithValue(ctx, fsctx.WebdavDstName, path.Base(dst)),
+			ctx,
 			folderIDs,
 			fileIDs,
 			src.GetPosition(),
 			path.Dir(dst),
 		)
-	} else if src.GetName() != path.Base(dst) {
-		// 判断是否需要重命名
+	}
+
+	// 判断是否需要重命名
+	if err == nil && src.GetName() != path.Base(dst) {
 		err = fs.Rename(
 			ctx,
 			folderIDs,
@@ -106,6 +81,7 @@ func copyFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
 	}
 	recursion++
 
+
 	var (
 		fileIDs   []uint
 		folderIDs []uint
@@ -124,7 +100,7 @@ func copyFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
 	}
 
 	err = fs.Copy(
-		context.WithValue(ctx, fsctx.WebdavDstName, path.Base(dst)),
+		ctx,
 		folderIDs,
 		fileIDs,
 		src.GetPosition(),

pkg/webdav/prop.go

@@ -49,7 +49,7 @@ func (file *FileDeadProps) Patch(proppatches []Proppatch) ([]Propstat, error) {
 				var modtimeUnix int64
 				modtimeUnix, err = strconv.ParseInt(string(prop.InnerXML), 10, 64)
 				if err == nil {
-					err = model.DB.Model(file.File).UpdateColumn("updated_at", time.Unix(modtimeUnix, 0)).Error
+					err = model.DB.Model(file).UpdateColumn("updated_at", time.Unix(modtimeUnix, 0)).Error
 				}
 			}
 		}
@@ -78,7 +78,7 @@ func (folder *FolderDeadProps) Patch(proppatches []Proppatch) ([]Propstat, error
 				var modtimeUnix int64
 				modtimeUnix, err = strconv.ParseInt(string(prop.InnerXML), 10, 64)
 				if err == nil {
-					err = model.DB.Model(folder.Folder).UpdateColumn("updated_at", time.Unix(modtimeUnix, 0)).Error
+					err = model.DB.Model(folder).UpdateColumn("updated_at", time.Unix(modtimeUnix, 0)).Error
 				}
 			}
 		}

pkg/webdav/webdav.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"net/http/httputil"
 	"net/url"
 	"path"
 	"strconv"
@@ -242,23 +241,6 @@ func (h *Handler) handleOptions(w http.ResponseWriter, r *http.Request, fs *file
 	return 0, nil
 }
 
-var proxy = &httputil.ReverseProxy{
-	Director: func(request *http.Request) {
-		if target, ok := request.Context().Value(fsctx.WebDAVProxyUrlCtx).(*url.URL); ok {
-			request.URL.Scheme = target.Scheme
-			request.URL.Host = target.Host
-			request.URL.Path = target.Path
-			request.URL.RawPath = target.RawPath
-			request.URL.RawQuery = target.RawQuery
-			request.Host = target.Host
-			request.Header.Del("Authorization")
-		}
-	},
-	ErrorHandler: func(writer http.ResponseWriter, request *http.Request, err error) {
-		writer.WriteHeader(http.StatusInternalServerError)
-	},
-}
-
 // OK
 func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request, fs *filesystem.FileSystem) (status int, err error) {
 	defer fs.Recycle()
@@ -297,23 +279,7 @@ func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request, fs *
 		return 0, nil
 	}
 
-	if application, ok := r.Context().Value(fsctx.WebDAVCtx).(*model.Webdav); ok && application.UseProxy {
-		target, err := url.Parse(rs.URL)
-		if err != nil {
-			return http.StatusInternalServerError, err
-		}
-
-		r = r.Clone(context.WithValue(r.Context(), fsctx.WebDAVProxyUrlCtx, target))
-		// 忽略反向代理在传输错误时报错
-		defer func() {
-			if err := recover(); err != nil && err != http.ErrAbortHandler {
-				panic(err)
-			}
-		}()
-		proxy.ServeHTTP(w, r)
-	} else {
-		http.Redirect(w, r, rs.URL, 301)
-	}
+	http.Redirect(w, r, rs.URL, 302)
 
 	return 0, nil
 }
@@ -530,16 +496,7 @@ func (h *Handler) handleCopyMove(w http.ResponseWriter, r *http.Request, fs *fil
 				return http.StatusBadRequest, errInvalidDepth
 			}
 		}
-		status, err = copyFiles(ctx, fs, target, dst, r.Header.Get("Overwrite") != "F", depth, 0)
-		if err != nil {
-			return status, err
-		}
-
-		err = updateCopyMoveModtime(r, fs, dst)
-		if err != nil {
-			return http.StatusInternalServerError, err
-		}
-		return status, nil
+		return copyFiles(ctx, fs, target, dst, r.Header.Get("Overwrite") != "F", depth, 0)
 	}
 
 	// windows下，某些情况下（网盘根目录下）Office保存文件时附带的锁token只包含源文件，
@@ -558,16 +515,7 @@ func (h *Handler) handleCopyMove(w http.ResponseWriter, r *http.Request, fs *fil
 			return http.StatusBadRequest, errInvalidDepth
 		}
 	}
-	status, err = moveFiles(ctx, fs, target, dst, r.Header.Get("Overwrite") == "T")
-	if err != nil {
-		return status, err
-	}
-
-	err = updateCopyMoveModtime(r, fs, dst)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return status, nil
+	return moveFiles(ctx, fs, target, dst, r.Header.Get("Overwrite") == "T")
 }
 
 // OK

routers/controllers/webdav.go

@@ -1,10 +1,8 @@
 package controllers
 
 import (
-	"context"
 	model "github.com/cloudreve/Cloudreve/v3/models"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem"
-	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx"
 	"github.com/cloudreve/Cloudreve/v3/pkg/util"
 	"github.com/cloudreve/Cloudreve/v3/pkg/webdav"
 	"github.com/cloudreve/Cloudreve/v3/service/setting"
@@ -51,9 +49,6 @@ func ServeWebDAV(c *gin.Context) {
 				return
 			}
 		}
-
-		// 更新Context
-		c.Request = c.Request.WithContext(context.WithValue(c.Request.Context(), fsctx.WebDAVCtx, application))
 	}
 
 	handler.ServeHTTP(c.Writer, c.Request, fs)
@@ -81,9 +76,9 @@ func DeleteWebDAVAccounts(c *gin.Context) {
 	}
 }
 
-// UpdateWebDAVAccounts 更改WebDAV账户只读性和是否使用代理服务
-func UpdateWebDAVAccounts(c *gin.Context) {
-	var service setting.WebDAVAccountUpdateService
+// UpdateWebDAVAccountsReadonly 更改WebDAV账户只读性
+func UpdateWebDAVAccountsReadonly(c *gin.Context) {
+	var service setting.WebDAVAccountUpdateReadonlyService
 	if err := c.ShouldBindJSON(&service); err == nil {
 		res := service.Update(c, CurrentUser(c))
 		c.JSON(200, res)

routers/router.go

@@ -225,7 +225,7 @@ func InitMasterRouter() *gin.Engine {
 					middleware.StaticResourceCache(),
 					controllers.AnonymousGetContent,
 				)
-				// 文件外链(301跳转)
+				// 文件外链(302跳转)
 				file.GET("source/:id/:name", controllers.AnonymousPermLinkDeprecated)
 				// 下载文件
 				file.GET("download/:id",
@@ -721,8 +721,8 @@ func InitMasterRouter() *gin.Engine {
 				webdav.POST("accounts", controllers.CreateWebDAVAccounts)
 				// 删除账号
 				webdav.DELETE("accounts/:id", controllers.DeleteWebDAVAccounts)
-				// 更新账号可读性和是否使用代理服务
-				webdav.PATCH("accounts", controllers.UpdateWebDAVAccounts)
+				// 更新账号可读性
+				webdav.PATCH("accounts", controllers.UpdateWebDAVAccountsReadonly)
 			}
 
 		}

service/admin/user.go

@@ -112,13 +112,8 @@ func (service *AddUserService) Add() serializer.Response {
 		user.TwoFactor = service.User.TwoFactor
 
 		// 检查愚蠢操作
-		if user.ID == 1 {
-			if user.GroupID != 1 {
-				return serializer.Err(serializer.CodeChangeGroupForDefaultUser, "", nil)
-			}
-			if user.Status != model.Active {
-				return serializer.Err(serializer.CodeInvalidActionOnDefaultUser, "", nil)
-			}
+		if user.ID == 1 && user.GroupID != 1 {
+			return serializer.Err(serializer.CodeChangeGroupForDefaultUser, "", nil)
 		}
 
 		if err := model.DB.Save(&user).Error; err != nil {

service/explorer/file.go

@@ -227,14 +227,8 @@ func (service *FileIDService) CreateDocPreviewSession(ctx context.Context, c *gi
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
 
-	// For newer version of Cloudreve - Local Policy
-	// When do not use a cdn, the downloadURL withouts hosts, like "/api/v3/file/download/xxx"
 	if strings.HasPrefix(downloadURL, "/") {
-		downloadURI, err := url.Parse(downloadURL)
-		if err != nil {
-			return serializer.Err(serializer.CodeNotSet, err.Error(), err)
-		}
-		downloadURL = model.GetSiteURL().ResolveReference(downloadURI).String()
+		downloadURL = path.Join(model.GetSiteURL().String(), downloadURL)
 	}
 
 	var resp serializer.DocPreviewSession

service/setting/webdav.go

@@ -22,11 +22,10 @@ type WebDAVAccountCreateService struct {
 	Name string `json:"name" binding:"required,min=1,max=255"`
 }
 
-// WebDAVAccountUpdateService WebDAV 修改只读性和是否使用代理服务
-type WebDAVAccountUpdateService struct {
-	ID       uint  `json:"id" binding:"required,min=1"`
-	Readonly *bool `json:"readonly" binding:"required_without=UseProxy"`
-	UseProxy *bool `json:"use_proxy" binding:"required_without=Readonly"`
+// WebDAVAccountUpdateReadonlyService WebDAV 修改只读性服务
+type WebDAVAccountUpdateReadonlyService struct {
+	ID       uint `json:"id" binding:"required,min=1"`
+	Readonly bool `json:"readonly"`
 }
 
 // WebDAVMountCreateService WebDAV 挂载创建服务
@@ -63,17 +62,12 @@ func (service *WebDAVAccountService) Delete(c *gin.Context, user *model.User) se
 	return serializer.Response{}
 }
 
-// Update 修改WebDAV账户只读性和是否使用代理服务
-func (service *WebDAVAccountUpdateService) Update(c *gin.Context, user *model.User) serializer.Response {
-	var updates = make(map[string]interface{})
-	if service.Readonly != nil {
-		updates["readonly"] = *service.Readonly
-	}
-	if service.UseProxy != nil {
-		updates["use_proxy"] = *service.UseProxy
-	}
-	model.UpdateWebDAVAccountByID(service.ID, user.ID, updates)
-	return serializer.Response{Data: updates}
+// Update 修改WebDAV账户的只读性
+func (service *WebDAVAccountUpdateReadonlyService) Update(c *gin.Context, user *model.User) serializer.Response {
+	model.UpdateWebDAVAccountReadonlyByID(service.ID, user.ID, service.Readonly)
+	return serializer.Response{Data: map[string]bool{
+		"readonly": service.Readonly,
+	}}
 }
 
 // Accounts 列出WebDAV账号