webdav visitor

This commit is contained in:
Xhofe
2021-12-28 17:05:16 +08:00
parent 4c00866249
commit 6f5914ae6f
4 changed files with 60 additions and 14 deletions

View File

@ -158,7 +158,7 @@ func InitSettings() {
}, },
{ {
Key: "WebDAV username", Key: "WebDAV username",
Value: "alist", Value: "alist_admin",
Description: "WebDAV username", Description: "WebDAV username",
Type: "string", Type: "string",
Access: model.PRIVATE, Access: model.PRIVATE,
@ -166,12 +166,44 @@ func InitSettings() {
}, },
{ {
Key: "WebDAV password", Key: "WebDAV password",
Value: "alist", Value: "alist_admin",
Description: "WebDAV password", Description: "WebDAV password",
Type: "string", Type: "string",
Access: model.PRIVATE, Access: model.PRIVATE,
Group: model.BACK, Group: model.BACK,
}, },
{
Key: "artplayer whitelist",
Value: "*",
Description: "refer to https://artplayer.org/document/options#whitelist",
Type: "string",
Access: model.PUBLIC,
Group: model.FRONT,
},
{
Key: "artplayer autoSize",
Value: "true",
Description: "refer to https://artplayer.org/document/options#autosize",
Type: "bool",
Access: model.PUBLIC,
Group: model.FRONT,
},
{
Key: "Visitor WebDAV username",
Value: "alist_visitor",
Description: "Visitor WebDAV username",
Type: "string",
Access: model.PRIVATE,
Group: model.BACK,
},
{
Key: "Visitor WebDAV password",
Value: "alist_visitor",
Description: "Visitor WebDAV password",
Type: "string",
Access: model.PRIVATE,
Group: model.BACK,
},
} }
for i, _ := range settings { for i, _ := range settings {
v := settings[i] v := settings[i]

View File

@ -48,4 +48,6 @@ var (
Token string Token string
DavUsername string DavUsername string
DavPassword string DavPassword string
VisitorDavUsername string
VisitorDavPassword string
) )

View File

@ -132,4 +132,12 @@ func LoadSettings() {
if err == nil { if err == nil {
conf.DavPassword = davPassword.Value conf.DavPassword = davPassword.Value
} }
visitorDavUsername, err := GetSettingByKey("Visitor WebDAV username")
if err == nil {
conf.VisitorDavUsername = visitorDavUsername.Value
}
visitorDavPassword, err := GetSettingByKey("Visitor WebDAV password")
if err == nil {
conf.VisitorDavPassword = visitorDavPassword.Value
}
} }

View File

@ -3,6 +3,7 @@ package server
import ( import (
"github.com/Xhofe/alist/conf" "github.com/Xhofe/alist/conf"
"github.com/Xhofe/alist/server/webdav" "github.com/Xhofe/alist/server/webdav"
"github.com/Xhofe/alist/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"net/http" "net/http"
) )
@ -48,13 +49,16 @@ func WebDAVAuth(c *gin.Context) {
c.Abort() c.Abort()
return return
} }
if conf.DavUsername != "" && conf.DavUsername != username { if conf.DavUsername == username && conf.DavPassword == password {
c.Status(http.StatusUnauthorized)
c.Abort()
}
if conf.DavPassword != "" && conf.DavPassword != password {
c.Status(http.StatusUnauthorized)
c.Abort()
}
c.Next() c.Next()
return
}
if (conf.VisitorDavUsername == username && conf.VisitorDavPassword == password) || (conf.VisitorDavUsername == "" && conf.VisitorDavPassword == "") {
if !utils.IsContain([]string{"PUT", "DELETE", "PROPPATCH", "MKCOL", "COPY", "MOVE"}, c.Request.Method) {
c.Next()
return
}
}
c.Status(http.StatusUnauthorized)
c.Abort()
} }