github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 51365d066c into 4f8bc478d5

pull/7097/merge
NekoGirlSAIKOU 2025-09-20 00:44:14 +05:30 committed by GitHub
parent 4f8bc478d5 51365d066c
commit 632bc08219
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/model/user.go
View File

@ -63,6 +63,10 @@ func (u *User) IsAdmin() bool {
return u.Role.Contains(ADMIN) return u.Role.Contains(ADMIN)
} }
func (u *User) IsOtpEnabled() bool {
return u.OtpSecret != ""
}
func (u *User) ValidateRawPassword(password string) error { func (u *User) ValidateRawPassword(password string) error {
return u.ValidatePwdStaticHash(StaticHash(password)) return u.ValidatePwdStaticHash(StaticHash(password))
} }

2
server/webdav.go
View File

@ -95,7 +95,7 @@ func WebDAVAuth(c *gin.Context) {
return return
} }
user, err := op.GetUserByName(username) user, err := op.GetUserByName(username)
if err != nil || user.ValidateRawPassword(password) != nil { if err != nil || user.IsOtpEnabled() || user.ValidateRawPassword(password) != nil {
if c.Request.Method == "OPTIONS" { if c.Request.Method == "OPTIONS" {
c.Set("user", guest) c.Set("user", guest)
c.Next() c.Next()