feat(direct link): add option to get direct link with download enforced (#2651)

assets

@@ -1 +1 @@
-Subproject commit 3a6a22bb458783fcfd32f3b35f5fe6afc5414e25
+Subproject commit e47a708f727bf5243512ddd6d9c6eabd5bf61751

pkg/filemanager/manager/entity.go

@@ -168,7 +168,7 @@ func (m *manager) GetUrlForRedirectedDirectLink(ctx context.Context, dl *ent.Dir
 	)
 
 	// Try to read from cache.
-	cacheKey := entityUrlCacheKey(primaryEntity.ID(), int64(dl.Speed), dl.Name, false,
+	cacheKey := entityUrlCacheKey(primaryEntity.ID(), int64(dl.Speed), dl.Name, o.IsDownload,
 		m.settings.SiteURL(ctx).String())
 	if cached, ok := m.kv.Get(cacheKey); ok {
 		cachedItem := cached.(EntityUrlCache)
@@ -185,7 +185,7 @@ func (m *manager) GetUrlForRedirectedDirectLink(ctx context.Context, dl *ent.Dir
 			m.l, m.config, m.dep.MimeDetector(ctx))
 		downloadUrl, err := source.Url(ctx,
 			entitysource.WithExpire(o.Expire),
-			entitysource.WithDownload(false),
+			entitysource.WithDownload(o.IsDownload),
 			entitysource.WithSpeedLimit(int64(dl.Speed)),
 			entitysource.WithDisplayName(dl.Name),
 		)

routers/controllers/file.go

@@ -86,12 +86,14 @@ func ExtractArchive(c *gin.Context) {
 }
 
 // AnonymousPermLink 文件中转后的永久直链接
-func AnonymousPermLink(c *gin.Context) {
-	name := c.Param("name")
-	if err := explorer.RedirectDirectLink(c, name); err != nil {
-		c.JSON(404, serializer.Err(c, err))
-		c.Abort()
-		return
+func AnonymousPermLink(download bool) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		name := c.Param("name")
+		if err := explorer.RedirectDirectLink(c, name, download); err != nil {
+			c.JSON(404, serializer.Err(c, err))
+			c.Abort()
+			return
+		}
 	}
 }
 

routers/router.go

@@ -245,7 +245,10 @@ func initMasterRouter(dep dependency.Dep) *gin.Engine {
 		{
 			source.GET(":id/:name",
 				middleware.HashID(hashid.SourceLinkID),
-				controllers.AnonymousPermLink)
+				controllers.AnonymousPermLink(false))
+			source.GET("d/:id/:name",
+				middleware.HashID(hashid.SourceLinkID),
+				controllers.AnonymousPermLink(true))
 		}
 
 		shareShort := r.Group("s")

service/explorer/file.go

@@ -659,7 +659,7 @@ func (s *GetFileInfoService) Get(c *gin.Context) (*FileResponse, error) {
 	return BuildFileResponse(c, user, file, dep.HashIDEncoder(), nil), nil
 }
 
-func RedirectDirectLink(c *gin.Context, name string) error {
+func RedirectDirectLink(c *gin.Context, name string, download bool) error {
 	dep := dependency.FromContext(c)
 	settings := dep.SettingProvider()
 
@@ -680,6 +680,7 @@ func RedirectDirectLink(c *gin.Context, name string) error {
 	expire := time.Now().Add(settings.EntityUrlValidDuration(c))
 	res, earliestExpire, err := m.GetUrlForRedirectedDirectLink(c, dl,
 		fs.WithUrlExpire(&expire),
+		fs.WithIsDownload(download),
 	)
 	if err != nil {
 		return err