Merge branch 'master' into 230-torrents-category

server/web/api/download.go

@@ -47,7 +47,7 @@ func (f *fileReader) Seek(offset int64, whence int) (int64, error) {
 //
 //	@Tags			API
 //
-//	@Param			size	path	string	true	"Test file size"
+//	@Param			size	path	string	true	"Test file size (in MB)"
 //
 //	@Produce		application/octet-stream
 //	@Success		200 {file} file

server/web/api/ffprobe.go

@@ -18,12 +18,12 @@ import (
 //
 //	@Tags			API
 //
-//	@Param			hash	query	string	true	"Torrent hash"
-//	@Param			id		query	string	true	"File index in torrent"
+//	@Param			hash	path	string	true	"Torrent hash"
+//	@Param			id		path	string	true	"File index in torrent"
 //
 //	@Produce		json
 //	@Success		200	"Data returned from ffprobe"
-//	@Router			/ffp [get]
+//	@Router			/ffp/{hash}/{id} [get]
 func ffp(c *gin.Context) {
 	hash := c.Param("hash")
 	indexStr := c.Param("id")

server/web/api/m3u.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/anacrolix/missinggo/httptoo"
+	"github.com/anacrolix/missinggo/v2/httptoo"
 
 	sets "server/settings"
 	"server/torr"

server/web/api/play.go

@@ -19,17 +19,16 @@ import (
 //
 //	@Tags			API
 //
-//	@Param			hash		query	string	true	"Torrent hash"
-//	@Param			id			query	string	true	"File index in torrent"
-//	@Param			not_auth	query	bool	false	"Not authenticated"
+//	@Param			hash		path	string	true	"Torrent hash"
+//	@Param			id			path	string	true	"File index in torrent"
 //
 //	@Produce		application/octet-stream
 //	@Success		200	"Torrent data"
-//	@Router			/play [get]
+//	@Router			/play/{hash}/{id} [get]
 func play(c *gin.Context) {
 	hash := c.Param("hash")
 	indexStr := c.Param("id")
-	notAuth := c.GetBool("not_auth")
+	notAuth := c.GetBool("auth_required") && c.GetString(gin.AuthUserKey) == ""
 
 	if hash == "" || indexStr == "" {
 		c.AbortWithError(http.StatusNotFound, errors.New("link should not be empty"))

server/web/api/route.go

@@ -1,6 +1,9 @@
 package api
 
 import (
+	config "server/settings"
+	"server/web/auth"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -8,15 +11,17 @@ type requestI struct {
 	Action string `json:"action,omitempty"`
 }
 
-func SetupRoute(route *gin.RouterGroup) {
-	route.GET("/shutdown", shutdown)
+func SetupRoute(route gin.IRouter) {
+	authorized := route.Group("/", auth.CheckAuth())
 
-	route.POST("/settings", settings)
+	authorized.GET("/shutdown", shutdown)
 
-	route.POST("/torrents", torrents)
-	route.POST("/torrent/upload", torrentUpload)
+	authorized.POST("/settings", settings)
 
-	route.POST("/cache", cache)
+	authorized.POST("/torrents", torrents)
+	authorized.POST("/torrent/upload", torrentUpload)
+
+	authorized.POST("/cache", cache)
 
 	route.HEAD("/stream", stream)
 	route.HEAD("/stream/*fname", stream)
@@ -27,15 +32,19 @@ func SetupRoute(route *gin.RouterGroup) {
 	route.HEAD("/play/:hash/:id", play)
 	route.GET("/play/:hash/:id", play)
 
-	route.POST("/viewed", viewed)
+	authorized.POST("/viewed", viewed)
 
-	route.GET("/playlistall/all.m3u", allPlayList)
+	authorized.GET("/playlistall/all.m3u", allPlayList)
 	route.GET("/playlist", playList)
 	route.GET("/playlist/*fname", playList) // Is this endpoint still needed ? `fname` is never used in handler
 
-	route.GET("/download/:size", download)
+	authorized.GET("/download/:size", download)
 
-	route.GET("/search/*query", rutorSearch)
+	if config.SearchWA {
+		route.GET("/search/*query", rutorSearch)
+	} else {
+		authorized.GET("/search/*query", rutorSearch)
+	}
 
-	route.GET("/ffp/:hash/:id", ffp)
+	authorized.GET("/ffp/:hash/:id", ffp)
 }

server/web/api/stream.go

@@ -41,11 +41,10 @@ import (
 //	@Param			stat		query	string	false	"Get statistics from torrent"
 //	@Param			save		query	string	false	"Should save torrent"
 //	@Param			m3u		query	string	false	"Get torrent as M3U playlist"
-//	@Param			fromlast		query	string	false	"Get m3u from last play"
+//	@Param			fromlast		query	string	false	"Get M3U from last played file"
 //	@Param			play		query	string	false	"Start stream torrent"
 //	@Param			title		query	string	true	"Set title of torrent"
-//	@Param			poster		query	string	true	"File index in torrent"
-//	@Param			not_auth		query	string	true	"Set poster link of torrent"
+//	@Param			poster		query	string	true	"Set poster link of torrent"
 //
 //	@Produce		application/octet-stream
 //	@Success		200	"Data returned according to query"
@@ -62,7 +61,7 @@ func stream(c *gin.Context) {
 	title := c.Query("title")
 	poster := c.Query("poster")
 	data := ""
-	notAuth := c.GetBool("not_auth")
+	notAuth := c.GetBool("auth_required") && c.GetString(gin.AuthUserKey) == ""
 
 	if notAuth && (play || m3u) {
 		streamNoAuth(c)

server/web/api/torrents.go

@@ -73,6 +73,10 @@ func torrents(c *gin.Context) {
 		{
 			dropTorrent(req, c)
 		}
+	case "wipe":
+		{
+			wipeTorrents(req, c)
+		}
 	}
 }
 
@@ -188,3 +192,16 @@ func dropTorrent(req torrReqJS, c *gin.Context) {
 	torr.DropTorrent(req.Hash)
 	c.Status(200)
 }
+
+func wipeTorrents(req torrReqJS, c *gin.Context) {
+	torrents := torr.ListTorrent()
+	for _, t := range torrents {
+		torr.RemTorrent(t.TorrentSpec.InfoHash.HexString())
+	}
+	// TODO: remove (copied todo from remTorrent())
+	if set.BTsets.EnableDLNA {
+		dlna.Stop()
+		dlna.Start()
+	}
+	c.Status(200)
+}